summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION2
-rw-r--r--php-pecl-memcached.spec57
3 files changed, 45 insertions, 16 deletions
diff --git a/PHPINFO b/PHPINFO
index 89ed0a2..0ec5cab 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
memcached
memcached support => enabled
-Version => 3.3.0RC1
+Version => 3.4.0
libmemcached-awesome version => 1.1.4
SASL support => yes
Session support => yes
diff --git a/REFLECTION b/REFLECTION
index 80a5679..c5d0a19 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #112 memcached version 3.3.0RC1 ] {
+Extension [ <persistent> extension #139 memcached version 3.4.0 ] {
- Dependencies {
Dependency [ session (Required) ]
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index d31bf78..d9e2e94 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -3,9 +3,9 @@
#
# Fedora spec file for php-pecl-memcached
#
-# Copyright (c) 2009-2024 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText: Copyright 2009-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
# Please, preserve the changelog entries
#
@@ -24,12 +24,14 @@
%bcond_without tests
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
+%global pie_vend php-memcached
+%global pie_proj php-memcached
%global pecl_name memcached
# After 40-igbinary, 40-json, 40-msgpack
%global ini_name 50-%{pecl_name}.ini
-%global upstream_version 3.3.0
-%global upstream_prever RC1
+%global upstream_version 3.4.0
+#global upstream_prever RC1
# upstream use dev => alpha => beta => RC
# make RPM happy DEV => alpha => beta => rc
%global upstream_lower %(echo %{upstream_prever} | tr '[:upper:]' '[:lower:]')
@@ -69,12 +71,13 @@ BuildRequires: memcached
%endif
BuildRequires: pkgconfig(libevent) >= 2.0.2
-%if 0%{?rhel}
+%if 0%{?rhel} && 0%{?rhel} < 10
%global move_to_opt 1
BuildRequires: %{?vendeur:%{vendeur}-}libmemcached-awesome-devel >= 1.1
Requires: libevent%{?_isa}
Requires: fastlz%{?_isa}
Requires: zlib%{?_isa}
+Requires: libzstd%{?_isa}
Requires: cyrus-sasl-lib%{?_isa}
Requires: %{?vendeur:%{vendeur}-}libmemcached-awesome%{?_isa}
%else
@@ -92,15 +95,19 @@ Requires: %{?scl_prefix}php-igbinary%{?_isa}
Requires: %{?scl_prefix}php-msgpack%{?_isa}
%endif
-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}
+# Extension
+Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
+Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
+# PECL
+Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
+Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+# PIE
+Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
+Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version}
%if %{move_to_opt}
-%{?filter_requires_in: %filter_requires_in %{_libdir}/.*\.so$}
+%global __requires_exclude_from ^%{_libdir}/.*$
%endif
-%{?filter_setup}
%description
@@ -268,12 +275,12 @@ rm tests/memcachedserver6.phpt
%endif
: Launch the Memcached service
-port=$(%{__php} -r 'echo 10000 + PHP_MAJOR_VERSION*100 + PHP_MINOR_VERSION*10 + PHP_INT_SIZE + 0%{?scl:1};')
+port=$(%{__php} -r 'echo 10000 + PHP_MAJOR_VERSION*1000 + PHP_MINOR_VERSION*100 + PHP_INT_SIZE + 0%{?scl:10} + %{?fedora}%{?rhel};')
memcached -p $port -U $port -d -P $PWD/memcached.pid
sed -e "s/11211/$port/" -i tests/*
: Port for MemcachedServer
-port=$(%{__php} -r 'echo 11000 + PHP_MAJOR_VERSION*100 + PHP_MINOR_VERSION*10 + PHP_INT_SIZE + 0%{?scl:1};')
+port=$(%{__php} -r 'echo 12000 + PHP_MAJOR_VERSION*1000 + PHP_MINOR_VERSION*100 + PHP_INT_SIZE + 0%{?scl:10} + %{?fedora}%{?rhel};')
sed -e "s/3434/$port/" -i tests/*
: Run the upstream test Suite for NTS extension
@@ -307,6 +314,28 @@ exit $ret
%changelog
+* Tue Oct 14 2025 Remi Collet <remi@remirepo.net> - 3.4.0-1
+- update to 3.4.0
+- drop patches merged upstream
+
+* Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 3.3.0-5
+- rebuild for PHP 8.5.0RC1
+
+* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 3.3.0-4
+- add patch for PHP 8.5.0alpha4 from
+ https://github.com/php-memcached-dev/php-memcached/pull/574
+
+* Tue Jul 15 2025 Remi Collet <remi@remirepo.net> - 3.3.0-3
+- add patch for PHP 8.5.0alpha2 from
+ https://github.com/php-memcached-dev/php-memcached/pull/573
+
+* Mon Jul 7 2025 Remi Collet <remi@remirepo.net> - 3.3.0-2
+- re-license spec file to CECILL-2.1
+- add pie virtual provides
+
+* Fri Oct 18 2024 Remi Collet <remi@remirepo.net> - 3.3.0-1
+- update to 3.3.0
+
* Fri Oct 4 2024 Remi Collet <remi@remirepo.net> - 3.3.0~RC1-1
- update to 3.3.0RC1
- enable zstd compression support