[php-pear-Log/el5] update to 1.12.7
Remi Collet
remi at fedoraproject.org
Thu Sep 22 19:25:36 UTC 2011
commit c21c5e6033ff9dcc7994bc73ace43c5f14653022
Author: remi <fedora at famillecollet.com>
Date: Thu Sep 22 21:25:20 2011 +0200
update to 1.12.7
.gitignore | 6 ++++-
Log-tests.patch | 24 ++++++++++++++++++++++
php-pear-Log.spec | 56 ++++++++++++++++++++++++++++++++--------------------
sources | 2 +-
xml2changelog | 37 +++++++++++++++++++++-------------
5 files changed, 87 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 842706e..bcfe49f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
-Log-1.9.10.tgz
+*~
+package*xml
+/Log-1.12.5.tgz
+/Log-1.12.6.tgz
+/Log-1.12.7.tgz
diff --git a/Log-tests.patch b/Log-tests.patch
new file mode 100644
index 0000000..c2c785f
--- /dev/null
+++ b/Log-tests.patch
@@ -0,0 +1,24 @@
+diff -up Log-1.12.7/php-pear-Log.xml.orig Log-1.12.7/php-pear-Log.xml
+--- Log-1.12.7/php-pear-Log.xml.orig 2011-09-22 21:03:15.000000000 +0200
++++ Log-1.12.7/php-pear-Log.xml 2011-09-22 21:03:55.000000000 +0200
+@@ -77,7 +77,7 @@
+ <file baseinstalldir="/" md5sum="732c4f0f261939f646e80f7f06e7755b" name="tests/console.phpt" role="test" />
+ <file baseinstalldir="/" md5sum="fe97c9ccb2456685db75460f8370185c" name="tests/display.phpt" role="test" />
+ <file baseinstalldir="/" md5sum="4e43e67b4fa33c05f9fc3e4d4a6ca34b" name="tests/error_log.phpt" role="test" />
+- <file baseinstalldir="/" md5sum="0c259f8334afb574a64126e0459f92ea" name="tests/extract-zend2.0.phpt" role="test" />
++ <file baseinstalldir="/" md5sum="a4fe1060b9b9669466772094f9543ab3" name="tests/extract-zend2.0.phpt" role="test" />
+ <file baseinstalldir="/" md5sum="2648bccdb0b25f89d2d99256cbb7041b" name="tests/extract-zend2.2.phpt" role="test" />
+ <file baseinstalldir="/" md5sum="9163797d3fbeaa197cdfd4b883bc51fa" name="tests/factory.phpt" role="test" />
+ <file baseinstalldir="/" md5sum="13a01c3f3ad8a8e79672ca79997b42d6" name="tests/file.phpt" role="test" />
+diff -up Log-1.12.7/tests/extract-zend2.0.phpt.orig Log-1.12.7/tests/extract-zend2.0.phpt
+--- Log-1.12.7/tests/extract-zend2.0.phpt.orig 2011-09-22 21:03:08.000000000 +0200
++++ Log-1.12.7/tests/extract-zend2.0.phpt 2011-09-22 21:03:26.000000000 +0200
+@@ -60,7 +60,7 @@ ident [info] array (
+ 0 => 1,
+ 1 => 2,
+ 'three' => 3,
+-
++)
+ ident [info] Message Key
+ ident [info] 50
+ ident [info] array (
diff --git a/php-pear-Log.spec b/php-pear-Log.spec
index db66b19..11e5847 100644
--- a/php-pear-Log.spec
+++ b/php-pear-Log.spec
@@ -1,16 +1,19 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Log
+%global pear_name Log
Summary: Abstracted logging facility for PHP
Summary(fr): Abstraction des outils d'enregistrement de traces pour PHP
Name: php-pear-Log
-Version: 1.11.6
+Version: 1.12.7
Release: 1%{?dist}
License: MIT
Group: Development/Libraries
Source: http://pear.php.net/get/Log-%{version}.tgz
Source2: xml2changelog
+# http://pear.php.net/bugs/18864
+Patch0: Log-tests.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://pear.php.net/package/Log
@@ -35,19 +38,24 @@ and "php-pear-MDB2" (version >= 2.0.0RC1).
%description -l fr
-L'extension "log" fournit un sytème d'abstraction des enregistrements
+L'extension "log" fournit un système d'abstraction des enregistrements
de traces. Il gère l'affichage sur la console, l'enregistrement dans un
fichier, dans le "syslog", dans une base SQL ou Sqlite, l'envoi de mails
-ou la création d'évenements à un calendrier "mcal".
+ou la création d'évènements dans un calendrier "mcal".
-php-pear-Log peut optionellement utiliser les extensions
+php-pear-Log peut optionnellement utiliser les extensions
"php-pear-DB" (version >= 1.3) et "php-pear-MDB2" (version >= 2.0.0RC1).
%prep
%setup -c -q
-%{_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
+
+cd %{pear_name}-%{version}
+# package.xml is V2
+mv ../package.xml %{name}.xml
+
+%patch0 -p1 -b .orig
%build
@@ -55,7 +63,7 @@ mv package.xml %{pear_name}-%{version}/%{name}.xml
%install
-rm -rf %{buildroot} docdir
+rm -rf %{buildroot}
pushd Log-%{version}
%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
@@ -64,13 +72,9 @@ pushd Log-%{version}
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
@@ -78,15 +82,18 @@ rm -rf %{buildroot}
%check
-lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
-[ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
+# under EL-5 run-test -i option doesn't work
+# so build a temporay ini to set include_path
+(
+cat /etc/php.ini
+echo include_path=.:%{buildroot}%{pear_phpdir}:%{pear_phpdir}
+) >php.ini
-# For documentation purpose only
-# After install, as root :
-# pear run-tests -p Log
-# Should return (1.11.6)
-# 19 PASSED TESTS
-# 2 SKIPPED TESTS
+cd %{pear_name}-%{version}
+PHPRC=../php.ini %{__pear} \
+ run-tests \
+ tests | tee ../tests.log
+grep "FAILED TESTS" ../tests.log && exit 1
%post
@@ -101,7 +108,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
@@ -110,6 +118,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
+
* Sat Dec 26 2009 Remi Collet <Fedora at FamilleCollet.com> 1.11.6-1
- update to 1.11.6
diff --git a/sources b/sources
index d9dcf15..71d9e56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a390fd9940e3c1785fd19341b543f135 Log-1.11.6.tgz
+8594a3d89eac997f072fa088b1eddc42 Log-1.12.7.tgz
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);
More information about the scm-commits
mailing list