[php-pecl-jsonc/f21] - release 1.3.7 (stable) - drop runtime dependency on pear

Remi Collet remi at fedoraproject.org
Wed Feb 18 14:26:20 UTC 2015


commit 94dd503a40f1766d29ac2d84e2c7845720e3bfec
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Feb 18 15:26:08 2015 +0100

    - release 1.3.7 (stable)
    - drop runtime dependency on pear

 .gitignore          |    1 +
 php-pecl-jsonc.spec |   28 +++++++++++++++++++---------
 sources             |    2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 546d78b..0bf838d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
 /jsonc-1.3.3.tgz
 /jsonc-1.3.5.tgz
 /jsonc-1.3.6.tgz
+/jsonc-1.3.7.tgz
diff --git a/php-pecl-jsonc.spec b/php-pecl-jsonc.spec
index 21dd2fb..70d6879 100644
--- a/php-pecl-jsonc.spec
+++ b/php-pecl-jsonc.spec
@@ -1,8 +1,8 @@
 # spec file for php-pecl-jsonc
 #
-# Copyright (c) 2013-2014 Remi Collet
+# Copyright (c) 2013-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
 #
@@ -26,8 +26,8 @@
 
 Summary:       Support for JSON serialization
 Name:          php-pecl-%{proj_name}
-Version:       1.3.6
-Release:       2%{?dist}
+Version:       1.3.7
+Release:       1%{?dist}
 License:       PHP
 Group:         Development/Languages
 URL:           http://pecl.php.net/package/%{proj_name}
@@ -43,8 +43,6 @@ BuildRequires: json-c-devel <  0.12
 Provides:      bundled(libjson-c) = 0.11
 %endif
 
-Requires(post): %{__pecl}
-Requires(postun): %{__pecl}
 Requires:      php(zend-abi) = %{php_zend_api}
 Requires:      php(api) = %{php_core_api}
 
@@ -162,12 +160,20 @@ REPORT_EXIT_STATUS=1 \
 %{__ztsphp} -n run-tests.php
 
 
-%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} %{proj_name} >/dev/null || :
 fi
 
@@ -188,6 +194,10 @@ fi
 
 
 %changelog
+* Wed Feb 18 2015 Remi Collet <remi at fedoraproject.org> - 1.3.7-1
+- release 1.3.7 (stable)
+- drop runtime dependency on pear
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index d26ed24..4012d2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65891642a4a0214bbe77e1b208cdd607  jsonc-1.3.6.tgz
+1e1471577df80f15b005d7193a53ebc2  jsonc-1.3.7.tgz


More information about the scm-commits mailing list