[php-pear-Console-Table/el6/master] update to 1.1.4 - QA release

[Remi Collet]

commit b96e9d56b1043e2371e5662464928c2ea8985d77
Author: remi <fedora at famillecollet.com>
Date:   Wed Oct 27 18:20:31 2010 +0200

    update to 1.1.4 - QA release

 .gitignore                  |    2 +
 php-pear-Console-Table.spec |   44 ++++++++++++++++++++++++++++++++----------
 sources                     |    2 +-
 xml2changelog               |   26 +++++++++++++++---------
 4 files changed, 52 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d1d2474..97a29a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 Console_Table-1.1.3.tgz
+package.xml
+/Console_Table-1.1.4.tgz
diff --git a/php-pear-Console-Table.spec b/php-pear-Console-Table.spec
index 321b8c6..26fcf22 100644
--- a/php-pear-Console-Table.spec
+++ b/php-pear-Console-Table.spec
@@ -2,8 +2,8 @@
 %global pear_name Console_Table
 
 Name:           php-pear-Console-Table
-Version:        1.1.3
-Release:        4%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Class that makes it easy to build console style tables
 Summary(fr):    Classe pour fabriquer facilement des tableaux en mode console
 
@@ -12,10 +12,13 @@ License:        BSD
 URL:            http://pear.php.net/package/Console_Table
 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
+# For tests
+BuildRequires:  php-pear(Console_Color)
+
 Requires:       php-pear(PEAR)
 Requires:       php-pear(Console_Color)
 Requires(post): %{__pear}
@@ -34,10 +37,15 @@ avec des règles de construction et d'alignement définies par l'utilisateur.
 
 %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
@@ -46,9 +54,9 @@ cd %{pear_name}-%{version}
 
 
 %install
-cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+cd %{pear_name}-%{version}
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -75,9 +83,18 @@ fi
 
 
 %check
-# after install, run as root
-# pear run-tests -p Console_Table
-# => 8 PASSED TESTS
+cd %{pear_name}-%{version}
+PHPRC=../php.ini %{__pear} \
+   run-tests \
+   -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
+   tests | tee ../tests.log
+# pear doesn't set return code
+if grep -q "FAILED TESTS" ../tests.log; then
+  for fic in tests/*.diff; do
+    cat $fic; echo -e "\n"
+  done
+  exit 1
+fi
 
 
 %files
@@ -89,6 +106,11 @@ fi
 
 
 %changelog
+* Wed Oct 27 2010 Remi Collet <Fedora at FamilleCollet.com> 1.1.4-1
+- Version 1.1.4 (stable) - API 1.1.1 (stable) - QA release
+- set timezone during build
+- run tests in %%check
+
 * Fri May 21 2010 Remi Collet <Fedora at FamilleCollet.com> 1.1.3-4
 - spec cleanup
 - rename Console_Table.xml to php-pear-Console-Table.xml
diff --git a/sources b/sources
index 9c342c9..cabdd3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34b5f34db1ab0c4daedf2862958af257  Console_Table-1.1.3.tgz
+78f16c2029a1eafa4d0d060f38dbfc88  Console_Table-1.1.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);