packages: php-ffmpeg/php-ffmpeg.spec, php-ffmpeg/testsuite.patch (REMOVED) ...

[glen]

Author: glen                         Date: Mon Jun  7 20:29:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update tests to run with php53

---- Files affected:
packages/php-ffmpeg:
   php-ffmpeg.spec (1.16 -> 1.17) , testsuite.patch (1.2 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/php-ffmpeg/php-ffmpeg.spec
diff -u packages/php-ffmpeg/php-ffmpeg.spec:1.16 packages/php-ffmpeg/php-ffmpeg.spec:1.17
--- packages/php-ffmpeg/php-ffmpeg.spec:1.16	Wed Jun  2 20:03:24 2010
+++ packages/php-ffmpeg/php-ffmpeg.spec	Mon Jun  7 22:29:10 2010
@@ -8,19 +8,18 @@
 Summary(pl.UTF-8):	Rozszerzenie do obróbki filmów w PHP
 Name:		php-%{modname}
 Version:	0.6.0
-Release:	6
+Release:	7
 License:	GPL
 Group:		Development/Languages/PHP
-Source0:	http://dl.sourceforge.net/ffmpeg-php/ffmpeg-php-%{version}.tbz2
+Source0:	http://downloads.sourceforge.net/ffmpeg-php/ffmpeg-php-%{version}.tbz2
 # Source0-md5:	f779c0dbffda9dac54729d60c0e04c05
 Patch0:		gdImageBoundsSafe.patch
-Patch1:		testsuite.patch
 Patch2:		tests-genre.patch
 Patch3:		tests-dtspts.patch
 URL:		http://ffmpeg-php.sourceforge.net/
 %{?with_tests:BuildRequires:	/usr/bin/php}
 BuildRequires:	ffmpeg-devel >= 0.4.9
-BuildRequires:	php-devel >= 3:5.0.0
+BuildRequires:	php-devel >= 4:5.3.2-5
 BuildRequires:	php-gd
 BuildRequires:	rpmbuild(macros) >= 1.344
 Requires:	php-common >= 4:5.0.4
@@ -56,18 +55,33 @@
 %patch3 -p1
 %endif
 
-# test run itself fails (no output log)
-# TEST_PHP_EXECUTABLE=/usr/bin/php php run-tests.php tests/getPTS.phpt --show-out
+# ./run-tests.sh --show-out tests/getPTS.phpt
 mv tests/getPTS.phpt{,.broken}
+mv tests/getFrame.phpt{,.broken}
+mv tests/getFramesBackwards.phpt{,.broken}
+mv tests/getFramesForwardPassedEnd.phpt{,.broken}
+mv tests/getFramesNoArg.phpt{,.broken}
+mv tests/getNextKeyFrame.phpt{,.broken}
+mv tests/isKeyFrame.phpt{,broken}
+mv tests/persistentMovie.phpt{,.broken}
+mv tests/getFramesForward.phpt{,.broken}
 
 %build
 phpize
 %configure
-%{__patch} -p1 < %{PATCH1}
 %{__make}
 
-%{?with_tests:%{__make} PHP_EXECUTABLE=/usr/bin/php test}
-%{?with_tests:test -f tests.log -a ! -s tests.log}
+%if %{with tests}
+cat <<'EOF' > run-tests.sh
+#!/bin/sh
+%{__make} test \
+	PHP_TEST_SHARED_SYSTEM_EXTENSIONS+="gd" \
+	RUN_TESTS_SETTINGS="-q $*"
+EOF
+chmod +x run-tests.sh
+./run-tests.sh -w failed.log
+test -f failed.log -a ! -s failed.log
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -105,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2010/06/07 20:29:10  glen
+- update tests to run with php53
+
 Revision 1.16  2010/06/02 18:03:24  glen
 - release 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-ffmpeg/php-ffmpeg.spec?r1=1.16&r2=1.17&f=u