diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-03-05 07:39:21 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-03-05 07:39:21 +0100 |
| commit | ee0d5c42437379c249f5e8687de82a4a6067f3d8 (patch) | |
| tree | 9a735f94991f448c59801936b15200024ab736a6 | |
| parent | f7aac9aefcfc7e222c440f110629ee4c2925e727 (diff) | |
php-pecl-apcu: adapt for F24
| -rw-r--r-- | php-pecl-apcu-php7.spec | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/php-pecl-apcu-php7.spec b/php-pecl-apcu-php7.spec index 8edd32b..ac9a0d3 100644 --- a/php-pecl-apcu-php7.spec +++ b/php-pecl-apcu-php7.spec @@ -15,10 +15,6 @@ %{?scl: %scl_package php-pecl-apcu} %{!?scl: %global pkg_name %{name}} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?php_incldir: %global php_incldir %{_includedir}/php} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global bootstrap 0 %global gh_commit e7a67846c2806cd70f4ea28c3aef4fe04430ad98 @@ -37,7 +33,7 @@ Version: 5.1.3 Release: 0.2.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -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;')}} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif Source1: %{pecl_name}-5.1.2.ini @@ -149,6 +145,8 @@ mv NTS/package.xml . mv %{pecl_name}-%{version} NTS %endif +%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} + cd NTS # Sanity check, really often broken @@ -260,6 +258,7 @@ REPORT_EXIT_STATUS=1 \ rm -rf %{buildroot} +%if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -276,6 +275,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %files @@ -318,6 +318,9 @@ fi %changelog +* Sat Mar 5 2016 Remi Collet <remi@fedoraproject.org> - 5.1.3-2 +- adapt for F24 + * Fri Jan 15 2016 Remi Collet <remi@fedoraproject.org> - 5.1.3-1 - Update to 5.1.3 (stable) @@ -438,4 +441,4 @@ fi - new snapshot with full APC compatibility * Sat Mar 23 2013 Remi Collet <remi@fedoraproject.org> - 4.0.0-0.1.git44e8dd4 -- initial package, version 4.0.0
\ No newline at end of file +- initial package, version 4.0.0 |