[php-pear-Numbers-Roman] fix include_path in test (FTBFS #715867)

Remi Collet remi at fedoraproject.org
Wed Jul 6 17:26:14 UTC 2011


commit eb459fb9cc71ec1ddc5b3d24c09526ab6d48088f
Author: remi <fedora at famillecollet.com>
Date:   Wed Jul 6 19:25:49 2011 +0200

    fix include_path in test (FTBFS #715867)

 php-pear-Numbers-Roman.spec |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/php-pear-Numbers-Roman.spec b/php-pear-Numbers-Roman.spec
index 5251b21..8374ab1 100644
--- a/php-pear-Numbers-Roman.spec
+++ b/php-pear-Numbers-Roman.spec
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Numbers-Roman
 Version:        1.0.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Provides methods for converting to and from Roman Numerals
 
 Group:          Development/Languages
@@ -30,10 +30,6 @@ styles and conversion for and to numbers up to 5 999 999.
 
 %prep
 %setup -qc
-# 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
@@ -47,7 +43,7 @@ cd %{pear_name}-%{version}
 %install
 rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -75,7 +71,7 @@ fi
 cd %{pear_name}-%{version}
 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} \
    tests
 
 
@@ -88,6 +84,9 @@ phpunit \
 
 
 %changelog
+* Wed Jul  6 2011 Remi Collet <Fedora at FamilleCollet.com> - 1.0.2-8
+- fix include_path in test (FTBFS #715867)
+
 * Thu Apr 21 2011 Remi Collet <Fedora at FamilleCollet.com> 1.0.2-7
 - doc in /usr/share/doc/pear
 


More information about the scm-commits mailing list