[php-pear-Var-Dump] - rebuilt for new pear_datadir - disable E_STRICT to fix lot of tests with php 5.4
Remi Collet
remi at fedoraproject.org
Sun Aug 19 09:44:11 UTC 2012
commit 493d5fffd2b79aeb829e6d4f44c539a2dee8dd61
Author: remi <fedora at famillecollet.com>
Date: Sun Aug 19 11:43:57 2012 +0200
- rebuilt for new pear_datadir
- disable E_STRICT to fix lot of tests with php 5.4
php-pear-Var-Dump.spec | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/php-pear-Var-Dump.spec b/php-pear-Var-Dump.spec
index f93bcd6..2de34f7 100644
--- a/php-pear-Var-Dump.spec
+++ b/php-pear-Var-Dump.spec
@@ -3,7 +3,7 @@
Name: php-pear-Var-Dump
Version: 1.0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Provides methods for dumping structured information about a variable
Group: Development/Libraries
@@ -39,10 +39,6 @@ displaying the result in various graphical ways :
%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}
# package.xml is V2
mv ../package.xml %{name}.xml
@@ -56,7 +52,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}/.??*
@@ -84,7 +80,13 @@ fi
%check
cd %{pear_name}-%{version}
-PHPRC=../php.ini %{__pear} \
+for test in tests/*phpt
+do
+ sed -e '/error_reporting/s/E_ALL/E_ALL \& ~E_STRICT/' \
+ -i $test
+done
+
+%{__pear} \
run-tests \
-i "-d include_path=%{buildroot}%{pear_phpdir}:%{pear_phpdir}" \
tests | tee ../tests.log
@@ -103,6 +105,10 @@ PHPRC=../php.ini %{__pear} \
%changelog
+* Sun Aug 19 2012 Remi Collet <remi at fedoraproject.org> - 1.0.4-7
+- rebuilt for new pear_datadir
+- disable E_STRICT to fix lot of tests with php 5.4
+
* Tue Aug 14 2012 Remi Collet <remi at fedoraproject.org> - 1.0.4-6
- rebuilt for new pear_testdir
More information about the scm-commits
mailing list