rpms/php-pear-Net-Ping/devel .cvsignore, 1.2, 1.3 php-pear-Net-Ping.spec, 1.1, 1.2 sources, 1.2, 1.3 xml2changelog, 1.1, 1.2 PHP-LICENSE-3.01, 1.1, NONE

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear-Net-Ping/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1591

Modified Files:
	.cvsignore php-pear-Net-Ping.spec sources xml2changelog 
Removed Files:
	PHP-LICENSE-3.01 
Log Message:
new version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 May 2007 14:33:37 -0000	1.2
+++ .cvsignore	10 Jul 2007 19:37:40 -0000	1.3
@@ -1 +1 @@
-Net_Ping-2.4.1.tgz
+Net_Ping-2.4.2.tgz


Index: php-pear-Net-Ping.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/devel/php-pear-Net-Ping.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Net-Ping.spec	18 May 2007 14:33:37 -0000	1.1
+++ php-pear-Net-Ping.spec	10 Jul 2007 19:37:40 -0000	1.2
@@ -2,15 +2,14 @@
 %define pear_name Net_Ping
 
 Name:           php-pear-Net-Ping
-Version:        2.4.1
-Release:        2%{?dist}
+Version:        2.4.2
+Release:        1%{?dist}
 Summary:        Execute ping
 
 Group:          Development/Libraries
 License:        PHP License
 URL:            http://pear.php.net/package/Net_Ping
 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)
 
@@ -27,10 +26,8 @@
 
 %prep
 %setup -q -c
-%{__pear} convert 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
+%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 
 %build
@@ -41,7 +38,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT docdir
 cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} -d download_dir=$PWD install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
 
 # Move documentation
 mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
@@ -63,20 +60,22 @@
 %{__pear} install --nodeps --soft --force --register-only \
     %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
 
+
 %postun
 if [ $1 -eq 0 ] ; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
         %{pear_name} >/dev/null || :
 fi
 
+
 %check
 cd %{pear_name}-%{version}/tests
-php test_result_parsers.php
+php -d include_path=%{pear_phpdir}:$RPM_BUILD_ROOT%{pear_phpdir} test_result_parsers.php
 
 
 %files
 %defattr(-,root,root,-)
-%doc docdir/docs/examples CHANGELOG LICENSE
+%doc docdir/docs/examples CHANGELOG
 
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_phpdir}/Net
@@ -84,6 +83,11 @@
 
 
 %changelog
+* Tue Jul 16 2007 Remi Collet <Fedora at FamilleCollet.com> 2.4.2-1
+- update to 2.4.2
+- package is now 2.0 (no need to convert)
+- remove LICENSE (Review Guidelines : If (and only if) the source package includes...)
+
 * Wed May 16 2007 Remi Collet <Fedora at FamilleCollet.com> 2.4.1-2
 - From review, correct typo.
 - add Requires: /bin/ping


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 May 2007 14:33:37 -0000	1.2
+++ sources	10 Jul 2007 19:37:40 -0000	1.3
@@ -1 +1 @@
-021e62d12675689445c8bac9cdcc1318  Net_Ping-2.4.1.tgz
+5bfd8d695c35d30d353b51134ad8ca35  Net_Ping-2.4.2.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Net-Ping/devel/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	18 May 2007 14:33:37 -0000	1.1
+++ xml2changelog	10 Jul 2007 19:37:40 -0000	1.2
@@ -12,7 +12,7 @@
 		$xml->version->api, $xml->stability->api, 
 		$xml->date, $xml->notes);
 
-	foreach($xml->changelog->release as $rel)
+	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, 


--- PHP-LICENSE-3.01 DELETED ---