--- rpms/php-pear-Log/sme8/php-pear-Log.spec	2011/09/20 13:58:50	1.3
+++ rpms/php-pear-Log/sme8/php-pear-Log.spec	2011/09/26 00:10:27	1.6
@@ -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}/%
 
 
 %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;
-
-# For documentation purpose only
-# After install, as root :
-# pear run-tests -p Log
-# Should return (1.11.6)
-# 19 PASSED TESTS
-# 2 SKIPPED TESTS
+# 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
+
+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@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@FamilleCollet.com> 1.11.6-1
 - update to 1.11.6