diff options
| author | Remi Collet <remi@remirepo.net> | 2023-05-01 08:27:10 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2023-05-01 08:27:10 +0200 |
| commit | e85ad01c89b0c8cab0a227bb7d751a032dc2b840 (patch) | |
| tree | 07c7772461a73fbd8bd07033d39e7884445de1dc /php-pecl-memcache.spec | |
| parent | d21d9f2894a9cc066b96045e314cf3b4ebc22f52 (diff) | |
update to 8.2
drop patches merged upstream
Diffstat (limited to 'php-pecl-memcache.spec')
| -rw-r--r-- | php-pecl-memcache.spec | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec index a26509a..7285761 100644 --- a/php-pecl-memcache.spec +++ b/php-pecl-memcache.spec @@ -1,15 +1,12 @@ # spec file for php-pecl-memcache # -# Copyright (c) 2007-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2007-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%if 0%{?scl:1} -%global sub_prefix %{scl_prefix} -%scl_package php-pecl-memcache -%endif +%{?scl:%scl_package php-pecl-memcache} # Not ready, some failed UDP tests. Neded investigation. %bcond_with tests @@ -20,15 +17,12 @@ Summary: Extension to work with the Memcached caching daemon Name: %{?scl_prefix}php-pecl-memcache -Version: 8.0 -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Version: 8.2 +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 +License: PHP-3.01 URL: https://pecl.php.net/package/%{pecl_name} -Patch0: %{pecl_name}-php81.patch -Patch1: %{pecl_name}-php82.patch - BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 8.0 @@ -46,16 +40,12 @@ 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} -%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 "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} == 7 # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} +Obsoletes: php53-pecl-%{pecl_name} <= %{version} Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-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} @@ -70,10 +60,6 @@ Obsoletes: php72w-pecl-%{pecl_name} <= %{version} Obsoletes: php73-pecl-%{pecl_name} <= %{version} Obsoletes: php73w-pecl-%{pecl_name} <= %{version} Obsoletes: php74-pecl-%{pecl_name} <= %{version} -Obsoletes: php80-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "8.1" -Obsoletes: php81-pecl-%{pecl_name} <= %{version} -%endif %endif @@ -100,11 +86,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml pushd NTS -%patch0 -p1 -%patch1 -p1 - -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 extver=$(sed -n '/#define PHP_MEMCACHE_VERSION/{s/.* "//;s/".*$//;p}' src/php_memcache.h) if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then @@ -290,6 +271,10 @@ fi %changelog +* Mon May 1 2023 Remi Collet <remi@remirepo.net> - 8.2-1 +- update to 8.2 +- drop patches merged upstream + * Wed Oct 5 2022 Remi Collet <remi@remirepo.net> - 8.0-4 - add patch for PHP 8.2 from https://github.com/websupport-sk/pecl-memcache/pull/104 |