rpms/php-pear-Net-Traceroute/EL-5 php-pear-Net-Traceroute.spec, 1.1, 1.2 sources, 1.2, 1.3 xml2changelog, 1.1, 1.2

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-Traceroute/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20549

Modified Files:
	php-pear-Net-Traceroute.spec sources xml2changelog 
Log Message:
update to 0.21.2 (bugfix)


Index: php-pear-Net-Traceroute.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Traceroute/EL-5/php-pear-Net-Traceroute.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- php-pear-Net-Traceroute.spec	18 May 2007 14:56:58 -0000	1.1
+++ php-pear-Net-Traceroute.spec	14 Nov 2009 21:25:08 -0000	1.2
@@ -2,15 +2,14 @@
 %define pear_name Net_Traceroute
 
 Name:           php-pear-Net-Traceroute
-Version:        0.21.1
-Release:        2%{?dist}
+Version:        0.21.2
+Release:        1%{?dist}
 Summary:        Execute traceroute
 
 Group:          Development/Libraries
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/Net_Traceroute
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-3.01
 Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,10 +25,9 @@ OS independent wrapper class for executi
 
 %prep
 %setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
-%{__install} -m 644 -c %{SOURCE1} LICENSE
+# Package.xml is V2
+%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+mv package.xml %{pear_name}-%{version}/%{name}.xml
 
 
 %build
@@ -40,7 +38,7 @@ cd %{pear_name}-%{version}
 %install
 rm -rf $RPM_BUILD_ROOT docdir
 cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs ../docdir
@@ -51,7 +49,7 @@ rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -60,7 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -71,12 +69,16 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG LICENSE docdir/*
-%{pear_xmldir}/%{pear_name}.xml
+%doc CHANGELOG docdir/*
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Net
-
+%exclude %{pear_datadir}
 
 %changelog
+* Sat Nov 14 2009 Remi Collet <Fedora at FamilleCollet.com> 0.21.2-1
+- new version (bugfix)
+- rename Net_Traceroute.xml to php-pear-Net-Traceroute.xml
+
 * Wed May 16 2007 Remi Collet <Fedora at FamilleCollet.com> 0.21.1-2
 - From review, change description
 - add Requires: traceroute


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Traceroute/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 May 2007 14:56:58 -0000	1.2
+++ sources	14 Nov 2009 21:25:08 -0000	1.3
@@ -1 +1 @@
-7c92094add7f3f516c4a1e973cd065b4  Net_Traceroute-0.21.1.tgz
+fa59c7c37f9f2b41c8c5a2b2a4b3eef6  Net_Traceroute-0.21.2.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Traceroute/EL-5/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xml2changelog	18 May 2007 14:56:58 -0000	1.1
+++ xml2changelog	14 Nov 2009 21:25:08 -0000	1.2
@@ -7,16 +7,22 @@ $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",
+	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;
 
-	foreach($xml->changelog->release as $rel)
-		printf("* Version %s (%s) - API %s (%s) - %s\n\n%s\n\n",
+	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);
+		}
+	    }
 } 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);