rpms/php-pear-Mail/EL-5 php-pear-Mail.spec, 1.7, 1.8 xml2changelog, 1.2, 1.3 PHP-LICENSE-3.01, 1.1, NONE

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear-Mail/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2570

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


Index: php-pear-Mail.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/EL-5/php-pear-Mail.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-pear-Mail.spec	12 Oct 2006 18:47:09 -0000	1.7
+++ php-pear-Mail.spec	24 Aug 2007 06:30:14 -0000	1.8
@@ -3,15 +3,14 @@
 
 Name:           php-pear-Mail
 Version:        1.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Class that provides multiple interfaces for sending emails
 Summary(fr):    Une Classe fournissant des interfaces pour envoyer des emails
 
 Group:          Development/Libraries
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/Mail
 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)
 
@@ -43,8 +42,6 @@
 %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
 
-%{__install} -m 644 -c %{SOURCE1} LICENSE
-
 %build
 cd %{pear_name}-%{version}
 # Empty build section, most likely nothing required.
@@ -76,13 +73,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE CHANGELOG
+%doc CHANGELOG
 %{pear_phpdir}/Mail.php
 %{pear_phpdir}/Mail
 %{pear_testdir}/Mail
 %{pear_xmldir}/%{pear_name}.xml
 
 %changelog
+* Fri Aug 24 2007 Remi Collet <Fedora at FamilleCollet.com> 1.1.14-2
+- Fix License
+
 * Thu Oct 12 2006 Remi Collet <Fedora at FamilleCollet.com> 1.1.14-1
 - update to 1.1.14
 


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Mail/EL-5/xml2changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xml2changelog	12 Oct 2006 18:47:09 -0000	1.2
+++ xml2changelog	24 Aug 2007 06:30:14 -0000	1.3
@@ -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 ---