[php-pear-Net-URL-Mapper] fix include_path in test (FTBFS #716015)
Remi Collet
remi at fedoraproject.org
Wed Jul 6 17:37:48 UTC 2011
commit 812a58d5757563fcb00fd6db01561717dbd0d118
Author: remi <fedora at famillecollet.com>
Date: Wed Jul 6 19:37:33 2011 +0200
fix include_path in test (FTBFS #716015)
php-pear-Net-URL-Mapper.spec | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/php-pear-Net-URL-Mapper.spec b/php-pear-Net-URL-Mapper.spec
index 301e86b..02af90a 100644
--- a/php-pear-Net-URL-Mapper.spec
+++ b/php-pear-Net-URL-Mapper.spec
@@ -3,7 +3,7 @@
Name: php-pear-Net-URL-Mapper
Version: 0.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Simple and flexible way to build nice URLs for web applications
Group: Development/Languages
@@ -40,10 +40,6 @@ frameworks and therefore can be used with your own router.
%setup -qc
%{_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
@@ -57,7 +53,7 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
-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}/.??*
@@ -87,7 +83,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
@@ -104,6 +100,9 @@ phpunit \
%changelog
+* Wed Jul 6 2011 Remi Collet <Fedora at FamilleCollet.com> - 0.9.1-3
+- fix include_path in test (FTBFS #716015)
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list