[php-phpunit-PHPUnit] update to 4.1.2

[Remi Collet]

commit d0293a0fdd24df960794687aa81bcc8907e8bf66
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Jun 9 10:00:10 2014 +0200

    update to 4.1.2

 .gitignore               |    1 +
 php-phpunit-PHPUnit.spec |   23 +++++++++++++++--------
 phpunit-rpm.patch        |   13 +++++++++++++
 sources                  |    2 +-
 4 files changed, 30 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9d2edc..3de3461 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@ clog
 /PHPUnit-3.7.34.tgz
 /phpunit-4.1.0.tar.gz
 /phpunit-4.1.1.tar.gz
+/phpunit-4.1.2.tar.gz
diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec
index aaf887f..a277287 100644
--- a/php-phpunit-PHPUnit.spec
+++ b/php-phpunit-PHPUnit.spec
@@ -8,7 +8,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    1d6b554732382879045e11c56decd4be76130720
+%global gh_commit    be5f237df860da88a7cfe247594232cae61845df
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   phpunit
@@ -17,8 +17,8 @@
 %global pear_channel pear.phpunit.de
 
 Name:           php-phpunit-PHPUnit
-Version:        4.1.1
-Release:        2%{?dist}
+Version:        4.1.2
+Release:        1%{?dist}
 Summary:        The PHP Unit Testing framework
 
 Group:          Development/Libraries
@@ -39,7 +39,7 @@ BuildRequires:  php-phpunit-File-Iterator >= 1.3.1
 BuildRequires:  php-phpunit-Text-Template >= 1.2
 BuildRequires:  php-phpunit-PHP-CodeCoverage >= 2.0
 BuildRequires:  php-phpunit-PHP-Timer >= 1.0.2
-BuildRequires:  php-phpunit-PHPUnit-MockObject >= 2.1
+BuildRequires:  php-composer(phpunit/phpunit-mock-objects) >= 2.1
 BuildRequires:  php-phpunit-comparator >= 1.0
 BuildRequires:  php-phpunit-diff >= 1.1
 BuildRequires:  php-phpunit-environment >= 1.0
@@ -53,7 +53,7 @@ Requires:       php-phpunit-File-Iterator >= 1.3.1
 Requires:       php-phpunit-Text-Template >= 1.2
 Requires:       php-phpunit-PHP-CodeCoverage >= 2.0
 Requires:       php-phpunit-PHP-Timer >= 1.0.2
-Requires:       php-phpunit-PHPUnit-MockObject >= 2.1
+Requires:       php-composer(phpunit/phpunit-mock-objects) >= 2.1
 Requires:       php-phpunit-comparator >= 1.0
 Requires:       php-phpunit-diff >= 1.1
 Requires:       php-phpunit-environment >= 1.0
@@ -80,6 +80,7 @@ Requires:       php-tidy
 Requires:       php-xml
 
 
+Provides:       php-composer(phpunit/phpunit) = %{version}
 # For compatibility with PEAR mode
 Provides:       php-pear(%{pear_channel}/%{pear_name}) = %{version}
 # Package have been rename
@@ -109,6 +110,10 @@ phpab \
   --template %{SOURCE1} \
   src
 
+phpab \
+  --output   tests/autoload.php \
+  tests
+
 
 %install
 mkdir -p   %{buildroot}%{php_home}
@@ -118,9 +123,6 @@ install -D -p -m 755 phpunit %{buildroot}%{_bindir}/phpunit
 
 
 %check
-sed -e 's:vendor/autoload:src/Autoload:' \
-    -i tests/bootstrap.php
-
 sed -e '/logging/d' \
     -e '/<log/d' \
     phpunit.xml.dist > phpunit.xml
@@ -147,6 +149,11 @@ fi
 
 
 %changelog
+* Sat Jun  7 2014 Remi Collet <remi at fedoraproject.org> - 4.1.2-1
+- Update to 4.1.2 (no change)
+- improve test suite bootstraping
+- add composer provide
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/phpunit-rpm.patch b/phpunit-rpm.patch
index 34f65ba..4279352 100644
--- a/phpunit-rpm.patch
+++ b/phpunit-rpm.patch
@@ -30,3 +30,16 @@ diff -up ./phpunit.rpm ./phpunit
  require PHPUNIT_COMPOSER_INSTALL;
  
  PHPUnit_TextUI_Command::main();
+diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
+--- ./tests/bootstrap.php.rpm	2014-06-07 11:26:13.357779078 +0200
++++ ./tests/bootstrap.php	2014-06-07 11:25:17.659035072 +0200
+@@ -1,5 +1,8 @@
+ <?php
+-require __DIR__ . '/../vendor/autoload.php';
++require __DIR__ . '/../src/Framework/Assert/Functions.php';
++require __DIR__ . '/_files/CoveredFunction.php';
++require __DIR__ . '/../src/Autoload.php';
++require __DIR__ . '/autoload.php';
+ 
+ if (!ini_get('date.timezone') && !defined('HHVM_VERSION')) {
+   echo PHP_EOL . 'Error: PHPUnit\'s test suite requires the "date.timezone" runtime configuration to be set. Please check your php.ini.' . PHP_EOL;
diff --git a/sources b/sources
index f21b5b6..9cd0de0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ae64a061824f4faff9a593f1e9d52c7  phpunit-4.1.1.tar.gz
+bcdb45d47137394e8f31f5337397302c  phpunit-4.1.2.tar.gz