diff options
| -rw-r--r-- | php-pecl-solr2.spec | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/php-pecl-solr2.spec b/php-pecl-solr2.spec index b816263..bea04da 100644 --- a/php-pecl-solr2.spec +++ b/php-pecl-solr2.spec @@ -27,7 +27,7 @@ Summary: Object oriented API to Apache Solr Summary(fr): API orientée objet pour Apache Solr Name: %{?scl_prefix}php-pecl-solr2 Version: 2.1.0 -Release: 0.1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}.1 +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/solr @@ -43,8 +43,6 @@ BuildRequires: curl-devel BuildRequires: libxml2-devel BuildRequires: pcre-devel -Requires(post): %{__pecl} -Requires(postun): %{__pecl} Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} %if "%{php_version}" < "5.4" @@ -178,13 +176,21 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%post -%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : +# when pear installed alone, after us +%triggerin -- %{?scl_prefix}php-pear +if [ -x %{__pecl} ] ; then + %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : +fi +# posttrans as pear can be installed after us +%posttrans +if [ -x %{__pecl} ] ; then + %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : +fi %postun -if [ $1 -eq 0 ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : +if [ $1 -eq 0 -a -x %{__pecl} ] ; then + %{pecl_uninstall} %{proj_name} >/dev/null || : fi @@ -249,6 +255,10 @@ rm -rf %{buildroot} %changelog +* Sun Jan 18 2015 Remi Collet <remi@fedoraproject.org> - 2.1.0-1 +- update to 2.0.0 +- drop runtime dependency on pear, new scriptlets + * Sun Jan 11 2015 Remi Collet <remi@fedoraproject.org> - 2.1.0-0.1 - test build of upcomming 2.1.0 |