summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--REFLECTION2
-rw-r--r--php-pecl-ev.spec28
2 files changed, 22 insertions, 8 deletions
diff --git a/REFLECTION b/REFLECTION
index 8c901f4..0a1dead 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #86 ev version 0.2.13 ] {
+Extension [ <persistent> extension #88 ev version 0.2.15 ] {
- Dependencies {
Dependency [ sockets (Optional) ]
diff --git a/php-pecl-ev.spec b/php-pecl-ev.spec
index b1f9147..6eeb851 100644
--- a/php-pecl-ev.spec
+++ b/php-pecl-ev.spec
@@ -29,8 +29,8 @@
Summary: Provides interface to libev library
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: 0.2.13
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}.1
+Version: 0.2.15
+Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/%{pecl_name}
@@ -43,8 +43,6 @@ BuildRequires: %{?scl_prefix}php-sockets
# For tests
BuildRequires: %{?scl_prefix}php-posix
-Requires(post): %{__pecl}
-Requires(postun): %{__pecl}
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
Requires: %{?scl_prefix}php-sockets%{?_isa}
@@ -69,6 +67,10 @@ Obsoletes: php55w-pecl-%{pecl_name} <= %{version}
Obsoletes: php56u-pecl-%{pecl_name} <= %{version}
Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
%endif
+%if "%{php_version}" > "7.0"
+Obsoletes: php70u-pecl-%{pecl_name} <= %{version}
+Obsoletes: php70w-pecl-%{pecl_name} <= %{version}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -157,12 +159,20 @@ do install -Dpm 644 $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
+if [ $1 -eq 0 -a -x %{__pecl} ] ; then
%{pecl_uninstall} %{pecl_name} >/dev/null || :
fi
@@ -224,6 +234,10 @@ rm -rf %{buildroot}
%changelog
+* Mon May 04 2015 Remi Collet <remi@fedoraproject.org> - 0.2.15-1
+- Update to 0.2.15 (stable, no change)
+- drop runtime dependency on pear, new scriptlets
+
* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 0.2.13-1.1
- Fedora 21 SCL mass rebuild