diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | amqp-php54.patch | 21 | ||||
| -rw-r--r-- | php-pecl-amqp.spec | 24 |
3 files changed, 17 insertions, 30 deletions
@@ -1,4 +1,4 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) -include ../common/Makefile +include ../../../common/Makefile diff --git a/amqp-php54.patch b/amqp-php54.patch deleted file mode 100644 index 322cc34..0000000 --- a/amqp-php54.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up amqp-1.0.1/amqp_connection.c.php54 amqp-1.0.1/amqp_connection.c ---- amqp-1.0.1/amqp_connection.c.php54 2012-03-10 09:08:22.807066125 +0100 -+++ amqp-1.0.1/amqp_connection.c 2012-03-10 09:09:12.428067313 +0100 -@@ -512,7 +512,7 @@ PHP_METHOD(amqp_connection_class, pconne - amqp_connection_object *connection; - char *key; - int key_len; -- list_entry *le, new_le; -+ zend_rsrc_list_entry *le, new_le; - - /* Try to pull amqp object out of method params */ - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &id, amqp_connection_class_entry) == FAILURE) { -@@ -545,7 +545,7 @@ PHP_METHOD(amqp_connection_class, pconne - /* Store a reference in the persistence list */ - new_le.ptr = connection->connection_resource; - new_le.type = le_amqp_connection_resource; -- zend_hash_add(&EG(persistent_list), key, key_len + 1, &new_le, sizeof(list_entry), NULL); -+ zend_hash_add(&EG(persistent_list), key, key_len + 1, &new_le, sizeof(zend_rsrc_list_entry), NULL); - - /* Cleanup our key */ - efree(key); diff --git a/php-pecl-amqp.spec b/php-pecl-amqp.spec index 2421aea..7aea2bf 100644 --- a/php-pecl-amqp.spec +++ b/php-pecl-amqp.spec @@ -4,7 +4,7 @@ Summary: Communicate with any AMQP compliant server Name: php-pecl-amqp -Version: 1.0.5 +Version: 1.0.7 Release: 1%{?dist} License: PHP Group: Development/Languages @@ -20,14 +20,21 @@ Requires: php(zend-abi) = %{php_zend_api} Requires: php(api) = %{php_core_api} Requires(post): %{__pecl} Requires(postun): %{__pecl} -Provides: php-pecl(%{pecl_name}) = %{version}-%{release} +Provides: php-pecl(%{pecl_name}) = %{version} +Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} -# RPM 4.8 +# Other third party repo stuff +Obsoletes: php53-pecl-amqp +Obsoletes: php53u-pecl-amqp +%if "%{php_version}" > "5.4" +Obsoletes: php54-pecl-amqp +%endif + + +# filter private shared %{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$} %{?filter_setup} -# RPM 4.9 -%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/.*\\.so$ %description @@ -40,9 +47,6 @@ from any queue. %prep %setup -q -c -sed -e '/Version/s/1.0.4/%{version}/' \ - -i %{pecl_name}-%{version}/amqp.c - # Upstream often forget to change this extver=$(sed -n '/"Version"/{s/.*"1/1/;s/".*$//;p}' %{pecl_name}-%{version}/amqp.c) if test "x${extver}" != "x%{version}"; then @@ -134,6 +138,10 @@ fi %changelog +* Wed Sep 12 2012 Remi Collet <remi@fedoraproject.org> - 1.0.7-1 +- update to 1.0.7 +- cleanups + * Mon Aug 27 2012 Remi Collet <remi@fedoraproject.org> - 1.0.5-1 - update to 1.0.5 - LICENSE now provided in upstream tarball |