summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-03-04 14:28:11 +0100
committerRemi Collet <fedora@famillecollet.com>2015-03-04 14:28:11 +0100
commit0faf84481920f6614686be4a7515f73f9ccca4e5 (patch)
tree03b6690d58a1579a2e16fc964316fff69cc76263
parent081587f3493faa62006195adaf726d6ef0666333 (diff)
php-pecl-uopz: 2.0.7
-rw-r--r--REFLECTION5
-rw-r--r--php-pecl-uopz.spec32
2 files changed, 25 insertions, 12 deletions
diff --git a/REFLECTION b/REFLECTION
index e98d0bb..3211cc3 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #179 uopz version 2.0.6 ] {
+Extension [ <persistent> extension #17 uopz version 2.0.7 ] {
- INI {
Entry [ uopz.overloads <SYSTEM> ]
@@ -138,7 +138,8 @@ Extension [ <persistent> extension #179 uopz version 2.0.6 ] {
}
Function [ <internal:uopz> function __uopz_exit_overload ] {
- - Parameters [0] {
+ - Parameters [1] {
+ Parameter #0 [ <required> $status ]
}
}
}
diff --git a/php-pecl-uopz.spec b/php-pecl-uopz.spec
index 824b498..97a1f39 100644
--- a/php-pecl-uopz.spec
+++ b/php-pecl-uopz.spec
@@ -2,7 +2,7 @@
#
# Copyright (c) 2014-2015 Remi Collet
# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
+# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
@@ -23,8 +23,8 @@
Summary: User Operations for Zend
Name: %{?scl_prefix}php-pecl-%{pecl_name}
-Version: 2.0.6
-Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}.1
+Version: 2.0.7
+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}
@@ -34,8 +34,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: %{?scl_prefix}php-devel > 5.4
BuildRequires: %{?scl_prefix}php-pear
-Requires(post): %{__pecl}
-Requires(postun): %{__pecl}
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
@@ -182,12 +180,23 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
-%post
-%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+# Don't install/register tests
+sed -e 's/role="test"/role="src"/' -i package.xml
+
+# 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
@@ -228,6 +237,7 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
+%{?_licensedir:%license NTS/LICENSE}
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -240,9 +250,11 @@ rm -rf %{buildroot}
%endif
-# add date time as upstream used to release various
-# archives using the same version :(
%changelog
+* Wed Mar 04 2015 Remi Collet <remi@fedoraproject.org> - 2.0.7-1
+- Update to 2.0.7
+- drop runtime dependency on pear, new scriptlets
+
* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 2.0.6-1.1
- Fedora 21 SCL mass rebuild