From aac7a1ce6a55600198bfec068040607932deccfc Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Wed, 23 May 2012 18:07:26 +0200
Subject: [PATCH 01/40] Version 1.7.14 (stable) - API 1.7.7 (stable)

---
 .gitignore               |  1 +
 php-pear-Cache-Lite.spec | 24 ++++++++++++++++++------
 sources                  |  2 +-
 xml2changelog            |  2 +-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index d3a1ddf..efc83fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ package-*.xml
 /Cache_Lite-1.7.10.tgz
 /Cache_Lite-1.7.11.tgz
 /Cache_Lite-1.7.12.tgz
+/Cache_Lite-1.7.14.tgz
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index ceec016..aadda66 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -4,8 +4,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.7.12
-Release:        2%{?dist}
+Version:        1.7.14
+Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -34,7 +34,19 @@ et/ou des tests anti-corruption).
 
 
 %prep
-%setup -c -q
+#%setup -c -q
+# temporary use -i option for https://pear.php.net/bugs/19433
+tar xizf %{SOURCE0}
+
+# fix role https://pear.php.net/bugs/bug.php?id=19434
+sed -i \
+    -e '/examples/s/role="data"/role="doc"/' \
+    -e '/technical/s/role="data"/role="doc"/' \
+    -e '/README.md/s/role="data"/role="doc"/' \
+    -e '/tests/s:/tests/:tests/:' \
+    -e '/tests/s/role="data"/role="test"/' \
+    package.xml
+
 %{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
 
 cd %{pear_name}-%{version}
@@ -65,9 +77,6 @@ rm -rf %{buildroot}
 
 
 %check
-lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
-[ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
-
 cd %{pear_name}-%{version}
 %{__pear} \
    run-tests \
@@ -96,6 +105,9 @@ fi
 
 
 %changelog
+* Wed May 23 2012 Remi Collet <remi@fedoraproject.org> - 1.7.14-1
+- Version 1.7.14 (stable) - API 1.7.7 (stable)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 72a0ac5..68a32dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2821420ba814c66fa37b47afd75b9821  Cache_Lite-1.7.12.tgz
+3cc7c8a318fa559426ec181a82c0f9e0  Cache_Lite-1.7.14.tgz
diff --git a/xml2changelog b/xml2changelog
index 4c789f4..3a31be6 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -9,7 +9,7 @@ if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 if ($xml['version'] >= "2"){ // Package.xml V 2.0
 	$new = "";
 	if (strlen(trim($xml->notes))>1) { // Ignore too short descr.
-		printf("++*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+		printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 			$xml->version->release, $xml->stability->release,
 			$xml->version->api, $xml->stability->api,
 			$xml->date, $xml->notes);

From fc9bdad00b8f167a496f1992edf03e2a1f92be68 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Thu, 24 May 2012 17:04:15 +0200
Subject: [PATCH 02/40] Version 1.7.15 (stable) - API 1.7.7 (stable)

---
 .gitignore               |  1 +
 php-pear-Cache-Lite.spec | 21 +++++++--------------
 sources                  |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index efc83fc..96693b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ package-*.xml
 /Cache_Lite-1.7.11.tgz
 /Cache_Lite-1.7.12.tgz
 /Cache_Lite-1.7.14.tgz
+/Cache_Lite-1.7.15.tgz
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index aadda66..60d7fe0 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -4,7 +4,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.7.14
+Version:        1.7.15
 Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
@@ -34,19 +34,7 @@ et/ou des tests anti-corruption).
 
 
 %prep
-#%setup -c -q
-# temporary use -i option for https://pear.php.net/bugs/19433
-tar xizf %{SOURCE0}
-
-# fix role https://pear.php.net/bugs/bug.php?id=19434
-sed -i \
-    -e '/examples/s/role="data"/role="doc"/' \
-    -e '/technical/s/role="data"/role="doc"/' \
-    -e '/README.md/s/role="data"/role="doc"/' \
-    -e '/tests/s:/tests/:tests/:' \
-    -e '/tests/s/role="data"/role="test"/' \
-    package.xml
-
+%setup -c -q
 %{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
 
 cd %{pear_name}-%{version}
@@ -105,6 +93,11 @@ fi
 
 
 %changelog
+* Thu May 24 2012 Remi Collet <remi@fedoraproject.org> - 1.7.14-1
+- Version 1.7.15 (stable) - API 1.7.7 (stable)
+- fix https://pear.php.net/bugs/19433 corrupted archive
+- fix https://pear.php.net/bugs/19434 bad file role
+
 * Wed May 23 2012 Remi Collet <remi@fedoraproject.org> - 1.7.14-1
 - Version 1.7.14 (stable) - API 1.7.7 (stable)
 
diff --git a/sources b/sources
index 68a32dd..5f3cf52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3cc7c8a318fa559426ec181a82c0f9e0  Cache_Lite-1.7.14.tgz
+646705e5857f9d539f72be5dcf6e39b8  Cache_Lite-1.7.15.tgz

From aa534b7fa7284e12ba0bfe3c46f43b81c31ee899 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Thu, 24 May 2012 17:10:16 +0200
Subject: [PATCH 03/40] Version 1.7.15 (stable) - API 1.7.7 (stable)

---
 .gitignore               |  2 ++
 php-pear-Cache-Lite.spec | 10 +++++-----
 sources                  |  2 +-
 xml2changelog            |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index d3a1ddf..96693b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ package-*.xml
 /Cache_Lite-1.7.10.tgz
 /Cache_Lite-1.7.11.tgz
 /Cache_Lite-1.7.12.tgz
+/Cache_Lite-1.7.14.tgz
+/Cache_Lite-1.7.15.tgz
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index ceec016..0ac55fb 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -4,8 +4,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.7.12
-Release:        2%{?dist}
+Version:        1.7.15
+Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -65,9 +65,6 @@ rm -rf %{buildroot}
 
 
 %check
-lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
-[ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
-
 cd %{pear_name}-%{version}
 %{__pear} \
    run-tests \
@@ -96,6 +93,9 @@ fi
 
 
 %changelog
+* Thu May 24 2012 Remi Collet <remi@fedoraproject.org> - 1.7.14-1
+- Version 1.7.15 (stable) - API 1.7.7 (stable)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 72a0ac5..5f3cf52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2821420ba814c66fa37b47afd75b9821  Cache_Lite-1.7.12.tgz
+646705e5857f9d539f72be5dcf6e39b8  Cache_Lite-1.7.15.tgz
diff --git a/xml2changelog b/xml2changelog
index 4c789f4..3a31be6 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -9,7 +9,7 @@ if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 if ($xml['version'] >= "2"){ // Package.xml V 2.0
 	$new = "";
 	if (strlen(trim($xml->notes))>1) { // Ignore too short descr.
-		printf("++*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+		printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
 			$xml->version->release, $xml->stability->release,
 			$xml->version->api, $xml->stability->api,
 			$xml->date, $xml->notes);

From 8cf884d66746c1bdf918050a0f290dce909bc469 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 20 Jul 2012 18:41:10 -0500
Subject: [PATCH 04/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_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 60d7fe0..2fcddfb 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -5,7 +5,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.7.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -93,6 +93,9 @@ fi
 
 
 %changelog
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Thu May 24 2012 Remi Collet <remi@fedoraproject.org> - 1.7.14-1
 - Version 1.7.15 (stable) - API 1.7.7 (stable)
 - fix https://pear.php.net/bugs/19433 corrupted archive

From 56d7081ca60089b2c8b0b7504da8943378dcc76c Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Tue, 14 Aug 2012 13:51:35 +0200
Subject: [PATCH 05/40] rebuilt for new pear_testdir

---
 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 2fcddfb..3958dbd 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -5,7 +5,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.7.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -93,6 +93,9 @@ fi
 
 
 %changelog
+* Tue Aug 14 2012 Remi Collet <remi@fedoraproject.org> - 1.7.15-3
+- rebuilt for new pear_testdir
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From dfeed7a2c836adefc96d465fd19bd45a21ca1158 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 14 Feb 2013 11:10:03 -0600
Subject: [PATCH 06/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_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 3958dbd..930c021 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -5,7 +5,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.7.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -93,6 +93,9 @@ fi
 
 
 %changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.15-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Tue Aug 14 2012 Remi Collet <remi@fedoraproject.org> - 1.7.15-3
 - rebuilt for new pear_testdir
 

From b918e72f2ba59ca57545fe5f3c9a6ddd042ac54c Mon Sep 17 00:00:00 2001
From: Remi Collet <rcollet@redhat.com>
Date: Tue, 19 Feb 2013 06:55:49 +0100
Subject: [PATCH 07/40] fix metadata location

---
 php-pear-Cache-Lite.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 930c021..2cdeeab 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -1,3 +1,4 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %global pear_name Cache_Lite
 
@@ -5,7 +6,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.7.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -53,7 +54,7 @@ cd %{pear_name}-%{version}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
@@ -93,6 +94,9 @@ fi
 
 
 %changelog
+* Tue Feb 19 2013 Remi Collet <remi@fedoraproject.org> - 1.7.15-4
+- fix metadata location
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.15-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From d18b406112387267aeb9a6345397496cffdcfe31 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 3 Aug 2013 21:58:52 -0500
Subject: [PATCH 08/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_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 2cdeeab..75f318a 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -6,7 +6,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.7.15
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -94,6 +94,9 @@ fi
 
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.15-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Tue Feb 19 2013 Remi Collet <remi@fedoraproject.org> - 1.7.15-4
 - fix metadata location
 

From 4303bff22adee11025a67526ad5afb8c0eea3cab Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Sat, 10 May 2014 12:08:19 +0200
Subject: [PATCH 09/40] update to 1.7.16

---
 .gitignore               |  1 +
 Cache_Lite-pear.patch    | 13 ++++++++++++
 php-pear-Cache-Lite.spec | 35 ++++++++++++++++++++++----------
 sources                  |  2 +-
 xml2changelog            | 43 ----------------------------------------
 5 files changed, 39 insertions(+), 55 deletions(-)
 create mode 100644 Cache_Lite-pear.patch
 delete mode 100644 xml2changelog

diff --git a/.gitignore b/.gitignore
index 96693b0..9abb41d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ package-*.xml
 /Cache_Lite-1.7.12.tgz
 /Cache_Lite-1.7.14.tgz
 /Cache_Lite-1.7.15.tgz
+/Cache_Lite-1.7.16.tgz
diff --git a/Cache_Lite-pear.patch b/Cache_Lite-pear.patch
new file mode 100644
index 0000000..6616204
--- /dev/null
+++ b/Cache_Lite-pear.patch
@@ -0,0 +1,13 @@
+diff -up Cache_Lite-1.7.16/Cache/Lite.php.old Cache_Lite-1.7.16/Cache/Lite.php
+--- Cache_Lite-1.7.16/Cache/Lite.php.old	2014-05-10 11:45:38.378961871 +0200
++++ Cache_Lite-1.7.16/Cache/Lite.php	2014-05-10 11:56:49.725603495 +0200
+@@ -555,7 +555,8 @@ class Cache_Lite
+     function raiseError($msg, $code)
+     {
+         include_once('PEAR.php');
+-        return PEAR::raiseError($msg, $code, $this->_pearErrorMode);
++        $p = new PEAR();
++        return $p->raiseError($msg, $code, $this->_pearErrorMode);
+     }
+     
+     /**
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 75f318a..2d4f5ef 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -1,19 +1,29 @@
+# Spec file for php-pear-Cache-Lite
+#
+# Copyright (c) 2008-2014 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/3.0/
+#
+# Please, preserve the changelog entries
+#
 %{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?__pear:       %global __pear       %{_bindir}/pear}
 %global pear_name 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.7.15
-Release:        6%{?dist}
+Version:        1.7.16
+Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source2:        xml2changelog
 
 URL:            http://pear.php.net/package/Cache_Lite
 
+# Avoid Deprecated: Non-static method PEAR::raiseError() should not be called statically
+Patch0:         %{pear_name}-pear.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.5.4
@@ -36,11 +46,11 @@ et/ou des tests anti-corruption).
 
 %prep
 %setup -c -q
-%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
-
 cd %{pear_name}-%{version}
+%patch0 -p1 -b .old
 # package.xml is V2
-mv ../package.xml %{name}.xml
+sed -e '/Lite.php/s/md5sum="[^"]*"//' \
+    ../package.xml >%{name}.xml
 
 
 %build
@@ -86,7 +96,6 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG
 %doc %{pear_docdir}/%{pear_name}
 %{pear_phpdir}/Cache
 %{pear_testdir}/%{pear_name}
@@ -94,6 +103,10 @@ fi
 
 
 %changelog
+* Sat May 10 2014 Remi Collet <remi@fedoraproject.org> - 1.7.16-1
+- update to 1.7.16 (stable)
+- add patch to avoid deprecated warning
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.15-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -143,14 +156,14 @@ fi
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Fri May 08 2010 Remi Collet <Fedora@FamilleCollet.com> 1.7.8-3
+* Sat May 08 2010 Remi Collet <Fedora@FamilleCollet.com> 1.7.8-3
 - spec cleanup
 - rename Cache_Lite.xml to php-pear-Cache-Lite.xml
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sat Jul 08 2009 Remi Collet <Fedora@FamilleCollet.com> 1.7.8-1
+* Wed Jul 08 2009 Remi Collet <Fedora@FamilleCollet.com> 1.7.8-1
 - update to 1.7.8 (bugfix)
 
 * Sun Mar 08 2009 Remi Collet <Fedora@FamilleCollet.com> 1.7.7-1
@@ -159,7 +172,7 @@ fi
 * Thu Jan 29 2009 Remi Collet <Fedora@FamilleCollet.com> 1.7.6-1
 - now Requires php-pear(PEAR) >= 1.5.4
 
-* Sat Jan 09 2009 Remi Collet <Fedora@FamilleCollet.com> 1.7.5-1
+* Fri Jan 09 2009 Remi Collet <Fedora@FamilleCollet.com> 1.7.5-1
 - update to 1.7.5
 
 * Mon Jun 09 2008 Remi Collet <Fedora@FamilleCollet.com> 1.7.4-1
diff --git a/sources b/sources
index 5f3cf52..4126dc3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-646705e5857f9d539f72be5dcf6e39b8  Cache_Lite-1.7.15.tgz
+e5bd31307e0bed904f8d938d6b0ba7b6  Cache_Lite-1.7.16.tgz
diff --git a/xml2changelog b/xml2changelog
deleted file mode 100644
index 3a31be6..0000000
--- a/xml2changelog
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-$prog=array_shift($_SERVER['argv']);
-if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
-$file=array_shift($_SERVER['argv']);
-
-($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
-if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
-
-if ($xml['version'] >= "2"){ // Package.xml V 2.0
-	$new = "";
-	if (strlen(trim($xml->notes))>1) { // Ignore too short descr.
-		printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
-			$xml->version->release, $xml->stability->release,
-			$xml->version->api, $xml->stability->api,
-			$xml->date, $xml->notes);
-		$new=$xml->version->release;
-	}
-
-	if (isset($xml->changelog->release) && count($xml->changelog->release)) {
-		$tab = array();
-		foreach($xml->changelog->release as $rel) {
-			$old=$rel->version->release;
-			if ("$old" != "$new") {
-				$tab[''.$rel->date] = $rel;
-			}
-		}
-		krsort($tab);
-		foreach($tab as $rel) {
-			printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
-				$rel->version->release, $rel->stability->release,
-				$rel->version->api, $rel->stability->api,
-				$rel->date, $rel->notes);
-		}
-	}
-} else { // Package.xml V 1.0
-	printf("* Version %s (%s) - %s\n\n%s\n\n",
-		$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
-
-	foreach($xml->changelog->release as $rel)
-		printf("* Version %s (%s) - %s\n\n%s\n\n",
-			$rel->version, $rel->state, $rel->date, $rel->notes);
-}
-?>

From b9f90e688765f0174ff3d40b44265575e40dc5a5 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 09:32:09 -0500
Subject: [PATCH 10/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_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 2d4f5ef..d12a26c 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -14,7 +14,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.7.16
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -103,6 +103,9 @@ fi
 
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.16-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Sat May 10 2014 Remi Collet <remi@fedoraproject.org> - 1.7.16-1
 - update to 1.7.16 (stable)
 - add patch to avoid deprecated warning

From a0b05c36eac01df6c7ec7146f212bca997fc2d30 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 18 Jun 2015 14:34:34 +0000
Subject: [PATCH 11/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_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 d12a26c..6b08df3 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -14,7 +14,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.7.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -103,6 +103,9 @@ fi
 
 
 %changelog
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From ff797c8ef377ba124ffa9dcc69c48fa3b4f98d04 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 4 Feb 2016 17:27:14 +0000
Subject: [PATCH 12/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_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 6b08df3..b013e1f 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -14,7 +14,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.7.16
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -103,6 +103,9 @@ fi
 
 
 %changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.16-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.16-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From 66b23b468c9876161cb2b00e4dc0fe648b00ae27 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 28 Jun 2016 07:06:48 +0200
Subject: [PATCH 13/40] add patch to avoid PHP 7 warning

---
 Cache_Lite-php7.patch    | 116 +++++++++++++++++++++++++++++++++++++++
 php-pear-Cache-Lite.spec |  19 ++++---
 2 files changed, 128 insertions(+), 7 deletions(-)
 create mode 100644 Cache_Lite-php7.patch

diff --git a/Cache_Lite-php7.patch b/Cache_Lite-php7.patch
new file mode 100644
index 0000000..20ed887
--- /dev/null
+++ b/Cache_Lite-php7.patch
@@ -0,0 +1,116 @@
+From fa24ff37e8d5ab80f0e9a32fe92274a74062228e Mon Sep 17 00:00:00 2001
+From: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Date: Tue, 1 Mar 2016 15:47:12 -0800
+Subject: [PATCH] PHP7 has deprecated same-named functions as constructors
+
+As per, http://php.net/manual/en/language.oop5.decon.php, "Old style
+constructors are DEPRECATED in PHP 7.0, and will be removed in a future
+version. You should always use __construct() in new code." The current
+tests fail on PHP7.0 based installs due to the deprecation warnings.
+
+Bump the minimum version of PHP to 5.0.0 where __construct support was
+added.
+
+Signed-off-by: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+---
+ Cache/Lite.php                           | 2 +-
+ Cache/Lite/File.php                      | 4 ++--
+ Cache/Lite/Function.php                  | 4 ++--
+ Cache/Lite/Output.php                    | 4 ++--
+ package.xml                              | 2 +-
+ tests/Cache_Lite_Function_classical.phpt | 2 +-
+ 6 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/Cache/Lite.php b/Cache/Lite.php
+index 0ca762d..5770f3d 100644
+--- a/Cache/Lite.php
++++ b/Cache/Lite.php
+@@ -294,7 +294,7 @@ class Cache_Lite
+     * @param array $options options
+     * @access public
+     */
+-    function Cache_Lite($options = array(NULL))
++    function __construct($options = array(NULL))
+     {
+         foreach($options as $key => $value) {
+             $this->setOption($key, $value);
+diff --git a/Cache/Lite/File.php b/Cache/Lite/File.php
+index 2cb2758..d8ca31c 100644
+--- a/Cache/Lite/File.php
++++ b/Cache/Lite/File.php
+@@ -52,10 +52,10 @@ class Cache_Lite_File extends Cache_Lite
+     * @param array $options options
+     * @access public
+     */
+-    function Cache_Lite_File($options = array(NULL))
++    function __construct($options = array(NULL))
+     {   
+         $options['lifetime'] = 0;
+-        $this->Cache_Lite($options);
++        parent::__construct($options);
+         if (isset($options['masterFile'])) {
+             $this->_masterFile = $options['masterFile'];
+         } else {
+diff --git a/Cache/Lite/Function.php b/Cache/Lite/Function.php
+index 6c4861a..0814b58 100644
+--- a/Cache/Lite/Function.php
++++ b/Cache/Lite/Function.php
+@@ -81,7 +81,7 @@ class Cache_Lite_Function extends Cache_Lite
+     * @param array $options options
+     * @access public
+     */
+-    function Cache_Lite_Function($options = array(NULL))
++    function __construct($options = array(NULL))
+     {
+         $availableOptions = array('debugCacheLiteFunction', 'defaultGroup', 'dontCacheWhenTheOutputContainsNOCACHE', 'dontCacheWhenTheResultIsFalse', 'dontCacheWhenTheResultIsNull');
+         while (list($name, $value) = each($options)) {
+@@ -91,7 +91,7 @@ function Cache_Lite_Function($options = array(NULL))
+             }
+         }
+         reset($options);
+-        $this->Cache_Lite($options);
++        parent::__construct($options);
+     }
+ 
+     /**
+diff --git a/Cache/Lite/Output.php b/Cache/Lite/Output.php
+index 87d7c19..9880cfa 100644
+--- a/Cache/Lite/Output.php
++++ b/Cache/Lite/Output.php
+@@ -26,9 +26,9 @@ class Cache_Lite_Output extends Cache_Lite
+     * @param array $options options
+     * @access public
+     */
+-    function Cache_Lite_Output($options)
++    function __construct($options)
+     {
+-        $this->Cache_Lite($options);
++        parent::__construct($options);
+     }
+ 
+     /**
+diff --git a/tests/Cache_Lite_Function_classical.phpt b/tests/Cache_Lite_Function_classical.phpt
+index 3fbf9a7..1358f57 100644
+--- a/tests/Cache_Lite_Function_classical.phpt
++++ b/tests/Cache_Lite_Function_classical.phpt
+@@ -64,7 +64,7 @@ class bench
+ 
+ class test
+ {
+-    function test($options) {
++    function __construct($options) {
+         $this->foo = 'bar';
+         $cache = new Cache_Lite_Function($options);
+         echo($cache->call(array($this, 'method_to_bench'), 'foo', 'bar'));
+diff -up tests/Cache_Lite_Function_classical.phpt.old tests/Cache_Lite_Function_classical.phpt
+--- a/tests/Cache_Lite_Function_classical.phpt.old	2016-06-28 06:56:28.816379936 +0200
++++ b/tests/Cache_Lite_Function_classical.phpt	2016-06-28 06:56:32.037398100 +0200
+@@ -55,7 +55,7 @@ class bench
+         return "\$obj->test = $this->test and this is the result of the method \$obj->method_to_bench($arg1, $arg2) !\n";        
+     }
+     
+-    function static_method_to_bench($arg1, $arg2) {
++    static function static_method_to_bench($arg1, $arg2) {
+         echo "This is the output of the function static_method_to_bench($arg1, $arg2) !\n";
+         return "This is the result of the function static_method_to_bench($arg1, $arg2) !\n";
+     }
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index b013e1f..2052bb9 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -1,12 +1,11 @@
 # Spec file for php-pear-Cache-Lite
 #
-# Copyright (c) 2008-2014 Remi Collet
+# Copyright (c) 2008-2016 Remi Collet
 # License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/3.0/
+# http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
 %{!?__pear:       %global __pear       %{_bindir}/pear}
 %global pear_name Cache_Lite
 
@@ -14,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.7.16
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -23,6 +22,8 @@ URL:            http://pear.php.net/package/Cache_Lite
 
 # Avoid Deprecated: Non-static method PEAR::raiseError() should not be called statically
 Patch0:         %{pear_name}-pear.patch
+# Fix constructor
+Patch1:         %{pear_name}-php7.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -48,8 +49,10 @@ et/ou des tests anti-corruption).
 %setup -c -q
 cd %{pear_name}-%{version}
 %patch0 -p1 -b .old
+%patch1 -p1 -b .php7
+
 # package.xml is V2
-sed -e '/Lite.php/s/md5sum="[^"]*"//' \
+sed -e 's/md5sum="[^"]*"//' \
     ../package.xml >%{name}.xml
 
 
@@ -67,8 +70,7 @@ cd %{pear_name}-%{version}
 rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
-%{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+install -Dpm 644 %{name}.xml %{buildroot}%{pear_xmldir}/%{name}.xml
 
 
 %clean
@@ -103,6 +105,9 @@ fi
 
 
 %changelog
+* Tue Jun 28 2016 Remi Collet <remi@fedoraproject.org> - 1.7.16-5
+- add patch to avoid PHP 7 warning
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.16-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From c5088805a1fea478ade87512f12c9e20e887e513 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 4 Jul 2016 10:33:54 +0200
Subject: [PATCH 14/40] v1.8.0

---
 .gitignore               |   1 +
 Cache_Lite-pear.patch    |  13 -----
 Cache_Lite-php7.patch    | 116 ---------------------------------------
 php-pear-Cache-Lite.spec |  30 +++++-----
 sources                  |   2 +-
 5 files changed, 17 insertions(+), 145 deletions(-)
 delete mode 100644 Cache_Lite-pear.patch
 delete mode 100644 Cache_Lite-php7.patch

diff --git a/.gitignore b/.gitignore
index 9abb41d..ea1cab5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ package-*.xml
 /Cache_Lite-1.7.14.tgz
 /Cache_Lite-1.7.15.tgz
 /Cache_Lite-1.7.16.tgz
+/Cache_Lite-1.8.0.tgz
diff --git a/Cache_Lite-pear.patch b/Cache_Lite-pear.patch
deleted file mode 100644
index 6616204..0000000
--- a/Cache_Lite-pear.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up Cache_Lite-1.7.16/Cache/Lite.php.old Cache_Lite-1.7.16/Cache/Lite.php
---- Cache_Lite-1.7.16/Cache/Lite.php.old	2014-05-10 11:45:38.378961871 +0200
-+++ Cache_Lite-1.7.16/Cache/Lite.php	2014-05-10 11:56:49.725603495 +0200
-@@ -555,7 +555,8 @@ class Cache_Lite
-     function raiseError($msg, $code)
-     {
-         include_once('PEAR.php');
--        return PEAR::raiseError($msg, $code, $this->_pearErrorMode);
-+        $p = new PEAR();
-+        return $p->raiseError($msg, $code, $this->_pearErrorMode);
-     }
-     
-     /**
diff --git a/Cache_Lite-php7.patch b/Cache_Lite-php7.patch
deleted file mode 100644
index 20ed887..0000000
--- a/Cache_Lite-php7.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From fa24ff37e8d5ab80f0e9a32fe92274a74062228e Mon Sep 17 00:00:00 2001
-From: Nishanth Aravamudan <nish.aravamudan@canonical.com>
-Date: Tue, 1 Mar 2016 15:47:12 -0800
-Subject: [PATCH] PHP7 has deprecated same-named functions as constructors
-
-As per, http://php.net/manual/en/language.oop5.decon.php, "Old style
-constructors are DEPRECATED in PHP 7.0, and will be removed in a future
-version. You should always use __construct() in new code." The current
-tests fail on PHP7.0 based installs due to the deprecation warnings.
-
-Bump the minimum version of PHP to 5.0.0 where __construct support was
-added.
-
-Signed-off-by: Nishanth Aravamudan <nish.aravamudan@canonical.com>
----
- Cache/Lite.php                           | 2 +-
- Cache/Lite/File.php                      | 4 ++--
- Cache/Lite/Function.php                  | 4 ++--
- Cache/Lite/Output.php                    | 4 ++--
- package.xml                              | 2 +-
- tests/Cache_Lite_Function_classical.phpt | 2 +-
- 6 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/Cache/Lite.php b/Cache/Lite.php
-index 0ca762d..5770f3d 100644
---- a/Cache/Lite.php
-+++ b/Cache/Lite.php
-@@ -294,7 +294,7 @@ class Cache_Lite
-     * @param array $options options
-     * @access public
-     */
--    function Cache_Lite($options = array(NULL))
-+    function __construct($options = array(NULL))
-     {
-         foreach($options as $key => $value) {
-             $this->setOption($key, $value);
-diff --git a/Cache/Lite/File.php b/Cache/Lite/File.php
-index 2cb2758..d8ca31c 100644
---- a/Cache/Lite/File.php
-+++ b/Cache/Lite/File.php
-@@ -52,10 +52,10 @@ class Cache_Lite_File extends Cache_Lite
-     * @param array $options options
-     * @access public
-     */
--    function Cache_Lite_File($options = array(NULL))
-+    function __construct($options = array(NULL))
-     {   
-         $options['lifetime'] = 0;
--        $this->Cache_Lite($options);
-+        parent::__construct($options);
-         if (isset($options['masterFile'])) {
-             $this->_masterFile = $options['masterFile'];
-         } else {
-diff --git a/Cache/Lite/Function.php b/Cache/Lite/Function.php
-index 6c4861a..0814b58 100644
---- a/Cache/Lite/Function.php
-+++ b/Cache/Lite/Function.php
-@@ -81,7 +81,7 @@ class Cache_Lite_Function extends Cache_Lite
-     * @param array $options options
-     * @access public
-     */
--    function Cache_Lite_Function($options = array(NULL))
-+    function __construct($options = array(NULL))
-     {
-         $availableOptions = array('debugCacheLiteFunction', 'defaultGroup', 'dontCacheWhenTheOutputContainsNOCACHE', 'dontCacheWhenTheResultIsFalse', 'dontCacheWhenTheResultIsNull');
-         while (list($name, $value) = each($options)) {
-@@ -91,7 +91,7 @@ function Cache_Lite_Function($options = array(NULL))
-             }
-         }
-         reset($options);
--        $this->Cache_Lite($options);
-+        parent::__construct($options);
-     }
- 
-     /**
-diff --git a/Cache/Lite/Output.php b/Cache/Lite/Output.php
-index 87d7c19..9880cfa 100644
---- a/Cache/Lite/Output.php
-+++ b/Cache/Lite/Output.php
-@@ -26,9 +26,9 @@ class Cache_Lite_Output extends Cache_Lite
-     * @param array $options options
-     * @access public
-     */
--    function Cache_Lite_Output($options)
-+    function __construct($options)
-     {
--        $this->Cache_Lite($options);
-+        parent::__construct($options);
-     }
- 
-     /**
-diff --git a/tests/Cache_Lite_Function_classical.phpt b/tests/Cache_Lite_Function_classical.phpt
-index 3fbf9a7..1358f57 100644
---- a/tests/Cache_Lite_Function_classical.phpt
-+++ b/tests/Cache_Lite_Function_classical.phpt
-@@ -64,7 +64,7 @@ class bench
- 
- class test
- {
--    function test($options) {
-+    function __construct($options) {
-         $this->foo = 'bar';
-         $cache = new Cache_Lite_Function($options);
-         echo($cache->call(array($this, 'method_to_bench'), 'foo', 'bar'));
-diff -up tests/Cache_Lite_Function_classical.phpt.old tests/Cache_Lite_Function_classical.phpt
---- a/tests/Cache_Lite_Function_classical.phpt.old	2016-06-28 06:56:28.816379936 +0200
-+++ b/tests/Cache_Lite_Function_classical.phpt	2016-06-28 06:56:32.037398100 +0200
-@@ -55,7 +55,7 @@ class bench
-         return "\$obj->test = $this->test and this is the result of the method \$obj->method_to_bench($arg1, $arg2) !\n";        
-     }
-     
--    function static_method_to_bench($arg1, $arg2) {
-+    static function static_method_to_bench($arg1, $arg2) {
-         echo "This is the output of the function static_method_to_bench($arg1, $arg2) !\n";
-         return "This is the result of the function static_method_to_bench($arg1, $arg2) !\n";
-     }
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 2052bb9..0960faa 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -12,26 +12,26 @@
 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.7.16
-Release:        5%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
 URL:            http://pear.php.net/package/Cache_Lite
 
-# Avoid Deprecated: Non-static method PEAR::raiseError() should not be called statically
-Patch0:         %{pear_name}-pear.patch
-# Fix constructor
-Patch1:         %{pear_name}-php7.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  php-pear(PEAR) >= 1.5.4
-Requires:       php-pear(PEAR) >= 1.5.4
+BuildRequires:  php-pear(PEAR) >= 1.10.1
+
+Requires:       php(language)  >= 5.4
+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}
 
 
 %description
@@ -48,12 +48,7 @@ et/ou des tests anti-corruption).
 %prep
 %setup -c -q
 cd %{pear_name}-%{version}
-%patch0 -p1 -b .old
-%patch1 -p1 -b .php7
-
-# package.xml is V2
-sed -e 's/md5sum="[^"]*"//' \
-    ../package.xml >%{name}.xml
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -105,6 +100,11 @@ fi
 
 
 %changelog
+* Mon Jul  4 2016 Remi Collet <remi@fedoraproject.org> - 1.8.0-1
+- update to 1.8.0
+- raise dependency on PHP >= 5.4
+- raise dependency on PEAR >= 1.10.1
+
 * Tue Jun 28 2016 Remi Collet <remi@fedoraproject.org> - 1.7.16-5
 - add patch to avoid PHP 7 warning
 
diff --git a/sources b/sources
index 4126dc3..29966d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5bd31307e0bed904f8d938d6b0ba7b6  Cache_Lite-1.7.16.tgz
+d63d997a5dfcea8b532591e71f2bca73  Cache_Lite-1.8.0.tgz

From 8fac14f48b9ff9504a0b007ec6a240ac8400abba Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 11 Feb 2017 06:53:05 +0000
Subject: [PATCH 15/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_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 0960faa..d13fddb 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.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -100,6 +100,9 @@ fi
 
 
 %changelog
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Mon Jul  4 2016 Remi Collet <remi@fedoraproject.org> - 1.8.0-1
 - update to 1.8.0
 - raise dependency on PHP >= 5.4

From 07925a5ab45942ac0bba9d264afa19f20f2238c3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 27 Jul 2017 07:57:28 +0000
Subject: [PATCH 16/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_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 d13fddb..1823f6f 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.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -100,6 +100,9 @@ fi
 
 
 %changelog
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 4844c057eb8a35d68db32d0f0bd6db84fe2dd45b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 04:01:00 +0000
Subject: [PATCH 17/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_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 1823f6f..5438cfa 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.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -100,6 +100,9 @@ fi
 
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 2a2f1a09fde7095411f8c6d60ba3966772977196 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 13 Feb 2018 08:12:56 +0100
Subject: [PATCH 18/40] add patch for PHP 7.2 from
 https://github.com/pear/Cache_Lite/pull/7

---
 .gitignore                                    |  2 +-
 ...1d0ebad5b5b873fd49a25d7b597b7f407ca0.patch | 22 +++++++++++++++++
 php-pear-Cache-Lite.spec                      | 24 +++++++++----------
 3 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0.patch

diff --git a/.gitignore b/.gitignore
index ea1cab5..9758413 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-*~
+clog
 package-*.xml
 /Cache_Lite-1.7.10.tgz
 /Cache_Lite-1.7.11.tgz
diff --git a/d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0.patch b/d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0.patch
new file mode 100644
index 0000000..61f6ff7
--- /dev/null
+++ b/d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0.patch
@@ -0,0 +1,22 @@
+From d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 13 Feb 2018 08:05:21 +0100
+Subject: [PATCH] drop each usage, deprecated in PHP 7.2
+
+---
+ Cache/Lite/Function.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Cache/Lite/Function.php b/Cache/Lite/Function.php
+index b28cf79..2e5ecad 100644
+--- a/Cache/Lite/Function.php
++++ b/Cache/Lite/Function.php
+@@ -84,7 +84,7 @@ class Cache_Lite_Function extends Cache_Lite
+     function __construct($options = array(NULL))
+     {
+         $availableOptions = array('debugCacheLiteFunction', 'defaultGroup', 'dontCacheWhenTheOutputContainsNOCACHE', 'dontCacheWhenTheResultIsFalse', 'dontCacheWhenTheResultIsNull');
+-        while (list($name, $value) = each($options)) {
++        foreach ($options as $name => $value) {
+             if (in_array($name, $availableOptions)) {
+                 $property = '_'.$name;
+                 $this->$property = $value;
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 5438cfa..346a1ad 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-2016 Remi Collet
+# Copyright (c) 2008-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -15,12 +15,13 @@ Name:           php-pear-Cache-Lite
 Version:        1.8.0
 Release:        4%{?dist}
 License:        PHP
-Group:          Development/Libraries
+URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
-URL:            http://pear.php.net/package/Cache_Lite
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# see https://github.com/pear/Cache_Lite/pull/7
+Patch0:         https://github.com/pear/Cache_Lite/commit/d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0.patch
+
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.10.1
 
@@ -48,7 +49,8 @@ et/ou des tests anti-corruption).
 %prep
 %setup -c -q
 cd %{pear_name}-%{version}
-mv ../package.xml %{name}.xml
+%patch0 -p1
+sed -e 's/md5sum="[^"]*"//' ../package.xml >%{name}.xml
 
 
 %build
@@ -56,8 +58,6 @@ mv ../package.xml %{name}.xml
 
 
 %install
-rm -rf %{buildroot}
-
 cd %{pear_name}-%{version}
 %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
@@ -68,17 +68,13 @@ rm -rf %{buildroot}%{pear_metadir}/.??*
 install -Dpm 644 %{name}.xml %{buildroot}%{pear_xmldir}/%{name}.xml
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %check
 cd %{pear_name}-%{version}
 %{__pear} \
    run-tests \
    -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
    tests | tee ../tests.log
-grep "FAILED TESTS" ../tests.log && exit 1
+grep "FAILED TESTS" ../tests.log && exit 1 || exit 0
 
 
 %post
@@ -92,7 +88,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
 %{pear_phpdir}/Cache
 %{pear_testdir}/%{pear_name}
@@ -100,6 +95,9 @@ fi
 
 
 %changelog
+* Tue Feb 13 2018 Remi Collet <remi@remirepo.net> - 1.8.0-4
+- add patch for PHP 7.2 from https://github.com/pear/Cache_Lite/pull/7
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 727df8aa215477cff74e919cf1ee3127e813ec08 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 13 Feb 2018 14:36:19 +0100
Subject: [PATCH 19/40] v1.8.2

---
 .gitignore               |  1 +
 php-pear-Cache-Lite.spec | 16 +++++++---------
 sources                  |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9758413..2069fa5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ package-*.xml
 /Cache_Lite-1.7.15.tgz
 /Cache_Lite-1.7.16.tgz
 /Cache_Lite-1.8.0.tgz
+/Cache_Lite-1.8.2.tgz
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index 346a1ad..4ba4f4e 100644
--- a/php-pear-Cache-Lite.spec
+++ b/php-pear-Cache-Lite.spec
@@ -12,16 +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.0
-Release:        4%{?dist}
+Version:        1.8.2
+Release:        1%{?dist}
 License:        PHP
 URL:            http://pear.php.net/package/Cache_Lite
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
-
-# see https://github.com/pear/Cache_Lite/pull/7
-Patch0:         https://github.com/pear/Cache_Lite/commit/d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0.patch
-
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.10.1
 
@@ -49,8 +45,7 @@ et/ou des tests anti-corruption).
 %prep
 %setup -c -q
 cd %{pear_name}-%{version}
-%patch0 -p1
-sed -e 's/md5sum="[^"]*"//' ../package.xml >%{name}.xml
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -89,12 +84,15 @@ fi
 
 %files
 %doc %{pear_docdir}/%{pear_name}
+%doc %{pear_testdir}/%{pear_name}
 %{pear_phpdir}/Cache
-%{pear_testdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Tue Feb 13 2018 Remi Collet <remi@remirepo.net> - 1.8.2-1
+- update to 1.8.2
+
 * Tue Feb 13 2018 Remi Collet <remi@remirepo.net> - 1.8.0-4
 - add patch for PHP 7.2 from https://github.com/pear/Cache_Lite/pull/7
 
diff --git a/sources b/sources
index 29966d8..cd7a46c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d63d997a5dfcea8b532591e71f2bca73  Cache_Lite-1.8.0.tgz
+SHA512 (Cache_Lite-1.8.2.tgz) = dfb3c2dadd0ca60cc62ad71fd6fc51c0665901b4370207dfeb1f0f56e9db4fb24724d22f2939f67d8aa044e1b465483c40ec34fb3bcc5e12031d4dd1e05953b4

From 02c8b20cec3f32530e5972d50032911827f85a38 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 13 Feb 2018 14:59:26 +0100
Subject: [PATCH 20/40] cleanup merged patch

---
 ...1d0ebad5b5b873fd49a25d7b597b7f407ca0.patch | 22 -------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0.patch

diff --git a/d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0.patch b/d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0.patch
deleted file mode 100644
index 61f6ff7..0000000
--- a/d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From d3b21d0ebad5b5b873fd49a25d7b597b7f407ca0 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 13 Feb 2018 08:05:21 +0100
-Subject: [PATCH] drop each usage, deprecated in PHP 7.2
-
----
- Cache/Lite/Function.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Cache/Lite/Function.php b/Cache/Lite/Function.php
-index b28cf79..2e5ecad 100644
---- a/Cache/Lite/Function.php
-+++ b/Cache/Lite/Function.php
-@@ -84,7 +84,7 @@ class Cache_Lite_Function extends Cache_Lite
-     function __construct($options = array(NULL))
-     {
-         $availableOptions = array('debugCacheLiteFunction', 'defaultGroup', 'dontCacheWhenTheOutputContainsNOCACHE', 'dontCacheWhenTheResultIsFalse', 'dontCacheWhenTheResultIsNull');
--        while (list($name, $value) = each($options)) {
-+        foreach ($options as $name => $value) {
-             if (in_array($name, $availableOptions)) {
-                 $property = '_'.$name;
-                 $this->$property = $value;

From f68f5811f5784aaadf7088493d03730803728002 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 21:45:46 +0000
Subject: [PATCH 21/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_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 4ba4f4e..473a65e 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.2
-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
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Tue Feb 13 2018 Remi Collet <remi@remirepo.net> - 1.8.2-1
 - update to 1.8.2
 

From fdd65a6b288c077b5ae3d1371b2d895d1fa96b29 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 2 Feb 2019 03:07:04 +0000
Subject: [PATCH 22/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_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 473a65e..3d25716 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.2
-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
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 02910001035659d3d2f8e23e40f40979c4ecd75c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 26 Jul 2019 09:34:21 +0000
Subject: [PATCH 23/40] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_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 3d25716..c991e04 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.2
-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
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

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 24/40] 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 25/40] 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 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 26/40] 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 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 27/40] - 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 28/40] - 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 29/40] - 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 30/40] - 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 31/40] - 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 32/40] 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 33/40] 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 34/40] 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 35/40] 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 36/40] 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 37/40] 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 38/40] 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 39/40] 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 40/40] 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