diff options
| author | Remi Collet <fedora@famillecollet.com> | 2015-06-25 14:50:29 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2015-06-25 14:50:29 +0200 |
| commit | 99830d1d788e82af1a0639294fed6f6f29780ca7 (patch) | |
| tree | 9048439d8b4e24fd50e91e0f9c9b8d1c3c8244f8 | |
| parent | a0517808558ffde93a510cb60d14039ca520cc67 (diff) | |
php-pecl-hprose: 1.5.5
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | hprose-pr10.patch | 22 | ||||
| -rw-r--r-- | php-pecl-hprose.spec | 12 |
3 files changed, 6 insertions, 30 deletions
@@ -1,4 +1,4 @@ -Extension [ <persistent> extension #98 hprose version 1.5.4 ] { +Extension [ <persistent> extension #98 hprose version 1.5.5 ] { - Functions { Function [ <internal:hprose> function hprose_serialize ] { diff --git a/hprose-pr10.patch b/hprose-pr10.patch deleted file mode 100644 index 9f9208a..0000000 --- a/hprose-pr10.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f275dff446a2c80dedc941e50e330d9eaf427615 Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Wed, 24 Jun 2015 09:05:56 +0200 -Subject: [PATCH] use zend_ce_throwable introduce in 7.0.0alpha2, fix #9 - ---- - hprose_service.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hprose_service.c b/hprose_service.c -index b7e5924..e6a62d8 100644 ---- a/hprose_service.c -+++ b/hprose_service.c -@@ -30,7 +30,7 @@ - #if PHP_MAJOR_VERSION < 7 - #define zend_exception_ce zend_exception_get_default(TSRMLS_C) - #else --#define zend_exception_ce zend_exception_get_base() -+#define zend_exception_ce zend_ce_throwable - #endif - - static zend_bool is_magic_method(char *name, int32_t len) { diff --git a/php-pecl-hprose.spec b/php-pecl-hprose.spec index ddde849..d550525 100644 --- a/php-pecl-hprose.spec +++ b/php-pecl-hprose.spec @@ -30,16 +30,13 @@ Summary: Hprose for PHP Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 1.5.4 -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 1.5.5 +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz -# https://github.com/hprose/hprose-pecl/pull/10 -Patch0: %{pecl_name}-pr10.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{?scl_prefix}php-devel > 5.3 BuildRequires: %{?scl_prefix}php-pear @@ -107,8 +104,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .pr10 - # Sanity check, really often broken extver=$(sed -n '/#define PHP_HPROSE_VERSION/{s/.* "//;s/".*$//;p}' php_hprose.h) if test "x${extver}" != "x%{version}"; then @@ -252,6 +247,9 @@ rm -rf %{buildroot} %changelog +* Thu Jun 25 2015 Remi Collet <remi@fedoraproject.org> - 1.5.5-1 +- Update to 1.5.5 (stable) + * Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 1.5.4-2 - allow build against rh-php56 (as more-php56) |