[php-pear-Math-Stats] fix include_path in test (FTBFS #715788)

Remi Collet remi at fedoraproject.org
Wed Jul 6 17:16:32 UTC 2011


commit cad00cb033b1bee64e542291562c59e21b202083
Author: remi <fedora at famillecollet.com>
Date:   Wed Jul 6 19:16:08 2011 +0200

    fix include_path in test (FTBFS #715788)

 php-pear-Math-Stats.spec |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/php-pear-Math-Stats.spec b/php-pear-Math-Stats.spec
index d4728d6..1e237be 100644
--- a/php-pear-Math-Stats.spec
+++ b/php-pear-Math-Stats.spec
@@ -4,7 +4,7 @@
 
 Name:           php-pear-Math-Stats
 Version:        0.9.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Classes to calculate statistical parameters
 
 Group:          Development/Libraries
@@ -33,9 +33,6 @@ array item, e.g. $data = array(3=>4, 2.3=>5, 1.25=>6, 0.5=>3).
 
 %prep
 %setup -q -c
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
 
 cd %{pear_name}-%{version}%{?beta}
 # package.xml is V2
@@ -49,7 +46,7 @@ cd %{pear_name}-%{version}%{?beta}
 %install
 rm -rf $RPM_BUILD_ROOT
 cd %{pear_name}-%{version}%{?beta}
-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}/.??*
@@ -63,7 +60,7 @@ install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
 cd %{pear_name}-%{version}
 %{_bindir}/phpunit \
    -d date.timezone=UTC \
-   -d include_path=$RPM_BUILD_ROOT%{pear_phpdir}:%{pear_phpdir} \
+   -d include_path=.:$RPM_BUILD_ROOT%{pear_phpdir}:%{pear_phpdir} \
    tests
 
 
@@ -91,6 +88,9 @@ fi
 
 
 %changelog
+* Wed Jul  6 2011 Remi Collet <Fedora at FamilleCollet.com> - 0.9.1-4
+- fix include_path in test (FTBFS #715788)
+
 * Sun Apr 17 2011 Remi Collet <Fedora at FamilleCollet.com> - 0.9.1-3
 - doc in /usr/share/doc/pear
 


More information about the scm-commits mailing list