Author: glen Date: Mon Mar 22 09:40:42 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fixup and discard php4
---- Files affected:
packages/php-simpletest:
php-simpletest.spec (1.1 -> 1.2) , no-php4.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/php-simpletest/php-simpletest.spec
diff -u packages/php-simpletest/php-simpletest.spec:1.1
packages/php-simpletest/php-simpletest.spec:1.2
--- packages/php-simpletest/php-simpletest.spec:1.1 Wed Mar 10 21:44:27 2010
+++ packages/php-simpletest/php-simpletest.spec Mon Mar 22 10:40:36 2010
@@ -1,25 +1,32 @@
# $Revision$, $Date$
-%define php_min_version 4.0.0
+%include /usr/lib/rpm/macros.php
+%define php_min_version 5.2.0
%define pkgname simpletest
Summary: Unit testing for PHP
Name: php-%{pkgname}
Version: 1.0.1
-Release: 0.1
+Release: 0.6
License: LGPL v2.1
Group: Development/Languages/PHP
Source0:
http://downloads.sourceforge.net/project/%{pkgname}/%{pkgname}/%{pkgname}_%{version}/%{pkgname}_%{version}.tar.gz
# Source0-md5: ab70ef7617b37a933499a630890461da
+Patch0: no-php4.patch
URL: http://www.simpletest.org/
BuildRequires: rpmbuild(macros) >= 1.461
-Requires: php-common >= 3:%{php_min_version}
+BuildRequires: rpm-php-pearprov >= 4.4.2-11
+Requires: php-common >= 4:%{php_min_version}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _appdir %{php_data_dir}/%{pkgname}
+#%define _appdir %{php_data_dir}/%{pkgname}
+%define _appdir %{php_pear_dir}/%{pkgname}
# _phpdocdir / php_docdir / phpdoc_dir ?
%define _phpdocdir %{_docdir}/phpdoc
+# internal deps
+%define _noautopear pear(\.\./.*\.php) pear(invoker.php)
pear(mock_objects.php) pear(socket.php) pear(test_case.php)
pear(unit_tester.php) pear(simpletest/.*)
+
# put it together for rpmbuild
%define _noautoreq %{?_noautophp} %{?_noautopear}
@@ -47,6 +54,14 @@
%prep
%setup -qc
+
+# no php4
+mv simpletest/reflection{_php5,}.php
+rm simpletest/reflection_php4.php
+mv simpletest/test/reflection{_php5,}_test.php
+rm simpletest/test/reflection_php4_test.php
+%patch0 -p0
+
mv %{pkgname}/docs .
mv simpletest/[HLRV]* .
@@ -78,5 +93,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2010/03/22 09:40:36 glen
+- fixup and discard php4
+
Revision 1.1 2010/03/10 20:44:27 glen
- new
================================================================
Index: packages/php-simpletest/no-php4.patch
diff -u /dev/null packages/php-simpletest/no-php4.patch:1.1
--- /dev/null Mon Mar 22 10:40:42 2010
+++ packages/php-simpletest/no-php4.patch Mon Mar 22 10:40:36 2010
@@ -0,0 +1,78 @@
+--- simpletest/mock_objects.php~ 2010-03-10 22:50:50.669131000 +0200
++++ simpletest/mock_objects.php 2010-03-10 22:50:57.196186467 +0200
+@@ -12,11 +12,7 @@
+ require_once(dirname(__FILE__) . '/expectation.php');
+ require_once(dirname(__FILE__) . '/simpletest.php');
+ require_once(dirname(__FILE__) . '/dumper.php');
+-if (version_compare(phpversion(), '5') >= 0) {
+- require_once(dirname(__FILE__) . '/reflection_php5.php');
+-} else {
+- require_once(dirname(__FILE__) . '/reflection_php4.php');
+-}
++require_once(dirname(__FILE__) . '/reflection.php');
+ /*...@-*/
+
+ /**
+--- simpletest/simpletest.php~ 2010-03-10 22:51:34.046216000 +0200
++++ simpletest/simpletest.php 2010-03-10 22:51:39.102460852 +0200
+@@ -9,11 +9,7 @@
+ /*...@+
+ * include SimpleTest files
+ */
+-if (version_compare(phpversion(), '5') >= 0) {
+- require_once(dirname(__FILE__) . '/reflection_php5.php');
+-} else {
+- require_once(dirname(__FILE__) . '/reflection_php4.php');
+-}
++require_once(dirname(__FILE__) . '/reflection.php');
+ require_once(dirname(__FILE__) . '/default_reporter.php');
+ require_once(dirname(__FILE__) . '/compatibility.php');
+ /*...@-*/
+--- simpletest/test_case.php~ 2008-04-08 04:20:33.000000000 +0300
++++ simpletest/test_case.php 2010-03-10 22:52:02.519113944 +0200
+@@ -17,12 +17,8 @@
+ require_once(dirname(__FILE__) . '/expectation.php');
+ require_once(dirname(__FILE__) . '/dumper.php');
+ require_once(dirname(__FILE__) . '/simpletest.php');
+-if (version_compare(phpversion(), '5') >= 0) {
+- require_once(dirname(__FILE__) . '/exceptions.php');
+- require_once(dirname(__FILE__) . '/reflection_php5.php');
+-} else {
+- require_once(dirname(__FILE__) . '/reflection_php4.php');
+-}
++require_once(dirname(__FILE__) . '/exceptions.php');
++require_once(dirname(__FILE__) . '/reflection.php');
+ if (! defined('SIMPLE_TEST')) {
+ /**
+ * @ignore
+--- simpletest/test/unit_tests.php~ 2010-03-10 22:56:04.443267000 +0200
++++ simpletest/test/unit_tests.php 2010-03-10 22:56:12.232641760 +0200
+@@ -22,15 +22,9 @@
+ $this->addFile($path . '/dumper_test.php');
+ $this->addFile($path . '/expectation_test.php');
+ $this->addFile($path . '/unit_tester_test.php');
+- if (version_compare(phpversion(), '5', '>=')) {
+- $this->addFile($path . '/reflection_php5_test.php');
+- } else {
+- $this->addFile($path . '/reflection_php4_test.php');
+- }
++ $this->addFile($path . '/reflection_test.php');
+ $this->addFile($path . '/mock_objects_test.php');
+- if (version_compare(phpversion(), '5', '>=')) {
+- $this->addFile($path . '/interfaces_test.php');
+- }
++ $this->addFile($path . '/interfaces_test.php');
+ $this->addFile($path . '/collector_test.php');
+ $this->addFile($path . '/adapter_test.php');
+ $this->addFile($path . '/socket_test.php');
+--- simpletest/test/reflection_test.php~ 2010-03-10 22:58:11.002406000
+0200
++++ simpletest/test/reflection_test.php 2010-03-10 22:58:15.415874518
+0200
+@@ -1,7 +1,7 @@
+ <?php
+ // $Id$
+ require_once(dirname(__FILE__) . '/../autorun.php');
+-require_once(dirname(__FILE__) . '/../reflection_php5.php');
++require_once(dirname(__FILE__) . '/../reflection.php');
+
+ class AnyOldLeafClass {
+ function aMethod() { }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-simpletest/php-simpletest.spec?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
