diff --git a/.gitignore b/.gitignore index 2310369..f6e2653 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /Archive_Tar-1.3.9.tgz /Archive_Tar-1.3.10.tgz /Archive_Tar-1.3.11.tgz +/XML_Util-1.2.3.tgz diff --git a/php-pear.spec b/php-pear.spec index 2190195..39385e5 100644 --- a/php-pear.spec +++ b/php-pear.spec @@ -6,7 +6,7 @@ # https://pear.php.net/bugs/bug.php?id=19367 # Structures_Graph 1.0.4 - incorrect FSF address %global structver 1.0.4 -%global xmlutil 1.2.1 +%global xmlutil 1.2.3 # Tests are only run with rpmbuild --with tests # Can't be run in mock / koji because PEAR is the first package @@ -17,7 +17,7 @@ Summary: PHP Extension and Application Repository framework Name: php-pear Version: 1.9.4 -Release: 28%{?dist} +Release: 29%{?dist} Epoch: 1 # PEAR, Archive_Tar, XML_Util are BSD # Console_Getopt is PHP @@ -56,7 +56,7 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-cli >= 5.1.0-1, php-xml, gnupg %if %{with_tests} -BuildRequires: php-pear(pear.phpunit.de/PHPUnit) +BuildRequires: %{_bindir}/phpunit %endif Provides: php-pear(Console_Getopt) = %{getoptver} @@ -202,17 +202,23 @@ grep -rl $RPM_BUILD_ROOT $RPM_BUILD_ROOT && exit 1 %if %{with_tests} -cd $RPM_BUILD_ROOT%{pear_phpdir}/test/Structures_Graph/tests -phpunit \ - -d date.timezone=UTC \ - -d include_path=.:$RPM_BUILD_ROOT%{pear_phpdir}:%{pear_phpdir}: \ - AllTests || exit 1 +LOG=$PWD/rpmlog +ret=0 -cd $RPM_BUILD_ROOT%{pear_phpdir}/test/XML_Util/tests +cd $RPM_BUILD_ROOT%{_datadir}/tests/pear/Structures_Graph/tests phpunit \ -d date.timezone=UTC \ - -d include_path=.:$RPM_BUILD_ROOT%{pear_phpdir}:%{pear_phpdir}: \ - AllTests || exit 1 + --include-path=$RPM_BUILD_ROOT%{pear_phpdir} \ + AllTests || ret=1 + +cd $RPM_BUILD_ROOT%{_datadir}/tests/pear/XML_Util/tests +php -d include_path=.:$RPM_BUILD_ROOT%{pear_phpdir} \ + $RPM_BUILD_ROOT/usr/share/pear/pearcmd.php \ + run-tests \ + | tee $LOG +grep "FAILED TESTS" $LOG && ret=1 + +exit $ret %else echo 'Test suite disabled (missing "--with tests" option)' %endif @@ -309,6 +315,10 @@ fi %changelog +* Sat Jun 7 2014 Remi Collet 1:1.9.4-29 +- update XML_Util to 1.2.3 +- fix test suite (not used) + * Sat Jun 07 2014 Fedora Release Engineering - 1:1.9.4-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 88e14eb..c216f09 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ ae0c95a03db7dbc723f7d50523029ce5 Archive_Tar-1.3.11.tgz 310b39cf091b9a0abf398bead60f3f8d Console_Getopt-1.3.1.tgz c52b09758e851235e6a93a2c1e1a8ee9 PEAR-1.9.4.tgz b99c5e9ac348a2e81515ba16deb7ded3 Structures_Graph-1.0.4.tgz -b8d4efcdb11b308b179f7bb63043284f XML_Util-1.2.1.tgz +7280fe3c5a7db11a7a9c293dcf81a285 XML_Util-1.2.3.tgz