diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-03-06 07:21:59 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-03-06 07:21:59 +0100 |
| commit | 1819dbfe7379ec454c1aee6120782908d24fba57 (patch) | |
| tree | ec89391301162484a1582f0fc6065c78eaf23ae1 | |
| parent | f3aed89479c24c9fe5e43e6cb4dcc5b97db02678 (diff) | |
php-pecl-pcs: F24
| -rw-r--r-- | php-pecl-pcs.spec | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/php-pecl-pcs.spec b/php-pecl-pcs.spec index 7cc1af6..778748c 100644 --- a/php-pecl-pcs.spec +++ b/php-pecl-pcs.spec @@ -15,9 +15,6 @@ %endif %{?scl: %scl_package php-pecl-pcs} -%{!?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 pcs @@ -32,7 +29,7 @@ Summary: PHP Code Service Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.3.1 -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: PHP Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -108,6 +105,8 @@ These are the files needed to compile programs using PCS. %setup -q -c mv %{pecl_name}-%{version} NTS +%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} + cd NTS # Sanity check, really often broken @@ -178,6 +177,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 @@ -194,6 +194,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -267,6 +268,9 @@ rm -rf %{buildroot} %changelog +* Sun Mar 6 2016 Remi Collet <remi@fedoraproject.org> - 1.3.1-2 +- adapt for F24 + * Thu Dec 17 2015 Remi Collet <remi@fedoraproject.org> - 1.3.1-1 - Update to 1.3.1 (beta) - add suhosin.executor.include.whitelist=pcs:// @@ -287,4 +291,4 @@ rm -rf %{buildroot} - Update to 1.1.1 (beta) * Thu Nov 19 2015 Remi Collet <remi@fedoraproject.org> - 1.1.0-1 -- initial package, version 1.1.0 (beta)
\ No newline at end of file +- initial package, version 1.1.0 (beta) |