diff options
| -rw-r--r-- | php-pecl-libsodium.spec | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/php-pecl-libsodium.spec b/php-pecl-libsodium.spec index dd33410..e038ce5 100644 --- a/php-pecl-libsodium.spec +++ b/php-pecl-libsodium.spec @@ -24,20 +24,14 @@ Summary: Wrapper for the Sodium cryptographic library Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.0.6 -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if "%{?vendor}" == "Remi Collet" -# Ensure libsodium-last is used -BuildRequires: libsodium-devel >= 1.0.7 -%else -# Per upstream documentation -BuildRequires: libsodium-devel >= 0.6.0 -%endif +# Ensure libsodium-last is used (upstream 0.6.0) +BuildRequires: pkgconfig(libsodium) >= 1.0.13 BuildRequires: %{?scl_prefix}php-devel > 5.4 BuildRequires: %{?scl_prefix}php-pear BuildRequires: %{?scl_prefix}php-json @@ -79,6 +73,10 @@ Obsoletes: php70w-pecl-%{pecl_name} <= %{version} Obsoletes: php71u-pecl-%{pecl_name} <= %{version} Obsoletes: php71w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.2" +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} +%endif %endif # Filter shared private - always as libsodium.so is a bad name @@ -142,8 +140,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} - make -C NTS install INSTALL_ROOT=%{buildroot} # install config file @@ -218,12 +214,7 @@ REPORT_EXIT_STATUS=1 \ %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %doc %{pecl_docdir}/%{pecl_name} %{?_licensedir:%license NTS/LICENSE} %{pecl_xmldir}/%{name}.xml @@ -238,6 +229,9 @@ rm -rf %{buildroot} %changelog +* Thu Sep 28 2017 Remi Collet <remi@fedoraproject.org> - 1.0.6-4 +- rebuild with PHP 7.2.0RC3 + * Thu Dec 1 2016 Remi Collet <remi@fedoraproject.org> - 1.0.6-3 - rebuild with PHP 7.1.0 GA |