summaryrefslogtreecommitdiffstats
path: root/php-pecl-cassandra.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php-pecl-cassandra.spec')
-rw-r--r--php-pecl-cassandra.spec32
1 files changed, 21 insertions, 11 deletions
diff --git a/php-pecl-cassandra.spec b/php-pecl-cassandra.spec
index 3860710..db419ff 100644
--- a/php-pecl-cassandra.spec
+++ b/php-pecl-cassandra.spec
@@ -12,15 +12,14 @@
%else
%global sub_prefix %{scl_prefix}
%endif
+%scl_package php-pecl-cassandra
%endif
-%{?scl: %scl_package php-pecl-cassandra}
-
%global pecl_name cassandra
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
#global prever RC
# see https://github.com/datastax/php-driver/releases
-#global gh_commit 2b0642b1d6fc451f0481edaf0163e3e5bbf896ec
+#global gh_commit 84035aa9d81c7c3b53f2f3461949e2bbdd300f46
#global gh_short %%(c=%%{gh_commit}; echo ${c:0:7})
%global gh_owner datastax
%global gh_project php-driver
@@ -36,7 +35,7 @@
Summary: DataStax PHP Driver for Apache Cassandra
Name: %{?sub_prefix}php-pecl-%{pecl_name}
-Version: 1.1.0
+Version: 1.2.0
Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: ASL 2.0
Group: Development/Languages
@@ -48,10 +47,10 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/
%else
Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
%endif
+Source1: https://raw.githubusercontent.com/datastax/php-driver/84035aa9d81c7c3b53f2f3461949e2bbdd300f46/ext/src/Cassandra/FutureRows.h
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Upstream recommends php >= 5.5
-BuildRequires: %{?scl_prefix}php-devel
+BuildRequires: %{?scl_prefix}php-devel >= 5.5
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: cassandra-cpp-driver-devel
BuildRequires: libuv-devel
@@ -62,12 +61,14 @@ Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
-Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
-Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
-Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
-Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
+%if "%{?scl_prefix}" != "%{?sub_prefix}"
+Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
+Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
+%endif
%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1}
# Other third party repo stuff
@@ -87,6 +88,10 @@ Obsoletes: php56w-pecl-%{pecl_name} <= %{version}
Obsoletes: php70u-pecl-%{pecl_name} <= %{version}
Obsoletes: php70w-pecl-%{pecl_name} <= %{version}
%endif
+%if "%{php_version}" > "7.1"
+Obsoletes: php71u-pecl-%{pecl_name} <= %{version}
+Obsoletes: php71w-pecl-%{pecl_name} <= %{version}
+%endif
%endif
%if 0%{?fedora} < 20 && 0%{?rhel} < 7
@@ -113,6 +118,8 @@ mv NTS/package.xml .
mv %{pecl_name}-%{version}%{?prever} NTS
%endif
+cp %{SOURCE1} NTS/src/Cassandra
+
# Don't install/register tests
sed -e 's/role="test"/role="src"/' \
%{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
@@ -255,6 +262,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Wed Jul 27 2016 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
+- Update to 1.2.0
+
* Fri Feb 12 2016 Remi Collet <remi@fedoraproject.org> - 1.1.0-1
- Update to 1.1.0