rpms/php-pear-Mail/devel .cvsignore, 1.3, 1.4 php-pear-Mail.spec, 1.6, 1.7 sources, 1.3, 1.4 xml2changelog, 1.1, 1.2

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear-Mail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1600

Modified Files:
	.cvsignore php-pear-Mail.spec sources xml2changelog 
Log Message:
	update to 1.1.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Sep 2006 10:24:23 -0000	1.3
+++ .cvsignore	12 Oct 2006 18:47:09 -0000	1.4
@@ -1 +1 @@
-Mail-1.1.13.tgz
+Mail-1.1.14.tgz


Index: php-pear-Mail.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/php-pear-Mail.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- php-pear-Mail.spec	16 Sep 2006 10:24:23 -0000	1.6
+++ php-pear-Mail.spec	12 Oct 2006 18:47:09 -0000	1.7
@@ -2,7 +2,7 @@
 %define pear_name Mail
 
 Name:           php-pear-Mail
-Version:        1.1.13
+Version:        1.1.14
 Release:        1%{?dist}
 Summary:        Class that provides multiple interfaces for sending emails
 Summary(fr):    Une Classe fournissant des interfaces pour envoyer des emails
@@ -50,8 +50,8 @@
 # Empty build section, most likely nothing required.
 
 %install
+rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
 %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
 # Clean up unnecessary files
@@ -83,6 +83,9 @@
 %{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Thu Oct 12 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.14-1
+- update to 1.1.14
+
 * Sat Sep 16 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.13-1
 - regenerate SPEC with pear make-rpm-spec
 - remove PEAR from sumnary


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Sep 2006 10:24:23 -0000	1.3
+++ sources	12 Oct 2006 18:47:09 -0000	1.4
@@ -1 +1 @@
-087f63a04d95670fadc9e39948b09f8c  Mail-1.1.13.tgz
+e50da58b6b787b3903ce4d07dc791bb2  Mail-1.1.14.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/devel/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	16 Sep 2006 10:24:23 -0000	1.1
+++ xml2changelog	12 Oct 2006 18:47:09 -0000	1.2
@@ -1,13 +1,28 @@
 <?php
 $prog=array_shift($_SERVER['argv']);
-if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml\n");
+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");
-printf("* Version %s (%s) - %s\n\n%s\n\n",
-	$xml->release->version, $xml->release->state, $xml->release->date, $xml->release->notes);
+if (in_array("--debug", $_SERVER['argv'])) print_r($xml);
 
-foreach($xml->changelog->release as $rel)
+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);
+
+	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",
-		$rel->version, $rel->state, $rel->date, $rel->notes);
+		$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);
+}
 ?>