From fb4724cf719fd26e14dab62bf50da406229887bb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 May 2017 15:45:19 +0200 Subject: rebuild --- .gitignore | 7 +++++++ php-pecl-cassandra.spec | 11 +++++++++-- 2 files changed, 16 insertions(+), 2 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/php-pecl-cassandra.spec b/php-pecl-cassandra.spec index 0a15907..50c1a12 100644 --- a/php-pecl-cassandra.spec +++ b/php-pecl-cassandra.spec @@ -32,7 +32,7 @@ Summary: DataStax PHP Driver for Apache Cassandra Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.3.0 -Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: ASL 2.0 Group: Development/Languages URL: http://pecl.php.net/package/%{pecl_name} @@ -50,7 +50,7 @@ BuildRequires: cassandra-cpp-driver-devel >= 2.6.0 BuildRequires: libuv-devel BuildRequires: gmp-devel -Requires: cassandra-cpp-driver-devel%{?_isa} >= %{buildver} +Requires: cassandra-cpp-driver%{?_isa} >= %{buildver} Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} Requires: %{?scl_prefix}php(api) = %{php_core_api} %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} @@ -84,6 +84,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 @@ -249,6 +253,9 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Wed May 24 2017 Remi Collet - 1.3.0-2 +- rebuild against new cassandra-cpp-driver + * Thu Mar 16 2017 Remi Collet - 1.3.0-1 - Update to 1.3.0 - raise dependency on PHP 5.6 -- cgit