rpms/php-pear-XML-Parser/devel php-pear-XML-Parser.spec, 1.3, 1.4 xml2changelog, 1.1, 1.2 PHP-LICENSE-3.01, 1.1, NONE

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear-XML-Parser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2174

Modified Files:
	php-pear-XML-Parser.spec xml2changelog 
Removed Files:
	PHP-LICENSE-3.01 
Log Message:
Fix License


Index: php-pear-XML-Parser.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/devel/php-pear-XML-Parser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- php-pear-XML-Parser.spec	5 Dec 2006 17:40:22 -0000	1.3
+++ php-pear-XML-Parser.spec	24 Aug 2007 06:21:53 -0000	1.4
@@ -5,12 +5,11 @@
 Summary(fr):  Une classe d'analyse XML utilisant l'extension expat de PHP
 Name:         php-pear-XML-Parser
 Version:      1.2.8
-Release:      1%{?dist}
-License:      PHP License
+Release:      2%{?dist}
+License:      PHP
 Group:        Development/Libraries
 URL:          http://pear.php.net/package/XML_Parser
 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)
@@ -19,7 +18,7 @@
 BuildRequires:    php-pear >= 1:1.4.9-1.2
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
-Requires:         php-pear(PEAR) >= 1.4.9, php >= 4.2.0
+Requires:         php-pear(PEAR) >= 1.4.9
 Provides:         php-pear(%{pear_name}) = %{version}
 
 %description
@@ -54,7 +53,6 @@
 [ -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
 
 %build
 # Empty build section
@@ -98,7 +96,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG LICENSE docdir/examples
+%doc CHANGELOG docdir/examples
 %{pear_phpdir}/XML/Parser
 %{pear_phpdir}/XML/Parser.php
 %{pear_testdir}/%{pear_name}
@@ -106,6 +104,9 @@
 
 
 %changelog
+* Fri Aug 24 2007 Remi Collet <Fedora at FamilleCollet.com> 1.2.8-2
+- Fix License
+
 * Sat Dec 02 2006 Remi Collet <Fedora at FamilleCollet.com> 1.2.8-1
 - update to 1.2.8
 - remove PEAR from sumnary


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-XML-Parser/devel/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	5 Dec 2006 17:40:22 -0000	1.1
+++ xml2changelog	24 Aug 2007 06:21:53 -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 ---