rpms/php-pear-Cache/F-8 php-pear-Cache.spec, 1.3, 1.4 sources, 1.3, 1.4 xml2changelog, 1.3, 1.4

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17476

Modified Files:
	php-pear-Cache.spec sources xml2changelog 
Log Message:
revert previous (no pear 1.7.x on F-8)


Index: php-pear-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/F-8/php-pear-Cache.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-Cache.spec	7 Oct 2008 15:13:28 -0000	1.3
+++ php-pear-Cache.spec	7 Oct 2008 15:36:07 -0000	1.4
@@ -1,7 +1,7 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
 %define pear_name Cache
 
-##define beta RC4
+%define beta RC4
 
 Name:           php-pear-Cache
 Version:        1.5.5
@@ -36,9 +36,9 @@
 
 %prep
 %setup -q -c
-# package.xml is V2
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}%{?beta}/%{pear_name}.xml
+[ -f package2.xml ] || mv package.xml package2.xml
+%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
+mv package2.xml %{pear_name}-%{version}%{?beta}/%{pear_name}.xml
 
 cd %{pear_name}-%{version}%{?beta}
 
@@ -88,9 +88,6 @@
 
 
 %changelog
-* Tue Oct  7 2008 Remi Collet <Fedora at FamilleCollet.com> 1.5.5-1
-- finale 1.5.5
-
 * Wed Aug 22 2007 Remi Collet <Fedora at FamilleCollet.com> 1.5.5-0.2.RC4
 - fix License
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 Oct 2008 15:13:28 -0000	1.3
+++ sources	7 Oct 2008 15:36:08 -0000	1.4
@@ -1 +1 @@
-b3d5cd9953ce666884246a1942fe0f1e  Cache-1.5.5.tgz
+d7ababc47030b1d69aba655156a41ea3  Cache-1.5.5RC4.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/F-8/xml2changelog,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xml2changelog	7 Oct 2008 15:13:28 -0000	1.3
+++ xml2changelog	7 Oct 2008 15:36:08 -0000	1.4
@@ -7,22 +7,16 @@
 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",
+	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",
+	if (is_array($xml->changelog->release)) foreach($xml->changelog->release 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);