remi pushed to php-phpunit-PHPUnit (f21). "update to 4.6.2"

notifications at fedoraproject.org notifications at fedoraproject.org
Tue Apr 7 13:15:25 UTC 2015


>From 5b0470a8c550853f5f304f927d1e165cde443767 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi at fedoraproject.org>
Date: Tue, 7 Apr 2015 15:02:55 +0200
Subject: update to 4.6.2


diff --git a/.gitignore b/.gitignore
index c8ea22e..ebf7bf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ clog
 /phpunit-4.5.1.tar.gz
 /phpunit-4.6.0.tar.gz
 /phpunit-4.6.1.tar.gz
+/phpunit-4.6.2.tar.gz
diff --git a/Autoload.php.in b/Autoload.php.in
index 8247632..f12fd6e 100644
--- a/Autoload.php.in
+++ b/Autoload.php.in
@@ -16,7 +16,6 @@ require_once 'SebastianBergmann/Comparator/autoload.php';
 require_once 'SebastianBergmann/GlobalState/autoload.php';
 require_once 'Doctrine/Instantiator/autoload.php';
 require_once 'Prophecy/autoload.php';
-require_once 'PHPUnit/Framework/Assert/Functions.php';
 
 $vendorDir = '/usr/share/php';
 require_once $vendorDir . '/Symfony/Component/ClassLoader/UniversalClassLoader.php';
diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec
index 66bbf63..7e52265 100644
--- a/php-phpunit-PHPUnit.spec
+++ b/php-phpunit-PHPUnit.spec
@@ -8,7 +8,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    08b2aacdd8433abbba468f995d6d64b76a7a62ec
+%global gh_commit    6c773fda0bdb5ea891d9e4430dcc26c990b9130b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   phpunit
@@ -17,7 +17,7 @@
 %global pear_channel pear.phpunit.de
 
 Name:           php-phpunit-PHPUnit
-Version:        4.6.1
+Version:        4.6.2
 Release:        1%{?dist}
 Summary:        The PHP Unit Testing framework
 
@@ -154,13 +154,11 @@ mv src PHPUnit
 
 
 %build
-%{_bindir}/php -d date.timezone=UTC \
 %{_bindir}/phpab \
   --output   PHPUnit/Autoload.php \
   --template %{SOURCE1} \
   PHPUnit
 
-%{_bindir}/php -d date.timezone=UTC \
 %{_bindir}/phpab \
   --output   tests/autoload.php \
   tests
@@ -192,11 +190,15 @@ fi
 %doc CONTRIBUTING.md README.md composer.json
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
+
 %{_bindir}/phpunit
 %{php_home}/PHPUnit
 
 
 %changelog
+* Tue Apr  7 2015 Remi Collet <remi at fedoraproject.org> - 4.6.2-1
+- Update to 4.6.2
+
 * Fri Apr  3 2015 Remi Collet <remi at fedoraproject.org> - 4.6.1-1
 - Update to 4.6.1
 
diff --git a/phpunit-rpm.patch b/phpunit-rpm.patch
index 724ad00..b927330 100644
--- a/phpunit-rpm.patch
+++ b/phpunit-rpm.patch
@@ -36,11 +36,12 @@ diff -up ./phpunit.rpm ./phpunit
 diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
 --- ./tests/bootstrap.php.rpm	2015-01-17 12:24:41.000000000 +0100
 +++ ./tests/bootstrap.php	2015-01-18 08:51:55.668966689 +0100
-@@ -1,6 +1,8 @@
+@@ -1,6 +1,9 @@
  <?php
  // Needed for isolated tests
 -require __DIR__ . '/../vendor/autoload.php';
 +require_once __DIR__ . '/_files/CoveredFunction.php';
++require_once __DIR__ . '/../PHPUnit/Framework/Assert/Functions.php';
 +require_once __DIR__ . '/../PHPUnit/Autoload.php';
 +require_once __DIR__ . '/autoload.php';
  
diff --git a/sources b/sources
index 1d3c6d6..67b9798 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-799466db41330e3887505edb800ef002  phpunit-4.6.1.tar.gz
+d83fef4bc17cd19c1ada397a75cfc1bf  phpunit-4.6.2.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/php-phpunit-PHPUnit.git/commit/?h=f21&id=5b0470a8c550853f5f304f927d1e165cde443767


More information about the scm-commits mailing list