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

[Remi Collet]

commit 02d6a409cb819c5e1480e1994e5816da1ee5991d
Author: remi <fedora at famillecollet.com>
Date:   Thu Oct 28 16:04:38 2010 +0200

    update to 1.3.8 - QA release

 .gitignore             |    2 ++
 php-pear-Net-POP3.spec |   39 +++++++++++++++++++++++++++------------
 sources                |    2 +-
 xml2changelog          |   40 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f05f7fb..bb45927 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +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 2117d08..7fcd5ae 100644
--- a/php-pear-Net-POP3.spec
+++ b/php-pear-Net-POP3.spec
@@ -1,8 +1,8 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Net_POP3
+%global pear_name Net_POP3
 
 Name:           php-pear-Net-POP3
-Version:        1.3.7
+Version:        1.3.8
 Release:        1%{?dist}
 Summary:        Provides a POP3 class to access POP3 server
 
@@ -10,10 +10,12 @@ 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,9 +31,15 @@ optional Auth_SASL package.
 
 %prep
 %setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+%{_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
+
 cd %{pear_name}-%{version}
+# Package.xml is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -40,20 +48,20 @@ cd %{pear_name}-%{version}
 
 
 %install
-cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+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}/.??*
 
 # Install XML package description
 mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 
 
 %clean
@@ -62,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -73,12 +81,19 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
-%{pear_xmldir}/%{pear_name}.xml
+%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
+- rename Net_POP3.xml to php-pear-Net-POP3.xml
+- set date.timezone during build
+- clean define
+
 * Mon Sep 07 2009 Christopher Stone <chris.stone at gmail.com> 1.3.7-1
 - Upstream sync
 - Remove test dir
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);
+}
+?>