rpms/php-pear-Cache/devel php-pear-Cache.spec, 1.1, 1.2 xml2changelog, 1.1, 1.2 PHP-LICENSE-3.01, 1.1, NONE

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pear-Cache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3156

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


Index: php-pear-Cache.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/devel/php-pear-Cache.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-pear-Cache.spec	10 Nov 2006 20:13:16 -0000	1.1
+++ php-pear-Cache.spec	22 Aug 2007 18:04:58 -0000	1.2
@@ -9,15 +9,14 @@
 %if %{?beta:0}%{!?beta:1}
 Release:        1%{?dist}
 %else
-Release:        0.1.%{beta}%{?dist}
+Release:        0.2.%{beta}%{?dist}
 %endif
 Summary:        Framework for caching of arbitrary data
 
 Group:          Development/Libraries
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/Cache
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}%{?beta}.tgz
-Source1:        PHP-LICENSE-3.01
 Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -40,7 +39,6 @@
 [ -f package2.xml ] || mv package.xml package2.xml
 %{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
 mv package2.xml %{pear_name}-%{version}%{?beta}/%{pear_name}.xml
-%{__install} -m 644 -c %{SOURCE1} LICENSE
 
 cd %{pear_name}-%{version}%{?beta}
 
@@ -81,7 +79,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG LICENSE
+%doc CHANGELOG
 
 %{pear_xmldir}/%{pear_name}.xml
 %{pear_phpdir}/Cache.php
@@ -90,10 +88,13 @@
 
 
 %changelog
-* Tue Oct  7 2006 Remi Collet <Fedora at FamilleCollet.com> 1.5.5-0.1.RC4
+* Wed Aug 22 2007 Remi Collet <Fedora at FamilleCollet.com> 1.5.5-0.2.RC4
+- fix License
+
+* Fri Nov 10 2006 Remi Collet <Fedora at FamilleCollet.com> 1.5.5-0.1.RC4
 - use define beta (rather than fullversion)
 
-* Tue Oct  7 2006 Remi Collet <Fedora at FamilleCollet.com> 1.5.5-0.1.rc4
+* Tue Nov  7 2006 Remi Collet <Fedora at FamilleCollet.com> 1.5.5-0.1.rc4
 - generated specfile (pear make-rpm-spec) + cleaning
 - generated CHANGELOG
 - add LICENSE


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pear-Cache/devel/xml2changelog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml2changelog	10 Nov 2006 20:13:16 -0000	1.1
+++ xml2changelog	22 Aug 2007 18:04:58 -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 ---