[php-pear-XML-Serializer] fix include_path in test (FTBFS #716012) + doc in /usr/share/doc/pear

[Remi Collet]

commit adde5b447e97a334ce02b519b591ee29a8a69bf9
Author: remi <fedora at famillecollet.com>
Date:   Wed Jul 6 19:57:03 2011 +0200

    fix include_path in test (FTBFS #716012) + doc in /usr/share/doc/pear

 php-pear-XML-Serializer.spec |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)
---
diff --git a/php-pear-XML-Serializer.spec b/php-pear-XML-Serializer.spec
index 3467ce8..90cf706 100644
--- a/php-pear-XML-Serializer.spec
+++ b/php-pear-XML-Serializer.spec
@@ -3,7 +3,7 @@
 
 Name:           php-pear-XML-Serializer
 Version:        0.20.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Swiss-army knife for reading and writing XML files
 
 Group:          Development/Libraries
@@ -39,10 +39,6 @@ without the need for DOM.
 %setup -q -c
 %{_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
@@ -54,15 +50,9 @@ cd %{pear_name}-%{version}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT docdir
+rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
-
-# Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
-mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/doc/* ../docdir
-
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -80,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}/tests
 phpunit \
    -d date.timezone=UTC \
-   -d include_path=%{pear_phpdir}:$RPM_BUILD_ROOT%{pear_phpdir} \
+   -d include_path=.:$RPM_BUILD_ROOT%{pear_phpdir}:%{pear_phpdir}: \
    AllTests
 
 
@@ -98,13 +88,19 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGELOG docdir/*
+%doc CHANGELOG
+%doc %{pear_docdir}/%{pear_name}
 %{pear_xmldir}/%{name}.xml
 %{pear_phpdir}/XML/*
 %{pear_testdir}/%{pear_name}
+%{pear_datadir}/%{pear_name}
 
 
 %changelog
+* Wed Jul  6 2011 Remi Collet <Fedora at FamilleCollet.com> - 0.20.2-3
+- fix include_path in test (FTBFS #716012)
+- doc in /usr/share/doc/pear
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild