[php-pear-Net-Socket/el5/master] update to 1.0.10 - QA release

[Remi Collet]

commit e2d846698c2aaf18c0598bf24157bcc19ffbcd7a
Author: remi <fedora at famillecollet.com>
Date:   Sat Oct 16 11:21:21 2010 +0200

    update to 1.0.10 - QA release

 .gitignore               |    4 +++-
 php-pear-Net-Socket.spec |   34 ++++++++++++++++++++++------------
 sources                  |    2 +-
 xml2changelog            |   24 ++++++++++++++++++------
 4 files changed, 44 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6846da7..c2800ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-Net_Socket-1.0.6.tgz
+Net_Socket-1.0.9.tgz
+package.xml
+/Net_Socket-1.0.10.tgz
diff --git a/php-pear-Net-Socket.spec b/php-pear-Net-Socket.spec
index f0481c1..0a7684c 100644
--- a/php-pear-Net-Socket.spec
+++ b/php-pear-Net-Socket.spec
@@ -1,17 +1,16 @@
 %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Net_Socket
+%global pear_name Net_Socket
 
 Name:           php-pear-Net-Socket
-Version:        1.0.8
+Version:        1.0.10
 Release:        1%{?dist}
 Summary:        Network Socket Interface
 Summary(fr):    Gestion des "sockets" réseaux
 
 Group:          Development/Libraries
-License:        PHP License
+License:        PHP
 URL:            http://pear.php.net/package/Net_Socket
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1:        PHP-LICENSE-3.01
 Source2:        xml2changelog
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,10 +37,15 @@ Provides:       php-pear(%{pear_name}) = %{version}
 
 %prep
 %setup -q -c
-%{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-%{__install} -m 644 -c %{SOURCE1} LICENSE
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
 
-mv package.xml %{pear_name}-%{version}/%{pear_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
@@ -53,13 +57,13 @@ cd %{pear_name}-%{version}
 rm -rf %{buildroot}
 
 cd Net_Socket-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 %{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir}
+%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
 
 %check
@@ -74,7 +78,7 @@ rm -rf %{buildroot}
 
 %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
@@ -85,12 +89,18 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE CHANGELOG
+%doc CHANGELOG
 %{pear_phpdir}/Net
-%{pear_xmldir}/Net_Socket.xml
+%{pear_xmldir}/%{name}.xml
 
 
 %changelog
+* Sat Oct 16 2010 Remi Collet <Fedora at FamilleCollet.com> 1.0.10-1
+- Version 1.0.10 (stable) - API 1.0.9 (stable) - QA release
+- set timezone during build
+- spec cleanup
+- rename Net_Socket.xml to php-pear-Net-Socket.xml
+
 * Tue May 08 2007 Remi Collet <Fedora at FamilleCollet.com> 1.0.8-1
 - update to 1.0.8
 
diff --git a/sources b/sources
index 77da802..dbb7cee 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52577fec2c16e891a89f208c580e0b8d  Net_Socket-1.0.8.tgz
+9e5512c211742874628e392db0548222  Net_Socket-1.0.10.tgz
diff --git a/xml2changelog b/xml2changelog
index d055fa5..eb6bd31 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -7,16 +7,28 @@ $file=array_shift($_SERVER['argv']);
 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;
 
-	foreach($xml->changelog->release 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);
+	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);