From a14f037fbb39011537a4616ec9a0b8bca3ce2310 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 19 Nov 2019 10:57:08 +0100
Subject: [PATCH 01/19] add patch for PHP 7.4 from  
 https://github.com/pear/Cache_Lite/pull/11

---
 11.patch                 | 31 +++++++++++++++++++++++++++++++
 php-pear-Cache-Lite.spec | 15 ++++++++++++---
 2 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 11.patch

diff --git a/11.patch b/11.patch
new file mode 100644
index 0000000..82d6810
--- /dev/null
+++ b/11.patch
@@ -0,0 +1,31 @@
+From 9b824495cb7867498b217c3a80ece1643f44267a Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 19 Nov 2019 10:50:52 +0100
+Subject: [PATCH] fix get_magic_quotes_runtime is deprecated
+
+---
+ Cache/Lite.php | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Cache/Lite.php b/Cache/Lite.php
+index c70366f..18e6b83 100644
+--- a/Cache/Lite.php
++++ b/Cache/Lite.php
+@@ -756,7 +756,7 @@ function _read()
+ 	    if ($this->_fileLocking) @flock($fp, LOCK_SH);
+             clearstatcache();
+             $length = @filesize($this->_file);
+-            $mqr = get_magic_quotes_runtime();
++            $mqr = (function_exists('get_magic_quotes_runtime') ? @get_magic_quotes_runtime() : 0);
+             if ($mqr) {
+                 set_magic_quotes_runtime(0);
+             }
+@@ -835,7 +835,7 @@ function _write($data)
+             if ($this->_readControl) {
+                 @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
+             }
+-            $mqr = get_magic_quotes_runtime();
++            $mqr = (function_exists('get_magic_quotes_runtime') ? @get_magic_quotes_runtime() : 0);
+             if ($mqr) {
+                 set_magic_quotes_runtime(0);
+             }
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index c991e04..f7e1f55 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -1,6 +1,6 @@
 # Spec file for php-pear-Cache-Lite
 #
-# Copyright (c) 2008-2018 Remi Collet
+# Copyright (c) 2008-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -13,11 +13,13 @@ Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
 Version:        1.8.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        PHP
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
+Patch0:         https://patch-diff.githubusercontent.com/raw/pear/Cache_Lite/pull/11.patch
+
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.10.1
 
@@ -45,7 +47,10 @@ et/ou des tests anti-corruption).
 %prep
 %setup -c -q
 cd %{pear_name}-%{version}
-mv ../package.xml %{name}.xml
+%patch0 -p1 -b .pr11
+sed -e '/Lite.php/s/md5sum=.*name=/name=/' \
+    ../package.xml >%{name}.xml
+touch -r ../package.xml %{name}.xml
 
 
 %build
@@ -90,6 +95,10 @@ fi
 
 
 %changelog
+* Tue Nov 19 2019 Remi Collet <remi@remirepo.net> - 1.8.2-5
+- add patch for PHP 7.4 from
+  https://github.com/pear/Cache_Lite/pull/11
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 211eed28d154a718b10c71e5445b8ab54f49f9c6 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 20 Nov 2019 07:41:08 +0100
Subject: [PATCH 02/19] update to 1.8.3 drop patch merged upstream

---
 11.patch                 | 31 -------------------------------
 php-pear-Cache-Lite.spec | 15 +++++++--------
 2 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 11.patch

diff --git a/11.patch b/11.patch
deleted file mode 100644
index 82d6810..0000000
--- a/11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9b824495cb7867498b217c3a80ece1643f44267a Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 19 Nov 2019 10:50:52 +0100
-Subject: [PATCH] fix get_magic_quotes_runtime is deprecated
-
----
- Cache/Lite.php | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Cache/Lite.php b/Cache/Lite.php
-index c70366f..18e6b83 100644
---- a/Cache/Lite.php
-+++ b/Cache/Lite.php
-@@ -756,7 +756,7 @@ function _read()
- 	    if ($this->_fileLocking) @flock($fp, LOCK_SH);
-             clearstatcache();
-             $length = @filesize($this->_file);
--            $mqr = get_magic_quotes_runtime();
-+            $mqr = (function_exists('get_magic_quotes_runtime') ? @get_magic_quotes_runtime() : 0);
-             if ($mqr) {
-                 set_magic_quotes_runtime(0);
-             }
-@@ -835,7 +835,7 @@ function _write($data)
-             if ($this->_readControl) {
-                 @fwrite($fp, $this->_hash($data, $this->_readControlType), 32);
-             }
--            $mqr = get_magic_quotes_runtime();
-+            $mqr = (function_exists('get_magic_quotes_runtime') ? @get_magic_quotes_runtime() : 0);
-             if ($mqr) {
-                 set_magic_quotes_runtime(0);
-             }
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index f7e1f55..5a88de4 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -12,14 +12,12 @@
 Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
-Version:        1.8.2
-Release:        5%{?dist}
+Version:        1.8.3
+Release:        1%{?dist}
 License:        PHP
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/pear/Cache_Lite/pull/11.patch
-
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.10.1
 
@@ -47,10 +45,7 @@ et/ou des tests anti-corruption).
 %prep
 %setup -c -q
 cd %{pear_name}-%{version}
-%patch0 -p1 -b .pr11
-sed -e '/Lite.php/s/md5sum=.*name=/name=/' \
-    ../package.xml >%{name}.xml
-touch -r ../package.xml %{name}.xml
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -95,6 +90,10 @@ fi
 
 
 %changelog
+* Wed Nov 20 2019 Remi Collet <remi@remirepo.net> - 1.8.3-1
+- update to 1.8.3
+- drop patch merged upstream
+
 * Tue Nov 19 2019 Remi Collet <remi@remirepo.net> - 1.8.2-5
 - add patch for PHP 7.4 from
   https://github.com/pear/Cache_Lite/pull/11

From 8044fce376f7169226b286b8e9d56b1dedf9cf8e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 20 Nov 2019 07:41:08 +0100
Subject: [PATCH 03/19] update to 1.8.3 drop patch merged upstream

(cherry picked from commit 211eed28d154a718b10c71e5445b8ab54f49f9c6)
---
 php-pear-Cache-Lite.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index c991e04..0f71910 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -1,6 +1,6 @@
 # Spec file for php-pear-Cache-Lite
 #
-# Copyright (c) 2008-2018 Remi Collet
+# Copyright (c) 2008-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -12,8 +12,8 @@
 Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
-Version:        1.8.2
-Release:        4%{?dist}
+Version:        1.8.3
+Release:        1%{?dist}
 License:        PHP
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Wed Nov 20 2019 Remi Collet <remi@remirepo.net> - 1.8.3-1
+- update to 1.8.3
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 6b123da465444582dfb9d8e8bfa2349d1a6e8f55 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 20 Nov 2019 07:44:18 +0100
Subject: [PATCH 04/19] v1.8.3 sources

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2069fa5..123ce25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ package-*.xml
 /Cache_Lite-1.7.16.tgz
 /Cache_Lite-1.8.0.tgz
 /Cache_Lite-1.8.2.tgz
+/Cache_Lite-1.8.3.tgz
diff --git a/sources b/sources
index cd7a46c..09c6ef4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Cache_Lite-1.8.2.tgz) = dfb3c2dadd0ca60cc62ad71fd6fc51c0665901b4370207dfeb1f0f56e9db4fb24724d22f2939f67d8aa044e1b465483c40ec34fb3bcc5e12031d4dd1e05953b4
+SHA512 (Cache_Lite-1.8.3.tgz) = 700376dd33afd0b1ed812d0d3dbdc14ad5523b3b181ac64ef0d56b62040c3d7bc9f234b3dae8013876a902f21da8dc92b1de41cea11aa428036bcc6e96166e65

From 649beedf2d4c580ba36b8d4494ba67dfe36718a1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 20 Nov 2019 07:44:18 +0100
Subject: [PATCH 05/19] v1.8.3 sources

(cherry picked from commit 6b123da465444582dfb9d8e8bfa2349d1a6e8f55)
---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 2069fa5..123ce25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ package-*.xml
 /Cache_Lite-1.7.16.tgz
 /Cache_Lite-1.8.0.tgz
 /Cache_Lite-1.8.2.tgz
+/Cache_Lite-1.8.3.tgz
diff --git a/sources b/sources
index cd7a46c..09c6ef4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Cache_Lite-1.8.2.tgz) = dfb3c2dadd0ca60cc62ad71fd6fc51c0665901b4370207dfeb1f0f56e9db4fb24724d22f2939f67d8aa044e1b465483c40ec34fb3bcc5e12031d4dd1e05953b4
+SHA512 (Cache_Lite-1.8.3.tgz) = 700376dd33afd0b1ed812d0d3dbdc14ad5523b3b181ac64ef0d56b62040c3d7bc9f234b3dae8013876a902f21da8dc92b1de41cea11aa428036bcc6e96166e65

From 6d9225615821d77fe2db609fc81f1628f8c48f83 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 30 Jan 2020 08:01:17 +0000
Subject: [PATCH 06/19] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 5a88de4..48ab8d3 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -13,7 +13,7 @@ Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
 Version:        1.8.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        PHP
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Wed Nov 20 2019 Remi Collet <remi@remirepo.net> - 1.8.3-1
 - update to 1.8.3
 - drop patch merged upstream

From 3ab2ddfbc53b5b57bc74600643bae1ce4e14b530 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 21:38:07 +0000
Subject: [PATCH 07/19] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 48ab8d3..517eb2f 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -13,7 +13,7 @@ Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
 Version:        1.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        PHP
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From ccc82e4f081497c658c3e8b438bcb41870b6ab44 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 07:16:05 +0000
Subject: [PATCH 08/19] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 517eb2f..08324a5 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -13,7 +13,7 @@ Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
 Version:        1.8.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        PHP
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From f094bf5385ed1c19804db30201f642dbdd2c3abd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 02:36:46 +0000
Subject: [PATCH 09/19] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 08324a5..92fccb9 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -13,7 +13,7 @@ Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
 Version:        1.8.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        PHP
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 228a9d029f10663220df184da8b0e9de94916217 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jan 2022 07:58:49 +0000
Subject: [PATCH 10/19] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 92fccb9..872dee5 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -13,7 +13,7 @@ Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
 Version:        1.8.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        PHP
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From babca0802f3a47660543b7ea428eb0b3bbd33c3f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 22 Jul 2022 13:52:48 +0000
Subject: [PATCH 11/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 872dee5..d16355d 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -13,7 +13,7 @@ Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
 Version:        1.8.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        PHP
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 20c8a85e575d1261cfc1f63707b557c7126eda69 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 20 Jan 2023 08:54:02 +0000
Subject: [PATCH 12/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index d16355d..1192454 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -13,7 +13,7 @@ Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
 Version:        1.8.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        PHP
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -90,6 +90,9 @@ fi
 
 
 %changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 1de64700c288ed99c6c23d2d9af90670e63e55b5 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 22 Feb 2023 09:32:11 +0100
Subject: [PATCH 13/19] fix PHP 8.2 deprecations in test suite

use SPDX license ID
---
 Cache_Lite-php82.patch   | 12 ++++++++++++
 php-pear-Cache-Lite.spec | 19 ++++++++++++++-----
 2 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 Cache_Lite-php82.patch

diff --git a/Cache_Lite-php82.patch b/Cache_Lite-php82.patch
new file mode 100644
index 0000000..9416e63
--- /dev/null
+++ b/Cache_Lite-php82.patch
@@ -0,0 +1,12 @@
+diff -up tests/Cache_Lite_Function_classical.phpt.old tests/Cache_Lite_Function_classical.phpt
+--- tests/Cache_Lite_Function_classical.phpt.old	2023-02-20 15:56:30.181431353 +0100
++++ tests/Cache_Lite_Function_classical.phpt	2023-02-20 15:56:46.500382735 +0100
+@@ -66,6 +66,8 @@ class bench
+ 
+ class test
+ {
++    var $foo;
++
+     function __construct($options) {
+         $this->foo = 'bar';
+         $cache = new Cache_Lite_Function($options);
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 1192454..47a3a99 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -1,7 +1,7 @@
 # Spec file for php-pear-Cache-Lite
 #
-# Copyright (c) 2008-2019 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2008-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -13,11 +13,13 @@ Summary:        Fast and Safe little cache system for PHP
 Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
 Version:        1.8.3
-Release:        8%{?dist}
-License:        PHP
+Release:        9%{?dist}
+License:        PHP-3.01
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
+Patch0:         %{pear_name}-php82.patch
+
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.10.1
 
@@ -45,7 +47,9 @@ et/ou des tests anti-corruption).
 %prep
 %setup -c -q
 cd %{pear_name}-%{version}
-mv ../package.xml %{name}.xml
+
+%patch0 -p0
+sed -e '/role="test"/s/md5sum="[^"]*"//' ../package.xml >%{name}.xml
 
 
 %build
@@ -65,6 +69,7 @@ install -Dpm 644 %{name}.xml %{buildroot}%{pear_xmldir}/%{name}.xml
 
 %check
 cd %{pear_name}-%{version}
+
 %{__pear} \
    run-tests \
    -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
@@ -90,6 +95,10 @@ fi
 
 
 %changelog
+* Mon Feb 20 2023 Remi Collet <remi@remirepo.net> - 1.8.3-9
+- fix PHP 8.2 deprecations in test suite
+- use SPDX license ID
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 71bc7890d642f80d09732251503d2efa7a5bfeb1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 21 Mar 2023 15:32:06 +0100
Subject: [PATCH 14/19] update to 2.0.0

sources from github instead or pear channel
---
 .gitignore               |   1 +
 Cache_Lite-php82.patch   |  12 -----
 composer.json            |  36 +++++++++++++
 makesrc.sh               |  32 +++++++++++
 php-pear-Cache-Lite.spec | 112 ++++++++++++++++++++++-----------------
 sources                  |   2 +-
 6 files changed, 132 insertions(+), 63 deletions(-)
 delete mode 100644 Cache_Lite-php82.patch
 create mode 100644 composer.json
 create mode 100755 makesrc.sh

diff --git a/.gitignore b/.gitignore
index 123ce25..149bce7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ package-*.xml
 /Cache_Lite-1.8.0.tgz
 /Cache_Lite-1.8.2.tgz
 /Cache_Lite-1.8.3.tgz
+/php-pear-Cache-Lite-2.0.0-fc7c670.tgz
diff --git a/Cache_Lite-php82.patch b/Cache_Lite-php82.patch
deleted file mode 100644
index 9416e63..0000000
--- a/Cache_Lite-php82.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up tests/Cache_Lite_Function_classical.phpt.old tests/Cache_Lite_Function_classical.phpt
---- tests/Cache_Lite_Function_classical.phpt.old	2023-02-20 15:56:30.181431353 +0100
-+++ tests/Cache_Lite_Function_classical.phpt	2023-02-20 15:56:46.500382735 +0100
-@@ -66,6 +66,8 @@ class bench
- 
- class test
- {
-+    var $foo;
-+
-     function __construct($options) {
-         $this->foo = 'bar';
-         $cache = new Cache_Lite_Function($options);
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..a7d9757
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "pear/cache_lite",
+    "type": "library",
+    "description": "Fast and safe little cache system",
+    "keywords": [
+        "cache"
+    ],
+    "homepage": "https://github.com/pear/Cache_Lite",
+    "license": "LGPL-2.1-or-later",
+    "authors": [
+        {
+            "name": "Markus Tacker",
+            "homepage": "http://pear.php.net/user/tacker"
+        },
+        {
+            "name": "Fabien Marty",
+            "homepage": "http://pear.php.net/user/fab"
+        }
+    ],
+    "require": {
+        "php": ">=7.4.0",
+        "pear/pear-core-minimal": "^1.10"
+    },
+    "autoload": {
+        "classmap": [
+            "Cache/Lite.php"
+        ]
+    },
+    "support": {
+        "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Cache_Lite",
+        "source": "https://github.com/pear/Cache_Lite"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9"
+    }
+}
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..1ee3ac8
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
+	echo Skip $NAME-$VERSION-$SHORT.tgz
+else
+	echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
+
+	echo "Cloning..."
+	rm -rf $PROJECT-$COMMIT
+	git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+	echo "Getting commit..."
+	pushd $PROJECT-$COMMIT
+		git checkout $COMMIT || echo exit 1
+		cp composer.json ../composer.json
+	popd
+
+	echo "Archiving..."
+	tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+
+	echo "Cleaning..."
+	rm -rf $PROJECT-$COMMIT
+
+	echo "Done."
+fi
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 47a3a99..d587616 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -6,28 +6,42 @@
 #
 # Please, preserve the changelog entries
 #
-%{!?__pear:       %global __pear       %{_bindir}/pear}
-%global pear_name Cache_Lite
+
+%bcond_without       tests
+
+%global pear_name    Cache_Lite
+%global gh_commit    fc7c6703cfbddc55c80c5ae3926dcc80c1d993f9
+%global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_owner     pear
+%global gh_project   Cache_Lite
 
 Summary:        Fast and Safe little cache system for PHP
-Summary(fr):    Méthode de cache rapide et sécurisée pour PHP
 Name:           php-pear-Cache-Lite
-Version:        1.8.3
-Release:        9%{?dist}
-License:        PHP-3.01
-URL:            http://pear.php.net/package/Cache_Lite
-Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
-
-Patch0:         %{pear_name}-php82.patch
+Version:        2.0.0
+Release:        1%{?dist}
+License:        LGPL-2.1-or-later
+URL:            https://github.com/%{gh_owner}/%{gh_project}
+# git snapshot to retrieve test suite
+Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
+Source1:        makesrc.sh
 
 BuildArch:      noarch
-BuildRequires:  php-pear(PEAR) >= 1.10.1
+BuildRequires:  php(language)  >= 7.4
+BuildRequires:  php-date
+BuildRequires:  php-autoloader(pear/pear-core-minimal) >= 1.10
+BuildRequires:  php-fedora-autoloader-devel
+%if %{with tests}
+# from composer.json  "require-dev": {
+#        "phpunit/phpunit": "^9"
+BuildRequires:  phpunit9
+%endif
 
-Requires:       php(language)  >= 5.4
+# from composer.json "require": {
+#        "php": ">=7.4.0",
+#        "pear/pear-core-minimal": "^1.10"
+Requires:       php(language)  >= 7.4
+Requires:       php-autoloader(pear/pear-core-minimal) >= 1.10
 Requires:       php-date
-Requires:       php-pear(PEAR) >= 1.10.1
-Requires(post): %{__pear}
-Requires(postun): %{__pear}
 
 Provides:       php-pear(%{pear_name}) = %{version}
 Provides:       php-composer(pear/cache_lite) = %{version}
@@ -38,63 +52,61 @@ This package is a little cache system optimized for file containers. It is
 fast and safe (because it uses file locking and/or anti-corruption tests).
 
 
-%description -l fr
-Cette extension fournit une méthode de petit cache optimisé pour les fichiers.
-Elle est rapide et sécurisée (parce qu'elle utilise les verrous de fichiers 
-et/ou des tests anti-corruption).
-
-
 %prep
-%setup -c -q
-cd %{pear_name}-%{version}
-
-%patch0 -p0
-sed -e '/role="test"/s/md5sum="[^"]*"//' ../package.xml >%{name}.xml
+%setup -q -n %{gh_project}-%{gh_commit}
 
 
 %build
-# Empty build section
+: Generate classmap autoloader
+phpab --template fedora --output Cache/Lite/autoload.php Cache
+cat << 'EOF' | tee -a Cache/Lite/autoload.php
+
+\Fedora\Autoloader\Dependencies::required([
+    '%{pear_phpdir}/PEAR/autoload.php',
+]);
+EOF
 
 
 %install
-cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
-
-# Clean up unnecessary files
-rm -rf %{buildroot}%{pear_metadir}/.??*
-
-# Install XML package description
-install -Dpm 644 %{name}.xml %{buildroot}%{pear_xmldir}/%{name}.xml
+mkdir -p     %{buildroot}%{pear_phpdir}/
+cp -pr Cache %{buildroot}%{pear_phpdir}/Cache
 
 
+%if %{with tests}
 %check
-cd %{pear_name}-%{version}
+mkdir vendor
+ln -s %{buildroot}%{pear_phpdir}/Cache/Lite/autoload.php vendor/autoload.php
 
-%{__pear} \
-   run-tests \
-   -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
-   tests | tee ../tests.log
-grep "FAILED TESTS" ../tests.log && exit 1 || exit 0
+: Upstream test suite
+ret=0
+for cmd in php php80 php81 php82; do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit9 --verbose || ret=1
+  fi
+done
+%endif
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null || :
-
-
-%postun
-if [ "$1" -eq "0" ]; then
-    %{__pear} uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null || :
+# no more from pear channel
+if [ -x %{_bindir}/pear ]; then
+  %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only %{pear_name} >/dev/null || :
 fi
 
 
 %files
-%doc %{pear_docdir}/%{pear_name}
-%doc %{pear_testdir}/%{pear_name}
+%license LICENSE
+%doc composer.json
+%doc docs
+%doc *.md
 %{pear_phpdir}/Cache
-%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Tue Mar 21 2023 Remi Collet <remi@remirepo.net> - 2.0.0-1
+- update to 2.0.0
+- sources from github instead or pear channel
+
 * Mon Feb 20 2023 Remi Collet <remi@remirepo.net> - 1.8.3-9
 - fix PHP 8.2 deprecations in test suite
 - use SPDX license ID
diff --git a/sources b/sources
index 09c6ef4..291eb30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Cache_Lite-1.8.3.tgz) = 700376dd33afd0b1ed812d0d3dbdc14ad5523b3b181ac64ef0d56b62040c3d7bc9f234b3dae8013876a902f21da8dc92b1de41cea11aa428036bcc6e96166e65
+SHA512 (php-pear-Cache-Lite-2.0.0-fc7c670.tgz) = 9264476528b8ee480e52fd572ff9f81876335a11e1b7fcb605f5de4f1c1bf9cb4275698909a4eaa14a94de357c30413fde89bbad55f7c6b4ac20aef080fcc5d9

From 2666e3f0ab119a733d9f87df47fa45ca69556a97 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 21:02:15 +0000
Subject: [PATCH 15/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index d587616..b5c2d39 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -18,7 +18,7 @@
 Summary:        Fast and Safe little cache system for PHP
 Name:           php-pear-Cache-Lite
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        LGPL-2.1-or-later
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 # git snapshot to retrieve test suite
@@ -103,6 +103,9 @@ fi
 
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Tue Mar 21 2023 Remi Collet <remi@remirepo.net> - 2.0.0-1
 - update to 2.0.0
 - sources from github instead or pear channel

From 13f1b80c630b3f3a0509eb1c03e4fd95236b4981 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 22:48:59 +0000
Subject: [PATCH 16/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index b5c2d39..1863076 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -18,7 +18,7 @@
 Summary:        Fast and Safe little cache system for PHP
 Name:           php-pear-Cache-Lite
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        LGPL-2.1-or-later
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 # git snapshot to retrieve test suite
@@ -103,6 +103,9 @@ fi
 
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From e1070112b06ee741d9db3d71e6affde6741b0fef Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jul 2024 07:03:01 +0000
Subject: [PATCH 17/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 1863076..7c3598b 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -18,7 +18,7 @@
 Summary:        Fast and Safe little cache system for PHP
 Name:           php-pear-Cache-Lite
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        LGPL-2.1-or-later
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 # git snapshot to retrieve test suite
@@ -103,6 +103,9 @@ fi
 
 
 %changelog
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 0fac634c79134034483e6375ace03e797897f79a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 18 Jan 2025 09:14:36 +0000
Subject: [PATCH 18/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 7c3598b..3a22f36 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -18,7 +18,7 @@
 Summary:        Fast and Safe little cache system for PHP
 Name:           php-pear-Cache-Lite
 Version:        2.0.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        LGPL-2.1-or-later
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 # git snapshot to retrieve test suite
@@ -103,6 +103,9 @@ fi
 
 
 %changelog
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 4234e2d4cfcf91acd69d2c6b70755d0ab907425e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 05:17:18 +0000
Subject: [PATCH 19/19] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 php-pear-Cache-Lite.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 3a22f36..f656880 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -18,7 +18,7 @@
 Summary:        Fast and Safe little cache system for PHP
 Name:           php-pear-Cache-Lite
 Version:        2.0.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        LGPL-2.1-or-later
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 # git snapshot to retrieve test suite
@@ -103,6 +103,9 @@ fi
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild