summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-09-18 12:02:12 +0200
committerRemi Collet <fedora@famillecollet.com>2015-09-18 12:02:12 +0200
commita3474add3d4e199b4ee1846a37be7d09cc02b9b4 (patch)
treead339196a38880437f27d66b4bfbb46f80ae5d0a
parent37cc772393863eebf7e87a5331c1cbacaf49ad16 (diff)
php-pecl-amqp: patch from pr 178 and 179
-rw-r--r--REFLECTION14
-rw-r--r--php-pecl-amqp.spec14
2 files changed, 26 insertions, 2 deletions
diff --git a/REFLECTION b/REFLECTION
index 8266e78..e5cd8e3 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -85,7 +85,7 @@ Extension [ <persistent> extension #74 amqp version 1.6.0beta4 ] {
- Properties [0] {
}
- - Methods [27] {
+ - Methods [29] {
Method [ <internal:amqp, ctor> public method __construct ] {
- Parameters [1] {
@@ -256,6 +256,18 @@ Extension [ <persistent> extension #74 amqp version 1.6.0beta4 ] {
- Parameters [0] {
}
}
+
+ Method [ <internal:amqp> public method getHeartbeatInterval ] {
+
+ - Parameters [0] {
+ }
+ }
+
+ Method [ <internal:amqp> public method getMaxFrameSize ] {
+
+ - Parameters [0] {
+ }
+ }
}
}
diff --git a/php-pecl-amqp.spec b/php-pecl-amqp.spec
index c7cbcc0..3ab18de 100644
--- a/php-pecl-amqp.spec
+++ b/php-pecl-amqp.spec
@@ -35,12 +35,17 @@
Summary: Communicate with any AMQP compliant server
Name: %{?sub_prefix}php-pecl-amqp
Version: 1.6.0
-Release: 0.3.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 0.4.%{prever}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
Group: Development/Languages
URL: http://pecl.php.net/package/amqp
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+# https://github.com/pdezwart/php-amqp/pull/178
+Patch0: %{pecl_name}-178.patch
+# https://github.com/pdezwart/php-amqp/pull/179
+Patch1: %{pecl_name}-179.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: %{?scl_prefix}php-devel > 5.2.0
BuildRequires: %{?scl_prefix}php-pear
@@ -107,6 +112,9 @@ sed -e 's/role="test"/role="src"/' -i package.xml
mv %{pecl_name}-%{version}%{?prever} NTS
cd NTS
+%patch0 -p1 -b .pr178
+%patch1 -p1 -b .pr179
+
# Upstream often forget to change this
extver=$(sed -n '/#define PHP_AMQP_VERSION/{s/.* "//;s/".*$//;p}' php_amqp.h)
if test "x${extver}" != "x%{version}%{?prever}"; then
@@ -287,6 +295,10 @@ fi
%changelog
+* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 1.6.0-0.4.beta4
+- open https://github.com/pdezwart/php-amqp/pull/178 - librabbitmq 0.5
+- open https://github.com/pdezwart/php-amqp/pull/179 --with-libdir
+
* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 1.6.0-0.3.beta4
- update to 1.6.0beta4