update to 1.7.12

#2781)

.cvsignore

@@ -1 +0,0 @@
-Cache_Lite-1.7.8.tgz

.gitignore

@@ -0,0 +1,5 @@
+*~
+package-*.xml
+/Cache_Lite-1.7.10.tgz
+/Cache_Lite-1.7.11.tgz
+/Cache_Lite-1.7.12.tgz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: php-pear-Cache-Lite
-# $Id$
-NAME := php-pear-Cache-Lite
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

php-pear-Cache-Lite.spec

@@ -1,11 +1,11 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Cache_Lite
+%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.8
+Version:        1.7.12
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        PHP
 Group:          Development/Libraries
 Source:         http://pear.php.net/get/%{pear_name}-%{version}.tgz
@@ -35,8 +35,11 @@ et/ou des tests anti-corruption).
 
 %prep
 %setup -c -q
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+
+cd %{pear_name}-%{version}
+# package.xml is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -44,22 +47,17 @@ mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 
 %install
-rm -rf %{buildroot} docdir
+rm -rf %{buildroot}
 
-pushd %{pear_name}-%{version}
+cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
-
-popd
-# Sort out documentation
-%{__mkdir} docdir
-mv %{buildroot}%{pear_docdir}/%{pear_name}/* docdir
 
 
 %clean
@@ -70,16 +68,16 @@ 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
+cd %{pear_name}-%{version}
-# After install, as root :
+%{__pear} \
-# pear run-tests -p Cache_Lite
+   run-tests \
-# Should return 
+   -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
-# 19 PASSED TESTS
+   tests | tee ../tests.log
-# 0 SKIPPED TESTS
+grep "FAILED TESTS" ../tests.log && exit 1
 
 
 %post
-%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+%{__pear} install --nodeps --soft --force --register-only %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 
 %postun
@@ -90,13 +88,28 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
 %{pear_phpdir}/Cache
 %{pear_testdir}/%{pear_name}
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Tue Aug 16 2011 Remi Collet <Fedora@FamilleCollet.com> 1.7.12-1
+- Version 1.7.12 (stable) - API 1.7.7 (stable)
+- Updated LICENSE file
+- doc in /usr/share/doc/pear
+
+* 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
+
+* Fri 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
 

sources

@@ -1 +1 @@
-75c142769a4ca68afc72dcf4f494bdd6  Cache_Lite-1.7.8.tgz
+2821420ba814c66fa37b47afd75b9821  Cache_Lite-1.7.12.tgz

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",
+	$new = "";
-		$xml->version->release, $xml->stability->release, 
+	if (strlen(trim($xml->notes))>1) { // Ignore too short descr.
-		$xml->version->api, $xml->stability->api, 
+		printf("++*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
-		$xml->date, $xml->notes);
+			$xml->version->release, $xml->stability->release,
-	$new=$xml->version->release;
+			$xml->version->api, $xml->stability->api,
+			$xml->date, $xml->notes);
+		$new=$xml->version->release;
+	}
 
-	if (isset($xml->changelog->release) && count($xml->changelog->release)) 
+	if (isset($xml->changelog->release) && count($xml->changelog->release)) {
-	    foreach($xml->changelog->release as $rel) {
+		$tab = array();
-		$old=$rel->version->release;
+		foreach($xml->changelog->release as $rel) {
-		if ("$old" != "$new") {
+			$old=$rel->version->release;
-		    printf("*** Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+			if ("$old" != "$new") {
-			$rel->version->release, $rel->stability->release, 
+				$tab[''.$rel->date] = $rel;
-			$rel->version->api, $rel->stability->api, 
+			}
-			$rel->date, $rel->notes);
 		}
-	    }
+		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);