[php-pear-Net-Traceroute/f13/master] update to 0.21.3 - CS-fixes

[Remi Collet]

commit c70871ae5f61cabd6da4ae551ebfc86cba7a25ae
Author: remi <fedora at famillecollet.com>
Date:   Thu Oct 21 18:53:38 2010 +0200

    update to 0.21.3 - CS-fixes

 .gitignore                   |    2 +-
 php-pear-Net-Traceroute.spec |   26 ++++++++++++++++++++------
 sources                      |    2 +-
 xml2changelog                |   26 ++++++++++++++++----------
 4 files changed, 38 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b05144e..1d04dec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-Net_Traceroute-0.21.2.tgz
+/Net_Traceroute-0.21.3.tgz
diff --git a/php-pear-Net-Traceroute.spec b/php-pear-Net-Traceroute.spec
index 9a66c28..24046bf 100644
--- a/php-pear-Net-Traceroute.spec
+++ b/php-pear-Net-Traceroute.spec
@@ -2,7 +2,7 @@
 %define pear_name Net_Traceroute
 
 Name:           php-pear-Net-Traceroute
-Version:        0.21.2
+Version:        0.21.3
 Release:        1%{?dist}
 Summary:        Execute traceroute
 
@@ -11,10 +11,11 @@ License:        PHP
 URL:            http://pear.php.net/package/Net_Traceroute
 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}
@@ -23,11 +24,18 @@ Requires:       traceroute
 %description
 OS independent wrapper class for executing traceroute calls.
 
+
 %prep
 %setup -q -c
-# Package.xml is V2
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}/%{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
@@ -38,7 +46,7 @@ cd %{pear_name}-%{version}
 %install
 rm -rf $RPM_BUILD_ROOT docdir
 cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Move documentation
 mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs ../docdir
@@ -74,7 +82,13 @@ fi
 %{pear_phpdir}/Net
 %exclude %{pear_datadir}
 
+
 %changelog
+* Thu Oct 21 2010 Remi Collet <Fedora at FamilleCollet.com> 0.21.3-1
+- Version 0.21.3 (alpha) - API 0.21.1 (alpha)
+- set timezone during build
+- spec cleanup
+
 * Sat Nov 14 2009 Remi Collet <Fedora at FamilleCollet.com> 0.21.2-1
 - new version (bugfix)
 - rename Net_Traceroute.xml to php-pear-Net-Traceroute.xml
diff --git a/sources b/sources
index 8c6eec0..f0d283f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa59c7c37f9f2b41c8c5a2b2a4b3eef6  Net_Traceroute-0.21.2.tgz
+d6e8d61d8466448b7553edfa602bd122  Net_Traceroute-0.21.3.tgz
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);