diff options
| author | Remi Collet <remi@remirepo.net> | 2017-09-28 10:44:37 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2017-09-28 10:44:37 +0200 |
| commit | fbb16654f709e792d67e6c683062357a8dd75f5b (patch) | |
| tree | e8f69f52ad2a97d163d814bfa13d373e5c07d0f2 | |
| parent | 3588d9053b6b30cd6c7e7c6cd17e08fc9aa0cf26 (diff) | |
allow install of both v1 and v2 extensions
| -rw-r--r-- | php-pecl-libsodium2.spec | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/php-pecl-libsodium2.spec b/php-pecl-libsodium2.spec index 8a24f9a..633b509 100644 --- a/php-pecl-libsodium2.spec +++ b/php-pecl-libsodium2.spec @@ -25,7 +25,7 @@ Summary: Wrapper for the Sodium cryptographic library Name: %{?sub_prefix}php-pecl-%{proj_name}2 Version: 2.0.7 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/%{proj_name} @@ -48,11 +48,9 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{proj_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{proj_name})%{?_isa} = %{version} %if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name}2 = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}2%{?_isa} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{proj_name}2 = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{proj_name}2%{?_isa} = %{version}-%{release} %endif -# Only one version -Conflicts: %{?scl_prefix}php-pecl-%{proj_name} < 2 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff @@ -163,7 +161,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} # Documentation for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{proj_name}/$i +do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{proj_name}2/$i done @@ -222,7 +220,7 @@ REPORT_EXIT_STATUS=1 \ %files -%doc %{pecl_docdir}/%{proj_name} +%doc %{pecl_docdir}/%{proj_name}2 %{?_licensedir:%license NTS/LICENSE} %{pecl_xmldir}/%{name}.xml @@ -236,6 +234,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Sep 28 2017 Remi Collet <remi@remirepo.net> - 2.0.7-2 +- allow install of both v1 and v2 extensions + * Wed Sep 27 2017 Remi Collet <remi@remirepo.net> - 2.0.7-1 - Update to 2.0.7 |