diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-03-05 14:50:17 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-03-05 14:50:17 +0100 |
| commit | 5cc7e951f1c62d852d66aec89b28e680e3ca5ad3 (patch) | |
| tree | fe4daa6c11e93c16489a5144799c4ebb24b565d0 | |
| parent | d1faeaab0472ffb6a474bfad70b9e6a0498e4541 (diff) | |
php-pecl-crypto: F24
| -rw-r--r-- | php-pecl-crypto.spec | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/php-pecl-crypto.spec b/php-pecl-crypto.spec index b19764b..7113a0d 100644 --- a/php-pecl-crypto.spec +++ b/php-pecl-crypto.spec @@ -15,9 +15,6 @@ %endif %{?scl: %scl_package php-pecl-crypto} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global pecl_name crypto @@ -31,7 +28,7 @@ Summary: Wrapper for OpenSSL Crypto Library Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 0.2.2 -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/%{pecl_name} @@ -96,7 +93,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{pecl_name}-%{version} NTS # Don't install/register tests -sed -e 's/role="test"/role="src"/' -i package.xml +sed -e 's/role="test"/role="src"/' \ + %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \ + -i package.xml cd NTS @@ -161,6 +160,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done +%if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -177,6 +177,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -233,6 +234,9 @@ rm -rf %{buildroot} %changelog +* Sat Mar 5 2016 Remi Collet <remi@fedoraproject.org> - 0.2.2-2 +- adapt for F24 + * Wed Nov 25 2015 Remi Collet <remi@fedoraproject.org> - 0.2.2-1 - Update to 0.2.2 @@ -259,4 +263,5 @@ rm -rf %{buildroot} * Thu Jan 2 2014 Remi Collet <remi@fedoraproject.org> - 0.1.0-1 - initial package, version 0.1.0 (devel) -- patch for PHP 5.3.3, https://github.com/bukka/php-crypto/pull/6
\ No newline at end of file +- patch for PHP 5.3.3, https://github.com/bukka/php-crypto/pull/6 + |