[php-pear-PHP-CompatInfo] doc in /usr/share/doc/pear

[Remi Collet]

commit 28240c1571a20bd6219592b4b35d707a06fffd72
Author: remi <fedora at famillecollet.com>
Date:   Thu Apr 21 20:02:20 2011 +0200

    doc in /usr/share/doc/pear

 php-pear-PHP-CompatInfo.spec |   36 +++++++++++++++++++++++-------------
 xml2changelog                |   37 +++++++++++++++++++++++--------------
 2 files changed, 46 insertions(+), 27 deletions(-)
---
diff --git a/php-pear-PHP-CompatInfo.spec b/php-pear-PHP-CompatInfo.spec
index af15636..d14bb5d 100644
--- a/php-pear-PHP-CompatInfo.spec
+++ b/php-pear-PHP-CompatInfo.spec
@@ -5,7 +5,7 @@
 
 Name:           php-pear-PHP-CompatInfo
 Version:        1.9.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Find out version and extensions required for a piece of code to run
 Summary(fr):    Trouver version et extensions nécessaires à l'exécution d'un code
 
@@ -19,9 +19,9 @@ Source2:        xml2changelog
 Patch0:         PHP_CompatInfo-path.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.5.4
+
 Requires:       php-pear(PEAR) >= 1.5.4
 Requires:       php-pear(Console_Table) >= 1.1.1 
 Requires:       php-pear(Console_Getargs) >= 1.3.3 
@@ -56,9 +56,16 @@ une version. Un script permet la production de rapport en ligne de commande.
 %prep
 %setup -q -c
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
-mv package.xml %{pear_name}-%{version}%{?beta}/%{name}.xml
 
-%patch0 -p0 -b .scriptspath
+# Create a "localized" php.ini to avoid build warning
+cp /etc/php.ini .
+echo "date.timezone=UTC" >>php.ini
+
+cd %{pear_name}-%{version}%{?beta}
+# package.xml is V2
+mv ../package.xml %{name}.xml
+
+%patch0 -p1 -b .scriptspath
 
 
 %build
@@ -67,9 +74,9 @@ cd %{pear_name}-%{version}%{?beta}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT docdir
-pushd %{pear_name}-%{version}%{?beta}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+rm -rf $RPM_BUILD_ROOT
+cd %{pear_name}-%{version}%{?beta}
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -82,12 +89,10 @@ install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 mv $RPM_BUILD_ROOT%{_bindir}/scripts $RPM_BUILD_ROOT%{pear_phpdir}/PHP/CompatInfo/scripts
 chmod -x $RPM_BUILD_ROOT%{pear_phpdir}/PHP/CompatInfo/scripts/*
 
-
-popd 
-# Move documentation
-mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} docdir
 # change CRLF
-sed -i -e 's/\r//' docdir/docs/examples/*.php docdir/docs/examples/*.css
+sed -i -e 's/\r//' \
+    $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs/examples/*.php \
+    $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs/examples/*.css
 
 
 %clean
@@ -117,7 +122,8 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/docs/*
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
 %{pear_phpdir}/PHP
 %{pear_xmldir}/%{name}.xml
 %{_bindir}/pci
@@ -127,6 +133,10 @@ fi
 
 
 %changelog
+* Thu Apr 21 2011 Remi Collet <Fedora at FamilleCollet.com> 1.9.0-5
+- doc in /usr/share/doc/pear
+- define timezone during build
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/xml2changelog b/xml2changelog
index c114873..4c789f4 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -7,22 +7,31 @@ $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",
-		$xml->version->release, $xml->stability->release, 
-		$xml->version->api, $xml->stability->api, 
-		$xml->date, $xml->notes);
-	$new=$xml->version->release;
+	$new = "";
+	if (strlen(trim($xml->notes))>1) { // Ignore too short descr.
+		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;
+	}
 
-	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);