summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-01-28 14:14:45 +0100
committerRemi Collet <fedora@famillecollet.com>2017-01-28 14:14:45 +0100
commit6445bc8fdba86252f05bc773ce83a6d5c923a7ff (patch)
tree6d1f6c3ad920399604af0146de22e82aec8ac6bb
parent502747f7ccc524412aa4d736693a351200692e40 (diff)
php-pecl-rdkafka: 3.0.1
-rw-r--r--REFLECTION6
-rw-r--r--php-pecl-rdkafka.spec11
-rw-r--r--rdkafka-build.patch22
3 files changed, 10 insertions, 29 deletions
diff --git a/REFLECTION b/REFLECTION
index fa76518..3eafd38 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #114 rdkafka version 3.0.0 ] {
+Extension [ <persistent> extension #116 rdkafka version 3.0.1 ] {
- Constants [89] {
Constant [ integer RD_KAFKA_CONSUMER ] { 1 }
@@ -7,8 +7,8 @@ Extension [ <persistent> extension #114 rdkafka version 3.0.0 ] {
Constant [ integer RD_KAFKA_OFFSET_STORED ] { -1000 }
Constant [ integer RD_KAFKA_PARTITION_UA ] { -1 }
Constant [ integer RD_KAFKA_PRODUCER ] { 0 }
- Constant [ integer RD_KAFKA_VERSION ] { 590591 }
- Constant [ integer RD_KAFKA_BUILD_VERSION ] { 590591 }
+ Constant [ integer RD_KAFKA_VERSION ] { 590847 }
+ Constant [ integer RD_KAFKA_BUILD_VERSION ] { 590847 }
Constant [ integer RD_KAFKA_RESP_ERR__BEGIN ] { -200 }
Constant [ integer RD_KAFKA_RESP_ERR__BAD_MSG ] { -199 }
Constant [ integer RD_KAFKA_RESP_ERR__BAD_COMPRESSION ] { -198 }
diff --git a/php-pecl-rdkafka.spec b/php-pecl-rdkafka.spec
index a4f7541..576e896 100644
--- a/php-pecl-rdkafka.spec
+++ b/php-pecl-rdkafka.spec
@@ -22,15 +22,13 @@
Summary: Kafka client based on librdkafka
Name: %{?sub_prefix}php-pecl-%{pecl_name}
-Version: 3.0.0
+Version: 3.0.1
Release: 1%{?dist}%{!?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
-Patch0: %{pecl_name}-build.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: librdkafka-devel > 0.8
BuildRequires: %{?scl_prefix}php-devel > 5.3
@@ -99,7 +97,6 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
-%patch0 -p1 -b .build
# Sanity check, really often broken
extver=$(sed -n '/#define PHP_RDKAFKA_VERSION/{s/.* "//;s/".*$//;p}' php_rdkafka.h)
@@ -122,6 +119,8 @@ EOF
%build
+%{?dtsenable}
+
cd NTS
%{_bindir}/phpize
%configure \
@@ -141,6 +140,7 @@ make %{?_smp_mflags}
%install
rm -rf %{buildroot}
+%{?dtsenable}
make -C NTS install INSTALL_ROOT=%{buildroot}
@@ -218,6 +218,9 @@ rm -rf %{buildroot}
%changelog
+* Sat Jan 28 2017 Remi Collet <remi@fedoraproject.org> - 3.0.1-1
+- Update to 3.0.1
+
* Mon Dec 19 2016 Remi Collet <remi@fedoraproject.org> - 3.0.0-1
- update to 3.0.0 (php 5 and 7, stable)
- open https://github.com/arnaud-lb/php-rdkafka/issues/98 failed build
diff --git a/rdkafka-build.patch b/rdkafka-build.patch
deleted file mode 100644
index b5944ca..0000000
--- a/rdkafka-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 317d4d9daa7af9f0607d5c99524947be1776e0ee Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Mon, 19 Dec 2016 17:59:21 +0100
-Subject: [PATCH] Fix #98 failed build with old gcc
-
----
- rdkafka.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rdkafka.c b/rdkafka.c
-index 3597a92..d50e47d 100644
---- a/rdkafka.c
-+++ b/rdkafka.c
-@@ -56,7 +56,7 @@ typedef struct _kafka_object {
- #if PHP_MAJOR_VERSION >= 7
- zend_object std;
- #endif
--} kafka_object;
-+};
-
- typedef struct _toppar {
- rd_kafka_topic_t *rkt;