From 0ea4b2cc53719121dd5c963258a40dadac225589 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 May 2017 11:02:57 +0200 Subject: v3.0.2 --- .gitignore | 7 +++++++ REFLECTION | 18 ++++++++++++++---- php-pecl-rdkafka.spec | 19 +++++++++++-------- 3 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1ab5c4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/REFLECTION b/REFLECTION index 3eafd38..95c716d 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,14 +1,14 @@ -Extension [ extension #116 rdkafka version 3.0.1 ] { +Extension [ extension #120 rdkafka version 3.0.2 ] { - - Constants [89] { + - Constants [99] { Constant [ integer RD_KAFKA_CONSUMER ] { 1 } Constant [ integer RD_KAFKA_OFFSET_BEGINNING ] { -2 } Constant [ integer RD_KAFKA_OFFSET_END ] { -1 } 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 ] { 590847 } - Constant [ integer RD_KAFKA_BUILD_VERSION ] { 590847 } + Constant [ integer RD_KAFKA_VERSION ] { 591359 } + Constant [ integer RD_KAFKA_BUILD_VERSION ] { 591359 } 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 } @@ -44,6 +44,8 @@ Extension [ extension #116 rdkafka version 3.0.1 ] { Constant [ integer RD_KAFKA_RESP_ERR__NO_OFFSET ] { -168 } Constant [ integer RD_KAFKA_RESP_ERR__OUTDATED ] { -167 } Constant [ integer RD_KAFKA_RESP_ERR__TIMED_OUT_QUEUE ] { -166 } + Constant [ integer RD_KAFKA_RESP_ERR__UNSUPPORTED_FEATURE ] { -165 } + Constant [ integer RD_KAFKA_RESP_ERR__WAIT_CACHE ] { -164 } Constant [ integer RD_KAFKA_RESP_ERR__END ] { -100 } Constant [ integer RD_KAFKA_RESP_ERR_UNKNOWN ] { -1 } Constant [ integer RD_KAFKA_RESP_ERR_NO_ERROR ] { 0 } @@ -82,6 +84,14 @@ Extension [ extension #116 rdkafka version 3.0.1 ] { Constant [ integer RD_KAFKA_RESP_ERR_UNSUPPORTED_SASL_MECHANISM ] { 33 } Constant [ integer RD_KAFKA_RESP_ERR_ILLEGAL_SASL_STATE ] { 34 } Constant [ integer RD_KAFKA_RESP_ERR_UNSUPPORTED_VERSION ] { 35 } + Constant [ integer RD_KAFKA_RESP_ERR_TOPIC_ALREADY_EXISTS ] { 36 } + Constant [ integer RD_KAFKA_RESP_ERR_INVALID_PARTITIONS ] { 37 } + Constant [ integer RD_KAFKA_RESP_ERR_INVALID_REPLICATION_FACTOR ] { 38 } + Constant [ integer RD_KAFKA_RESP_ERR_INVALID_REPLICA_ASSIGNMENT ] { 39 } + Constant [ integer RD_KAFKA_RESP_ERR_INVALID_CONFIG ] { 40 } + Constant [ integer RD_KAFKA_RESP_ERR_NOT_CONTROLLER ] { 41 } + Constant [ integer RD_KAFKA_RESP_ERR_INVALID_REQUEST ] { 42 } + Constant [ integer RD_KAFKA_RESP_ERR_UNSUPPORTED_FOR_MESSAGE_FORMAT ] { 43 } Constant [ integer RD_KAFKA_CONF_UNKNOWN ] { -2 } Constant [ integer RD_KAFKA_CONF_INVALID ] { -1 } Constant [ integer RD_KAFKA_CONF_OK ] { 0 } diff --git a/php-pecl-rdkafka.spec b/php-pecl-rdkafka.spec index 576e896..fb1f75d 100644 --- a/php-pecl-rdkafka.spec +++ b/php-pecl-rdkafka.spec @@ -20,16 +20,17 @@ %global ini_name 40-%{pecl_name}.ini %endif +%global buildver %(pkg-config --silence-errors --modversion rdkafka 2>/dev/null || echo 65536) + Summary: Kafka client based on librdkafka Name: %{?sub_prefix}php-pecl-%{pecl_name} -Version: 3.0.1 +Version: 3.0.2 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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: librdkafka-devel > 0.8 BuildRequires: %{?scl_prefix}php-devel > 5.3 BuildRequires: %{?scl_prefix}php-pear @@ -37,6 +38,7 @@ BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} +Requires: librdkafka%{?_isa} >= %{buildver} Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} @@ -69,6 +71,10 @@ Obsoletes: php70w-pecl-%{pecl_name} <= %{version} Obsoletes: php71u-pecl-%{pecl_name} <= %{version} Obsoletes: php71w-pecl-%{pecl_name} <= %{version} %endif +%if "%{php_version}" > "7.2" +Obsoletes: php72u-pecl-%{pecl_name} <= %{version} +Obsoletes: php72w-pecl-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -139,7 +145,6 @@ make %{?_smp_mflags} %install -rm -rf %{buildroot} %{?dtsenable} make -C NTS install INSTALL_ROOT=%{buildroot} @@ -198,12 +203,7 @@ cd ../ZTS %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{?_licensedir:%license NTS/LICENSE} %doc %{pecl_docdir}/%{pecl_name} %{pecl_xmldir}/%{name}.xml @@ -218,6 +218,9 @@ rm -rf %{buildroot} %changelog +* Wed May 24 2017 Remi Collet - 3.0.2-1 +- Update to 3.0.2 (stable) + * Sat Jan 28 2017 Remi Collet - 3.0.1-1 - Update to 3.0.1 -- cgit