diff options
| -rw-r--r-- | php-pecl-gmagick.spec | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/php-pecl-gmagick.spec b/php-pecl-gmagick.spec index 7941e67..699e2ab 100644 --- a/php-pecl-gmagick.spec +++ b/php-pecl-gmagick.spec @@ -8,9 +8,6 @@ # Please, preserve the changelog entries # %{?scl: %scl_package php-pecl-gmagick} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__pecl: %global __pecl %{_bindir}/pecl} -%{!?__php: %global __php %{_bindir}/php} %global pecl_name gmagick %global prever RC3 @@ -19,7 +16,7 @@ Summary: Provides a wrapper to the GraphicsMagick library Name: %{?scl_prefix}php-pecl-%{pecl_name} Version: 1.1.7 -Release: 0.6.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 0.7.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: PHP Group: Development/Libraries URL: http://pecl.php.net/package/%{pecl_name} @@ -34,10 +31,12 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} -Provides: %{?scl_prefix}php-%{pecl_name} = %{version} -Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} -Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} +Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} Conflicts: %{?scl_prefix}php-pecl-imagick Conflicts: %{?scl_prefix}php-magickwand @@ -80,7 +79,9 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %setup -qc # 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 mv %{pecl_name}-%{version}%{?prever} NTS cd NTS @@ -144,6 +145,7 @@ done rm -rf %{buildroot} +%if 0%{?fedora} < 24 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -160,6 +162,7 @@ fi if [ $1 -eq 0 -a -x %{__pecl} ] ; then %{pecl_uninstall} %{pecl_name} >/dev/null || : fi +%endif %check @@ -206,6 +209,9 @@ export TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" %changelog +* Wed Mar 9 2016 Remi Collet <remi@fedoraproject.org> - 1.1.7-0.8.RC3 +- adapt for F24 + * Fri Apr 24 2015 Remi Collet <remi@fedoraproject.org> - 1.1.7-0.6.RC3 - Update to 1.1.7RC3 (beta) - don't install/register tests |