From b1d1f0b1bd564c2cddf87c30bf4cbd3cb66fd357 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 7 Dec 2020 09:01:51 +0100
Subject: update to 8.0 raise dependency on PHP 8.0

---
 php-pecl-memcache.spec | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

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

diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 754af65..7c38c19 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -11,25 +11,26 @@
 %scl_package       php-pecl-memcache
 %endif
 
-%global pecl_name   memcache
 # Not ready, some failed UDP tests. Neded investigation.
-%global with_tests  0%{?_with_tests:1}
+%bcond_with         tests
+
+%global pecl_name   memcache
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %global ini_name    40-%{pecl_name}.ini
 
 Summary:      Extension to work with the Memcached caching daemon
 Name:         %{?scl_prefix}php-pecl-memcache
-Version:      4.0.5.2
+Version:      8.0
 Release:      1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:      https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 License:      PHP
 URL:          https://pecl.php.net/package/%{pecl_name}
 
 BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel > 7
+BuildRequires: %{?scl_prefix}php-devel >= 8.0
 BuildRequires: %{?scl_prefix}php-pear
 BuildRequires: zlib-devel
-%if %{with_tests}
+%if %{with tests}
 BuildRequires: memcached
 %endif
 
@@ -58,21 +59,17 @@ Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "7.1"
 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
-%if "%{php_version}" > "7.3"
 Obsoletes:      php73-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php73w-pecl-%{pecl_name} <= %{version}
-%endif
 %if "%{php_version}" > "7.4"
 Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php74w-pecl-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "8.0"
+Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
 
@@ -100,9 +97,10 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 pushd NTS
+sed -e '/PHP_MEMCACHE_VERSION/s/4.0.5.2/%{version}/' -i src/php_memcache.h
+
 # Check version as upstream often forget to update this
-dir=php7
-extver=$(sed -n '/#define PHP_MEMCACHE_VERSION/{s/.* "//;s/".*$//;p}' $dir/php_memcache.h)
+extver=$(sed -n '/#define PHP_MEMCACHE_VERSION/{s/.* "//;s/".*$//;p}' src/php_memcache.h)
 if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
    : Error: Upstream version is now ${extver}, expecting %{version}%{?prever:-%{prever}}
    : Update the pdover macro and rebuild.
@@ -140,9 +138,9 @@ extension=%{pecl_name}.so
 ;  Lock Timeout
 ;memcache.lock_timeout = 15
 
-;memcache.prefix_host_key = 0
-;memcache.prefix_host_key_remove_www = 1
-;memcache.prefix_host_key_remove_subdomain = 0
+;memcache.prefix_host_key = Off
+;memcache.prefix_host_key_remove_www = On
+;memcache.prefix_host_key_remove_subdomain = Off
 ;memcache.prefix_static_key = ''
 
 ; ----- Options to use the memcache session handler
@@ -156,9 +154,9 @@ extension=%{pecl_name}.so
 ;  Defines a comma separated of server urls to use for session storage
 ;  Only used when memcache.session_save_path is not set
 ;session.save_path="tcp://localhost:11211?persistent=1&weight=1&timeout=1&retry_interval=15"
-;memcache.session_prefix_host_key = 0
-;memcache.session_prefix_host_key_remove_www = 1
-;memcache.session_prefix_host_key_remove_subdomain = 0
+;memcache.session_prefix_host_key = Off
+;memcache.session_prefix_host_key_remove_www = On
+;memcache.session_prefix_host_key_remove_subdomain = On
 ;memcache.session_prefix_static_key = ''
 ;memcache.session_save_path = ''
 EOF
@@ -218,7 +216,7 @@ done
     -m | grep %{pecl_name}
 %endif
 
-%if %{with_tests}
+%if %{with tests}
 : Configuration for tests
 cd NTS
 sed -e "s:/var/run/memcached/memcached.sock:$PWD/memcached.sock:" \
@@ -281,6 +279,10 @@ fi
 
 
 %changelog
+* Mon Dec  7 2020 Remi Collet <remi@remirepo.net> - 8.0-1
+- update to 8.0
+- raise dependency on PHP 8.0
+
 * Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 4.0.5.2-1
 - update to 4.0.5.2 (no change)
 
-- 
cgit