[php-pear-Net-SMTP/el6/master] update to 1.4.3 (bugfix)

[Remi Collet]

commit 0c9abe6e934efd63b1785817ff03f4cb836fc241
Author: remi <fedora at famillecollet.com>
Date:   Mon Oct 11 19:00:34 2010 +0200

    update to 1.4.3 (bugfix)

 php-pear-Net-SMTP.spec |   23 ++++++++++++++++-------
 xml2changelog          |   26 ++++++++++++++++----------
 2 files changed, 32 insertions(+), 17 deletions(-)
---
diff --git a/php-pear-Net-SMTP.spec b/php-pear-Net-SMTP.spec
index 1708631..f0a9dee 100644
--- a/php-pear-Net-SMTP.spec
+++ b/php-pear-Net-SMTP.spec
@@ -2,7 +2,7 @@
 %global pear_name Net_SMTP
 
 Name:           php-pear-Net-SMTP
-Version:        1.4.2
+Version:        1.4.3
 Release:        1%{?dist}
 Summary:        Provides an implementation of the SMTP protocol
 Summary(fr):    Fournit une mise en œuvre du protocole SMTP
@@ -11,12 +11,12 @@ Group:          Development/Libraries
 License:        PHP
 URL:            http://pear.php.net/package/Net_SMTP
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-
 Source2:        xml2changelog
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  php-pear >= 1:1.4.9-1.2
+
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Provides:       php-pear(%{pear_name}) = %{version}
@@ -39,10 +39,15 @@ l'extension "php-pear-Auth-SASL".
 
 %prep
 %setup -q -c
-# Package.xml is V2
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 2
 
-mv package.xml %{pear_name}-%{version}/%{name}.xml
+# 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
@@ -54,7 +59,7 @@ cd %{pear_name}-%{version}
 rm -rf %{buildroot} docdir
 
 pushd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
@@ -110,6 +115,10 @@ fi
 
 
 %changelog
+* Mon Oct 11 2010 Remi Collet <Fedora at FamilleCollet.com> 1.4.3-1
+- Version 1.4.3 (stable) - API 1.1.3 (stable)
+- set timezone during build
+
 * Tue Mar 09 2010 Remi Collet <Fedora at FamilleCollet.com> 1.4.2-1
 - update to 1.4.2
 
diff --git a/xml2changelog b/xml2changelog
index c114873..eb6bd31 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -13,16 +13,22 @@ if ($xml['version'] >= "2"){ // Package.xml V 2.0
 		$xml->date, $xml->notes);
 	$new=$xml->version->release;
 
-	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);
-		}
-	    }
+	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);