rpms/php-pear-PHP-CompatInfo/devel .cvsignore, 1.6, 1.7 php-pear-PHP-CompatInfo.spec, 1.7, 1.8 sources, 1.6, 1.7 xml2changelog, 1.1, 1.2

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5764

Modified Files:
	.cvsignore php-pear-PHP-CompatInfo.spec sources xml2changelog 
Log Message:
update to 1.6.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Nov 2007 12:56:49 -0000	1.6
+++ .cvsignore	16 Feb 2008 15:42:55 -0000	1.7
@@ -1 +1 @@
-PHP_CompatInfo-1.5.1.tgz
+PHP_CompatInfo-1.6.1.tgz


Index: php-pear-PHP-CompatInfo.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/php-pear-PHP-CompatInfo.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-pear-PHP-CompatInfo.spec	20 Nov 2007 18:18:53 -0000	1.7
+++ php-pear-PHP-CompatInfo.spec	16 Feb 2008 15:42:56 -0000	1.8
@@ -2,8 +2,8 @@
 %define pear_name PHP_CompatInfo
 
 Name:           php-pear-PHP-CompatInfo
-Version:        1.5.1
-Release:        2%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        Find out version and extensions required for a piece of code to run
 Summary(fr):    Trouver version et extensions nécessaires à l'exécution d'un code
 
@@ -16,7 +16,8 @@
 
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.5.4
-Requires:       php-pear(PEAR) >= 1.5.4 php-pear(Console_Getargs) >= 1.3.3 php-pear(Console_Table) >= 1.0.5
+Requires:       php-pear(PEAR) >= 1.5.4 php-pear(XML_Util) >= 1.1.4
+Requires:       php-pear(Console_Table) >= 1.0.5 php-pear(Console_Getargs) >= 1.3.3 
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -35,9 +36,8 @@
 
 %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
+%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
 
 
 %build
@@ -57,12 +57,17 @@
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
 install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
-# rename pci.php to pcicmd to keep consistency with previous release
-mv $RPM_BUILD_ROOT%{_bindir}/pci.php $RPM_BUILD_ROOT%{_bindir}/pcicmd
+# Fix CR/LF
+sed -i -e 's/\r//' $RPM_BUILD_ROOT%{_bindir}/pci.php
 
-popd
+# link pci.php to pcicmd to keep consistency with previous release
+ln -s pci.php $RPM_BUILD_ROOT%{_bindir}/pcicmd
+
+popd 
 # Move documentation
 mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} docdir
+# change CRLF
+sed -i -e 's/\r//' docdir/docs/examples/*.php
 
 
 %clean
@@ -81,15 +86,34 @@
 fi
 
 
+%check
+# yum install php-pear-PHP-CompatInfo
+# yum install php-pear-PHPUnit  # (tested with 3.1.9)
+# cd /usr/share/pear/test/PHP_CompatInfo/tests
+# php AllTests.php
+# should display : Tests: 37, Failures: 3.
+# failure seems ok (result order and / \ separator)
+
+
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/tests docdir/docs/*
+%doc CHANGELOG docdir/docs/*
 %{pear_phpdir}/PHP
 %{pear_xmldir}/%{pear_name}.xml
+%{_bindir}/pci.php
 %{_bindir}/pcicmd
-
+%{pear_testdir}/%{pear_name}
 
 %changelog
+* Sat Feb 16 2008 Remi Collet <Fedora at FamilleCollet.com> 1.6.1-1
+- update to 1.6.1
+- add check for packaging documentation purpose
+
+* Sat Feb 16 2008 Remi Collet <Fedora at FamilleCollet.com> 1.6.0-1
+- update to 1.6.0
+- add requires for php-pear(XML_Util) >= 1.1.4
+- not published because http://pear.php.net/bugs/13131
+
 * Tue Nov 20 2007 Remi Collet <Fedora at FamilleCollet.com> 1.5.1-2
 - fix BR (pear >= 1.5.4)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Nov 2007 12:56:49 -0000	1.6
+++ sources	16 Feb 2008 15:42:56 -0000	1.7
@@ -1 +1 @@
-0180665d11d4c3dae706b6cbd3f21ba7  PHP_CompatInfo-1.5.1.tgz
+595282cf8c6aaa4bd10fcd0a20d00ac2  PHP_CompatInfo-1.6.1.tgz


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-PHP-CompatInfo/devel/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	2 Oct 2006 15:23:35 -0000	1.1
+++ xml2changelog	16 Feb 2008 15:42:56 -0000	1.2
@@ -7,16 +7,22 @@
 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);