From 5c49b8b5ba19a81c7dc01a16ce386bb2d1fc5d58 Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Mar 02 2011 16:43:36 +0000
Subject: update to 1.7.9 (api 1.7.7)


---

diff --git a/.gitignore b/.gitignore
index d265406..833f57d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+package-*.xml
 Cache_Lite-1.7.8.tgz
+/Cache_Lite-1.7.9.tgz
diff --git a/php-pear-Cache-Lite.spec b/php-pear-Cache-Lite.spec
index e74db5c..8fe53ce 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.8
-Release:        4%{?dist}
+Version:        1.7.9
+Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -35,8 +35,15 @@ et/ou des tests anti-corruption).
 
 %prep
 %setup -c -q
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}/%{name}.xml
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
+
+# Create a "localized" php.ini to avoid build warning
+cp /etc/php.ini .
+echo "date.timezone=UTC" >>php.ini
+
+cd %{pear_name}-%{version}
+# package.xml is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -47,7 +54,7 @@ mv package.xml %{pear_name}-%{version}/%{name}.xml
 rm -rf %{buildroot} docdir
 
 pushd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -70,12 +77,12 @@ rm -rf %{buildroot}
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
-# For documentation purpose only
-# After install, as root :
-# pear run-tests -p Cache_Lite
-# Should return 
-# 19 PASSED TESTS
-# 0 SKIPPED TESTS
+cd %{pear_name}-%{version}
+PHPRC=../php.ini %{__pear} \
+   run-tests \
+   -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
+   tests | tee ../tests.log
+grep "FAILED TESTS" ../tests.log && exit 1
 
 
 %post
@@ -97,6 +104,11 @@ fi
 
 
 %changelog
+* Wed Mar 02 2011 Remi Collet <Fedora@FamilleCollet.com> 1.7.9-1
+- Version 1.7.9 (stable) - API 1.7.7 (stable)
+- define timezone during build
+- run test suite during %%check
+
 * 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
 
diff --git a/sources b/sources
index edd0194..6952c72 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75c142769a4ca68afc72dcf4f494bdd6  Cache_Lite-1.7.8.tgz
+e4b84a2016f995a193749d00028f0669  Cache_Lite-1.7.9.tgz
diff --git a/xml2changelog b/xml2changelog
index c114873..c04c442 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -7,22 +7,31 @@ $file=array_shift($_SERVER['argv']);
 if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
 if ($xml['version'] >= "2"){ // Package.xml V 2.0
-	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;
+	$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)) 
-	    foreach($xml->changelog->release as $rel) {
-		$old=$rel->version->release;
-		if ("$old" != "$new") {
-		    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);
+	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);