[php-pear-Net-POP3] update to 1.3.8 - QA release

Remi Collet remi at fedoraproject.org
Thu Oct 28 13:53:28 UTC 2010


commit 2b6f7c480e14184b75ea20b6164aae2324e7d66a
Author: remi <fedora at famillecollet.com>
Date:   Thu Oct 28 15:53:25 2010 +0200

    update to 1.3.8 - QA release

 .gitignore             |    1 +
 php-pear-Net-POP3.spec |   20 ++++++++++++++------
 sources                |    2 +-
 xml2changelog          |   40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bdba454..bb45927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 Net_POP3-1.3.7.tgz
 package.xml
+/Net_POP3-1.3.8.tgz
diff --git a/php-pear-Net-POP3.spec b/php-pear-Net-POP3.spec
index 4ab6f41..3b2ad17 100644
--- a/php-pear-Net-POP3.spec
+++ b/php-pear-Net-POP3.spec
@@ -2,18 +2,20 @@
 %global pear_name Net_POP3
 
 Name:           php-pear-Net-POP3
-Version:        1.3.7
-Release:        2%{?dist}
+Version:        1.3.8
+Release:        1%{?dist}
 Summary:        Provides a POP3 class to access POP3 server
 
 Group:          Development/Languages
 License:        BSD
 URL:            http://pear.php.net/package/Net_POP3
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source2:        xml2changelog
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
+
 Requires:       php-pear(PEAR)
 Requires:       php-pear(Net_Socket) >= 1.0
 Requires(hint): php-pear(Auth_SASL) >= 1.0
@@ -29,6 +31,8 @@ optional Auth_SASL package.
 
 %prep
 %setup -qc
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
+
 # Create a "localized" php.ini to avoid build warning
 cp /etc/php.ini .
 echo "date.timezone=UTC" >>php.ini
@@ -44,13 +48,13 @@ cd %{pear_name}-%{version}
 
 
 %install
-cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
+cd %{pear_name}-%{version}
 PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs ../docdir
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -77,12 +81,16 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc CHANGELOG docdir/*
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/Net/POP3.php
 
 
 %changelog
+* Thu Oct 28 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.3.8-1
+- Version 1.3.8 (stable) - API 1.3.7 (stable) - QA Release
+- add generated Changelog
+
 * Wed Aug 18 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.3.7-2
 - rename Net_POP3.xml to php-pear-Net-POP3.xml
 - set date.timezone during build
diff --git a/sources b/sources
index a2e5819..e1e45e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eda6572e03b955ae0ca4345ddf2e4e33  Net_POP3-1.3.7.tgz
+fb40733d8623784ba115804cd76ec598  Net_POP3-1.3.8.tgz
diff --git a/xml2changelog b/xml2changelog
new file mode 100644
index 0000000..eb6bd31
--- /dev/null
+++ b/xml2changelog
@@ -0,0 +1,40 @@
+<?php
+$prog=array_shift($_SERVER['argv']);
+if ($_SERVER['argc']<2) die ("usage : " . $prog . " path_to_package.xml [ --debug ]\n");
+$file=array_shift($_SERVER['argv']);
+
+($xml=simplexml_load_file($file)) || die ($file . " not found !\n");
+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",
+		$xml->version->release, $xml->stability->release, 
+		$xml->version->api, $xml->stability->api, 
+		$xml->date, $xml->notes);
+	$new=$xml->version->release;
+
+	if (isset($xml->changelog->release) && count($xml->changelog->release)) {
+		$tab = array();
+		foreach($xml->changelog->release as $rel) {
+			$old=$rel->version->release;
+			if ("$old" != "$new") {
+				$tab[''.$rel->date] = $rel;
+			}
+		}	
+		krsort($tab);
+		foreach($tab 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, 
+				$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);
+
+	foreach($xml->changelog->release as $rel)
+		printf("* Version %s (%s) - %s\n\n%s\n\n",
+			$rel->version, $rel->state, $rel->date, $rel->notes);
+}
+?>


More information about the scm-commits mailing list