rpms/php-pecl-zip/EL-5 php-pecl-zip.spec, 1.14, 1.15 xml2changelog, 1.2, 1.3 PHP-LICENSE-3.01, 1.1, NONE

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/php-pecl-zip/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32186

Modified Files:
	php-pecl-zip.spec xml2changelog 
Removed Files:
	PHP-LICENSE-3.01 
Log Message:
EPEL spec clean


Index: php-pecl-zip.spec
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/EL-5/php-pecl-zip.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- php-pecl-zip.spec	7 Jun 2007 08:30:20 -0000	1.14
+++ php-pecl-zip.spec	11 Jul 2008 13:40:33 -0000	1.15
@@ -5,21 +5,23 @@
 Summary(fr):  Une extension de gestion des ZIP
 Name:         php-pecl-zip
 Version:      1.8.10
-Release:      1%{?dist}
-License:      PHP License
+Release:      2%{?dist}
+License:      PHP
 Group:        Development/Languages
 URL:          http://pecl.php.net/package/zip
 
 Source:       http://pecl.php.net/get/zip-%{version}.tgz
-Source1:      PHP-LICENSE-3.01
 Source2:      xml2changelog
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:     php-pecl(zip) = %{version}-%{release}, php-zip = %{version}-%{release}
-BuildRequires: php-devel, zlib-devel
+BuildRequires: php-devel, zlib-devel, autoconf, automake, libtool
 %if %{?php_zend_api}0
 Requires:     php(zend-abi) = %{php_zend_api}
 Requires:     php(api) = %{php_core_api}
+%endif
+%if 0%{?rhel} == 4
+Requires:     php
 %else
 Requires:     php-api = %{php_apiver}
 %endif
@@ -30,12 +32,17 @@
 %description -l fr
 Zip est une extension pour créer et lire les archives au format ZIP.
 
+
 %prep 
 %setup -c -q
 
+%if 0%{?rhel} > 4
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+%endif
+
+# to avoid check-rpath error on EL-4
+%{__sed} -i -e 's,PHP_ADD_LIBRARY_WITH_PATH(z.*$,PHP_ADD_LIBRARY(z),' zip-%{version}/config.m4
 
-%{__install} -m 644 -c %{SOURCE1} LICENSE
 
 %build
 cd zip-%{version}
@@ -43,6 +50,7 @@
 %configure
 %{__make} %{?_smp_mflags}
 
+
 %install
 cd zip-%{version}
 %{__rm} -rf %{buildroot}
@@ -55,16 +63,27 @@
 extension=zip.so
 EOF
 
+
 %clean
 %{__rm} -rf %{buildroot}
 
+
 %files
 %defattr(-, root, root, -)
-%doc LICENSE CHANGELOG zip-%{version}/CREDITS zip-%{version}/examples
+%if 0%{?rhel} > 4
+%doc CHANGELOG
+%endif
+%doc zip-%{version}/CREDITS zip-%{version}/examples
 %config(noreplace) %{_sysconfdir}/php.d/zip.ini
 %{php_extdir}/zip.so
 
+
 %changelog
+* Wed Jul 08 2008 Remi Collet <Fedora at FamilleCollet.com> 1.8.10-2
+- EPEL only spec file
+- remove License file
+- EL4 build
+
 * Thu Jun 07 2007 Remi Collet <Fedora at FamilleCollet.com> 1.8.10-1
 - update to 1.8.10
 


Index: xml2changelog
===================================================================
RCS file: /cvs/extras/rpms/php-pecl-zip/EL-5/xml2changelog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xml2changelog	7 Jun 2007 08:30:20 -0000	1.2
+++ xml2changelog	11 Jul 2008 13:40:33 -0000	1.3
@@ -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;
 
-	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",
+	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);


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