[php-pear-XML-Parser/f14/master] Update to 1.3.4 - QA release

[Remi Collet]

commit ed1d7dfcd432261121940ee332aef2d19f70eef0
Author: remi <fedora at famillecollet.com>
Date:   Mon Oct 25 20:01:56 2010 +0200

    Update to 1.3.4 - QA release

 .gitignore               |    2 ++
 php-pear-XML-Parser.spec |   39 ++++++++++++++++++++++++++++++---------
 sources                  |    2 +-
 xml2changelog            |   26 ++++++++++++++++----------
 4 files changed, 49 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 81e292c..2746bd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 XML_Parser-1.3.2.tgz
+package.xml
+/XML_Parser-1.3.4.tgz
diff --git a/php-pear-XML-Parser.spec b/php-pear-XML-Parser.spec
index 2135008..b8e3875 100644
--- a/php-pear-XML-Parser.spec
+++ b/php-pear-XML-Parser.spec
@@ -2,8 +2,8 @@
 %global pear_name XML_Parser
 
 Name:         php-pear-XML-Parser
-Version:      1.3.2
-Release:      4%{?dist}
+Version:      1.3.4
+Release:      1%{?dist}
 Summary:      XML parsing class based on PHP's bundled expat
 Summary(fr):  Une classe d'analyse XML utilisant l'extension expat de PHP
 License:      BSD
@@ -14,9 +14,12 @@ Source0:      http://pear.php.net/get/%{pear_name}-%{version}.tgz
 Source2:      xml2changelog
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:        noarch
 BuildRequires:    php-pear >= 1:1.4.9-1.2
+# For tests
+BuildRequires:    php-mbstring
+BuildRequires:    php-pear(XML_RSS)
+
 Requires(post):   %{__pear}
 Requires(postun): %{__pear}
 Requires:         php-pear(PEAR) >= 1.4.9
@@ -44,17 +47,23 @@ de fin), et dans le mode "event" il utilise en ensemble de fonctions
 "callbacks" génériques.
 
 Depuis la version 1.2.0, la nouvelle classe XML_Parser_Simple simplifie
-l'analse de la plupart des documents XML, en fournissant automatiquement
-une pile pour les élements. De plus il est désormais possible de séparer
+l'analyse de la plupart des documents XML, en fournissant automatiquement
+une pile pour les éléments. De plus il est désormais possible de séparer
 l'analyseur du gestionnaire d'objets, il n'est donc plus nécessaire d'étendre
 XML_Parser pour analyser un document.
 
 
 %prep
 %setup -q -c
-# Package2.xml is v2
-%{_bindir}/php -n %{SOURCE2} package2.xml >CHANGELOG
-mv package2.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
@@ -65,7 +74,7 @@ mv package2.xml %{pear_name}-%{version}/%{name}.xml
 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}/.??*
@@ -87,6 +96,13 @@ done
 lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
 [ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
 
+cd %{pear_name}-%{version}
+PHPRC=../php.ini %{__pear} \
+   run-tests \
+   -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
+   tests | tee ../testslog
+grep "FAILED TESTS" ../testslog && exit 1
+
 
 %clean
 rm -rf %{buildroot}
@@ -112,6 +128,11 @@ fi
 
 
 %changelog
+* Mon Oct 25 2010 Remi Collet <Fedora at FamilleCollet.com> 1.3.4-1
+- Version 1.3.4 (stable) - API 1.3.0 (stable)
+- define timezone during build
+- run tests in %%check
+
 * Sat May 22 2010 Remi Collet <Fedora at FamilleCollet.com> 1.3.2-4
 - spec cleanup
 - rename XML_Parser.xml to php-pear-XML-Parser.xml
diff --git a/sources b/sources
index 8daaa3d..22eb79c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-78d38605bdf53f6406095e76a21adff4  XML_Parser-1.3.2.tgz
+ee6add40489eb7df6670e18c26457cf9  XML_Parser-1.3.4.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);