diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-03-05 07:45:49 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-03-05 07:45:49 +0100 |
| commit | 169b2e1495f06017ac8df483fa48e6c3e32ca29d (patch) | |
| tree | b8c8c70d1517aec86084579493bf1d25c9033c3f | |
| parent | a7a34f6f0c53175973b2be1c24968618be672ac3 (diff) | |
php-pecl-apfd: adapt for F24
| -rw-r--r-- | php-pecl-apfd.spec | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/php-pecl-apfd.spec b/php-pecl-apfd.spec index 916530f..6d13ec8 100644 --- a/php-pecl-apfd.spec +++ b/php-pecl-apfd.spec @@ -18,9 +18,6 @@ %endif %{?scl: %scl_package php-pecl-apfd} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global with_zts 0%{?__ztsphp:1} %global pecl_name apfd @@ -35,7 +32,7 @@ Summary: Always Populate Form Data Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.0.1 -Release: 5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 6%{?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} @@ -98,7 +95,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO mv %{pecl_name}-%{version}%{?prever} 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 # Sanity check, really often broken @@ -162,6 +161,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 @@ -178,6 +178,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -229,6 +230,9 @@ rm -rf %{buildroot} %changelog +* Sat Mar 5 2016 Remi Collet <remi@fedoraproject.org> - 1.0.1-6 +- adapt for F24 + * Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 1.0.1-5 - rebuild for PHP 7.0.0RC5 new API version @@ -252,4 +256,5 @@ rm -rf %{buildroot} - Update to 1.0.0RC1 * Sat Feb 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-0 -- initial package, for upcoming version 1.0.0
\ No newline at end of file +- initial package, for upcoming version 1.0.0 + |