diff options
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | gnupg-svn.patch | 21 | ||||
| -rw-r--r-- | php-pecl-gnupg.spec | 61 |
3 files changed, 35 insertions, 49 deletions
@@ -1,4 +1,4 @@ -Extension [ <persistent> extension #87 gnupg version 1.3.3 ] { +Extension [ <persistent> extension #91 gnupg version 1.3.6 ] { - Constants [25] { Constant [ integer GNUPG_SIG_MODE_NORMAL ] { 0 } diff --git a/gnupg-svn.patch b/gnupg-svn.patch deleted file mode 100644 index 2df6cee..0000000 --- a/gnupg-svn.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- pecl/gnupg/trunk/php_gnupg.h 2013/07/17 11:48:09 330949 -+++ pecl/gnupg/trunk/php_gnupg.h 2013/07/17 11:55:40 330950 -@@ -19,7 +19,7 @@ - extern zend_module_entry gnupg_module_entry; - #define phpext_gnupg_ptr &gnupg_module_entry - --#define PHP_GNUPG_VERSION "1.3.3-dev" -+#define PHP_GNUPG_VERSION "1.3.3" - - #ifdef PHP_WIN32 - #define PHP_GNUPG_API __declspec(dllexport) ---- pecl/gnupg/trunk/gnupg.c 2013/07/17 12:00:06 330953 -+++ pecl/gnupg/trunk/gnupg.c 2013/07/17 12:11:24 330954 -@@ -1307,7 +1307,6 @@ - if(!verify_result->signatures){ - GNUPG_ERR ("no signature found"); - gpgme_data_release(in); -- free(out); - return; - } - gnupg_fetchsignatures (verify_result->signatures, return_value); diff --git a/php-pecl-gnupg.spec b/php-pecl-gnupg.spec index 405ffcb..4ed6400 100644 --- a/php-pecl-gnupg.spec +++ b/php-pecl-gnupg.spec @@ -2,7 +2,7 @@ # # Copyright (c) 2012-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 # @@ -21,27 +21,20 @@ Summary: Wrapper around the gpgme library Name: %{?scl_prefix}php-pecl-gnupg -Version: 1.3.3 -Release: 5%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}.1 +Version: 1.3.6 +Release: 1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')} License: BSD Group: Development/Languages URL: http://pecl.php.net/package/gnupg Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# http://svn.php.net/viewvc?view=revision&revision=330950 Fix version -# http://svn.php.net/viewvc?view=revision&revision=330954 Fix double-free -Patch0: %{pecl_name}-svn.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel BuildRequires: %{?scl_prefix}php-pear BuildRequires: gpgme-devel BuildRequires: gnupg -Requires(post): %{__pecl} -Requires(postun): %{__pecl} - Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} # We force use of /usr/bin/gpg as gpg2 is unusable in non-interactive mode @@ -55,17 +48,17 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} -Obsoletes: php53u-pecl-%{pecl_name} -Obsoletes: php54-pecl-%{pecl_name} -Obsoletes: php54w-pecl-%{pecl_name} +Obsoletes: php53-pecl-%{pecl_name} <= %{version} +Obsoletes: php53u-pecl-%{pecl_name} <= %{version} +Obsoletes: php54-pecl-%{pecl_name} <= %{version} +Obsoletes: php54w-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "5.5" -Obsoletes: php55u-pecl-%{pecl_name} -Obsoletes: php55w-pecl-%{pecl_name} +Obsoletes: php55u-pecl-%{pecl_name} <= %{version} +Obsoletes: php55w-pecl-%{pecl_name} <= %{version} %endif %if "%{php_version}" > "5.6" -Obsoletes: php56u-pecl-%{pecl_name} -Obsoletes: php56w-pecl-%{pecl_name} +Obsoletes: php56u-pecl-%{pecl_name} <= %{version} +Obsoletes: php56w-pecl-%{pecl_name} <= %{version} %endif %endif @@ -81,10 +74,15 @@ This module allows you to interact with gnupg. Documentation : http://www.php.net/gnupg +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection}. + %prep %setup -c -q +# Don't install/register tests +sed -e 's/role="test"/role="src"/' -i package.xml + # Create configuration file cat >%{ini_name} << 'EOF' ; Enable %{pecl_name} extension module @@ -93,7 +91,6 @@ EOF mv %{pecl_name}-%{version} NTS cd NTS -%patch0 -p3 -b .svn # Check extension version extver=$(sed -n '/#define PHP_GNUPG_VERSION/{s/.* "//;s/".*$//;p}' php_gnupg.h) @@ -146,10 +143,7 @@ make install -C ZTS INSTALL_ROOT=%{buildroot} install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif -# Test & Documentation -for i in $(grep 'role="test"' package.xml | sed -e 's/^.*name="//;s/".*$//') -do install -Dpm 644 NTS/$i %{buildroot}%{pecl_testdir}/%{pecl_name}/$i -done +# Documentation for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -159,12 +153,20 @@ done rm -rf %{buildroot} -%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 @@ -221,8 +223,8 @@ NO_INTERACTION=1 \ %files %defattr(-, root, root, -) +%{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} -%doc %{pecl_testdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml %config(noreplace) %{php_inidir}/%{ini_name} @@ -235,6 +237,11 @@ NO_INTERACTION=1 \ %changelog +* Thu Feb 12 2015 Remi Collet <remi@fedoraproject.org> - 1.3.6-1 +- Update to 1.3.6 +- don't install test suite +- drop runtime dependency on pear, new scriptlets + * Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 1.3.3-5.1 - Fedora 21 SCL mass rebuild |