From 12eb2c701dc4c290886b26a1571dc472cb68d87f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 21 Feb 2023 08:35:44 +0100
Subject: spec cleanup, synced with fork version 1.3.8

---
 php-pecl-cassandra.spec | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'php-pecl-cassandra.spec')

diff --git a/php-pecl-cassandra.spec b/php-pecl-cassandra.spec
index f222a51..35edb5d 100644
--- a/php-pecl-cassandra.spec
+++ b/php-pecl-cassandra.spec
@@ -1,7 +1,7 @@
 # remirepo spec file for php-pecl-cassandra
 #
-# Copyright (c) 2015-2022 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2015-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please preserve changelog entries
@@ -21,11 +21,7 @@
 #global gh_short    %%(c=%%{gh_commit}; echo ${c:0:7})
 %global gh_owner    datastax
 %global gh_project  php-driver
-%if "%{php_version}" < "5.6"
-%global ini_name    %{pecl_name}.ini
-%else
 %global ini_name    40-%{pecl_name}.ini
-%endif
 
 # We don't really rely on upstream ABI
 %global buildver %(pkg-config --silence-errors --modversion cassandra 2>/dev/null || echo 65536)
@@ -33,8 +29,8 @@
 Summary:      DataStax PHP Driver for Apache Cassandra
 Name:         %{?scl_prefix}php-pecl-%{pecl_name}
 Version:      1.3.2
-Release:      11%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-License:      ASL 2.0
+Release:      12%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+License:      Apache-2.0
 URL:          https://pecl.php.net/package/%{pecl_name}
 
 # Pull sources from github to get tests
@@ -99,11 +95,9 @@ cd NTS
 %patch1 -p2 -b .pr132
 %patch2 -p2 -b .pr135
 %patch3 -p2 -b .pr141
-%if "%{php_version}" > "8.0"
 %patch4 -p2 -b .php8
 %patch5 -p2 -b .php81
 %patch6 -p2 -b .php82
-%endif
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_DRIVER_VERSION /{s/.* "//;s/".*$//;p}' version.h)
@@ -240,6 +234,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Tue Feb 20 2023 Remi Collet <remi@remirepo.net> - 1.3.2-12
+- spec cleanup, synced with fork version 1.3.8
+
 * Fri Sep 16 2022 Remi Collet <remi@remirepo.net> - 1.3.2-11
 - add patch for PHP 8.2 from
   https://github.com/nano-interactive/cassandra-php-driver/pull/36
-- 
cgit