[php-pear-Log/el6] update to 1.12.7

[Remi Collet]

commit d8002c919d3e09671afb9e787430802a6abdbcfa
Author: remi <fedora at famillecollet.com>
Date:   Thu Sep 22 20:12:20 2011 +0200

    update to 1.12.7

 .gitignore        |    3 +++
 php-pear-Log.spec |   25 +++++++++++--------------
 sources           |    2 +-
 xml2changelog     |   21 ++++++++++++---------
 4 files changed, 27 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 542af6d..bcfe49f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
+*~
 package*xml
 /Log-1.12.5.tgz
+/Log-1.12.6.tgz
+/Log-1.12.7.tgz
diff --git a/php-pear-Log.spec b/php-pear-Log.spec
index 66e9487..0035397 100644
--- a/php-pear-Log.spec
+++ b/php-pear-Log.spec
@@ -4,7 +4,7 @@
 Summary:        Abstracted logging facility for PHP
 Summary(fr):    Abstraction des outils d'enregistrement de traces pour PHP
 Name:           php-pear-Log
-Version:        1.12.5
+Version:        1.12.7
 Release:        1%{?dist}
 License:        MIT
 Group:          Development/Libraries
@@ -48,10 +48,6 @@ php-pear-Log peut optionnellement utiliser les extensions
 %setup -c -q
 %{_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
@@ -62,22 +58,18 @@ mv ../package.xml %{name}.xml
 
 
 %install
-rm -rf %{buildroot} docdir
+rm -rf %{buildroot}
 
 pushd Log-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
 rm -rf %{buildroot}%{pear_phpdir}/.??*
 
 # Install XML package description
-%{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
+install -D -p -m 644 %{name}.xml %{buildroot}%{pear_xmldir}/%{name}.xml
 
 popd
-# Sort out documentation
-mv %{buildroot}%{pear_docdir}/%{pear_name}/docs docdir
-mv %{buildroot}%{pear_docdir}/%{pear_name}/examples docdir/examples
 
 
 %clean
@@ -89,7 +81,7 @@ 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} \
+%{__pear} \
    run-tests \
    -i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
    tests | tee ../tests.log
@@ -108,7 +100,8 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
 %{pear_phpdir}/Log
 %{pear_phpdir}/Log.php
 %{pear_testdir}/Log
@@ -117,6 +110,10 @@ fi
 
 
 %changelog
+* Thu Sep 22 2011 Remi Collet <Fedora at FamilleCollet.com> 1.12.7-1
+- Version 1.12.7 (stable) - API 1.0.0 (stable)
+- minor spec cleanups
+
 * Fri Dec 23 2010 Remi Collet <Fedora at FamilleCollet.com> 1.12.5-1
 - Version 1.12.5 (stable) - API 1.0.0 (stable)
 
diff --git a/sources b/sources
index 4be245a..71d9e56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1dd1346dfce2bb878bd9b27804b863ad  Log-1.12.5.tgz
+8594a3d89eac997f072fa088b1eddc42  Log-1.12.7.tgz
diff --git a/xml2changelog b/xml2changelog
index eb6bd31..4c789f4 100644
--- a/xml2changelog
+++ b/xml2changelog
@@ -7,11 +7,14 @@ $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)) {
 		$tab = array();
@@ -20,14 +23,14 @@ if ($xml['version'] >= "2"){ // Package.xml V 2.0
 			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->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",