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

[Remi Collet]

Author: remi

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

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


Index: php-pear-Net-Ping.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/EL-5/php-pear-Net-Ping.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- php-pear-Net-Ping.spec	2 Jan 2008 19:46:26 -0000	1.2
+++ php-pear-Net-Ping.spec	14 Nov 2009 07:13:24 -0000	1.3
@@ -2,7 +2,7 @@
 %define pear_name Net_Ping
 
 Name:           php-pear-Net-Ping
-Version:        2.4.3
+Version:        2.4.5
 Release:        1%{?dist}
 Summary:        Execute ping
 
@@ -26,8 +26,9 @@ OS independent wrapper class for executi
 
 %prep
 %setup -q -c
+# package.xml is V2
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+mv package.xml %{pear_name}-%{version}/%{name}.xml
 
 
 %build
@@ -38,7 +39,7 @@ cd %{pear_name}-%{version}
 %install
 rm -rf $RPM_BUILD_ROOT docdir
 cd %{pear_name}-%{version}
-%{__pear} -d download_dir=$PWD install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} -d download_dir=$PWD install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
@@ -49,7 +50,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
@@ -58,7 +59,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
@@ -68,21 +69,18 @@ if [ $1 -eq 0 ] ; then
 fi
 
 
-%check
-# cd %{pear_name}-%{version}/tests
-# php -d include_path=%{pear_phpdir}:$RPM_BUILD_ROOT%{pear_phpdir} test_result_parsers.php
-
-
 %files
 %defattr(-,root,root,-)
 %doc docdir/docs/examples CHANGELOG
-
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Net
-# %{pear_testdir}/%{pear_name}
 
 
 %changelog
+* Sat Nov 14 2009 Remi Collet <Fedora at FamilleCollet.com> 2.4.5-1
+- update to 2.4.5 (bugfix)
+- rename Net_Ping.xml to php-pear-Net-Ping.xml
+
 * Fri Dec 28 2007 Remi Collet <Fedora at FamilleCollet.com> 2.4.3-1
 - update to 2.4.3
 
@@ -100,3 +98,4 @@ fi
 - initial RPM (generated specfile + cleanup)
 - add CHANGELOG and LICENSE
 - convert package.xml to package2.xml
+


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	2 Jan 2008 19:46:26 -0000	1.3
+++ sources	14 Nov 2009 07:13:24 -0000	1.4
@@ -1 +1 @@
-340ca27cfa1c0aab31991928d423cffb  Net_Ping-2.4.3.tgz
+c6573fd61f71682c3ebceb85ab779550  Net_Ping-2.4.5.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/EL-5/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xml2changelog	18 May 2007 14:50:08 -0000	1.1
+++ xml2changelog	14 Nov 2009 07:13:24 -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);