summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-05-06 13:31:13 +0200
committerRemi Collet <fedora@famillecollet.com>2014-05-06 13:31:13 +0200
commitf6043b062122e5d4ed8871411756b32bdf531cac (patch)
tree66f321aa4ab12196143081378c2acf164ab02558
parentd534fb6aa85b2c66c7e46ed1a93f22412a60f7cf (diff)
php-phpunit-PHPUnit-MockObject: workaround to autoload issue during check
-rw-r--r--php-phpunit-PHPUnit-MockObject.spec13
-rw-r--r--phpunit-mock-objects-rpm.patch12
2 files changed, 23 insertions, 2 deletions
diff --git a/php-phpunit-PHPUnit-MockObject.spec b/php-phpunit-PHPUnit-MockObject.spec
index c149e1d..b4c64b3 100644
--- a/php-phpunit-PHPUnit-MockObject.spec
+++ b/php-phpunit-PHPUnit-MockObject.spec
@@ -18,7 +18,7 @@
Name: php-phpunit-PHPUnit-MockObject
Version: 2.1.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Mock Object library for PHPUnit
Group: Development/Libraries
@@ -29,6 +29,9 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
# Autoload template
Source1: Autoload.php.in
+# Temporary workaround, under investigation
+Patch0: %{gh_project}-rpm.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: %{_bindir}/phpab
@@ -57,6 +60,8 @@ Mock Object library for PHPUnit
%prep
%setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
+
%build
phpab \
@@ -101,8 +106,11 @@ fi
%changelog
+* Tue May 6 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-2
+- workaround to autoload issue during check
+
* Sat May 3 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
-- update to 2.1.0 for PHPUnit 4.1.0
+- update to 2.1.0 for PHPUnit 4.1
* Wed Apr 30 2014 Remi Collet <remi@fedoraproject.org> - 2.0.5-2
- cleanup pear registry
@@ -110,6 +118,7 @@ fi
* Tue Apr 29 2014 Remi Collet <remi@fedoraproject.org> - 2.0.5-1
- update to 2.0.5
- sources from gthub
+- run tests when build --with tests option
* Sun Jan 13 2013 Remi Collet <remi@fedoraproject.org> - 1.2.3-1
- Version 1.2.3 (stable) - API 1.2.0 (stable)
diff --git a/phpunit-mock-objects-rpm.patch b/phpunit-mock-objects-rpm.patch
new file mode 100644
index 0000000..97bdde1
--- /dev/null
+++ b/phpunit-mock-objects-rpm.patch
@@ -0,0 +1,12 @@
+--- phpunit-mock-objects-da0eb04d8ee95ec2898187e407e519c118d3d27c/src/Framework/MockObject/Generator.php.rpm 2014-05-06 13:15:55.000000000 +0200
++++ phpunit-mock-objects-da0eb04d8ee95ec2898187e407e519c118d3d27c/src/Framework/MockObject/Generator.php 2014-05-06 13:16:12.000000000 +0200
+@@ -49,6 +49,9 @@
+ }
+ }
+
++# temporary workaround
++require_once 'Text/Template.php';
++
+ /**
+ * Mock Object Code Generator
+ *