diff options
| author | Remi Collet <remi@remirepo.net> | 2018-06-28 11:52:49 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-06-28 11:52:49 +0200 |
| commit | 4a510a44ed6ac32ba1f571ad46fbc790144f7ac7 (patch) | |
| tree | 70c0b04b9a0b25d2b1d61ebbbb5af34f67ee51ca /php-pecl-cassandra.spec | |
| parent | 6695f4307ff4353ed469d2aaec190059cf57d85b (diff) | |
add patch for [-Werror=format-security] from https://github.com/datastax/php-driver/pull/126
Diffstat (limited to 'php-pecl-cassandra.spec')
| -rw-r--r-- | php-pecl-cassandra.spec | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/php-pecl-cassandra.spec b/php-pecl-cassandra.spec index 5c02d2b..3aa308a 100644 --- a/php-pecl-cassandra.spec +++ b/php-pecl-cassandra.spec @@ -1,6 +1,6 @@ # remirepo spec file for php-pecl-cassandra # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -32,9 +32,8 @@ Summary: DataStax PHP Driver for Apache Cassandra Name: %{?sub_prefix}php-pecl-%{pecl_name} Version: 1.3.2 -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} # Pull sources from github to get tests @@ -44,6 +43,8 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/ Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif +Patch0: https://patch-diff.githubusercontent.com/raw/datastax/php-driver/pull/126.patch + BuildRequires: %{?scl_prefix}php-devel >= 5.6 BuildRequires: %{?scl_prefix}php-pear BuildRequires: cassandra-cpp-driver-devel >= 2.7.0 @@ -66,12 +67,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{releas %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "7.0" @@ -118,6 +113,8 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS +%patch0 -p2 -b .pr126 + # Sanity check, really often broken extver=$(sed -n '/#define PHP_DRIVER_VERSION /{s/.* "//;s/".*$//;p}' version.h) if test "x${extver}" != "x%{version}%{?prever}"; then @@ -182,7 +179,7 @@ do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done -%if 0%{?fedora} < 24 +%if 0%{?fedora} < 24 && 0%{?rhel} < 8 # when pear installed alone, after us %triggerin -- %{?scl_prefix}php-pear if [ -x %{__pecl} ] ; then @@ -251,6 +248,10 @@ REPORT_EXIT_STATUS=1 \ %changelog +* Thu Jun 28 2018 Remi Collet <remi@remirepo.net> - 1.3.2-2 +- add patch for [-Werror=format-security] from + https://github.com/datastax/php-driver/pull/126 + * Tue Aug 15 2017 Remi Collet <remi@remirepo.net> - 1.3.2-1 - Update to 1.3.2 - raise dependency on cassandra-cpp-driver 2.7.0 |