[php-phpunit-PHPUnit/f18] Version 3.7.8 (stable) - API 3.7.0 (stable) add Conflicts for max version of PHP_CodeCoverage and PH

Remi Collet remi at fedoraproject.org
Wed Oct 31 14:57:50 UTC 2012


commit 0a3f35f3dffee727d96f19aacb20c870c562b192
Author: Remi Collet <remi at fedoraproject.org>
Date:   Wed Oct 31 15:57:38 2012 +0100

    Version 3.7.8 (stable) - API 3.7.0 (stable)
    add Conflicts for max version of PHP_CodeCoverage and PHPUnit_MockObject
    raise dependencies: php 5.3.3, PHP_CodeCoverage 1.2.1,
      PHP_Timer 1.0.2, Yaml 2.1.0 (instead of YAML from symfony 1)

 .gitignore               |    1 +
 php-phpunit-PHPUnit.spec |   31 ++++++++++++++++-------------
 phpunit-autoload.patch   |   49 ----------------------------------------------
 sources                  |    2 +-
 4 files changed, 19 insertions(+), 64 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 28f5da6..aebc7e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ package*.xml
 /PHPUnit-3.6.10.tgz
 /PHPUnit-3.6.11.tgz
 /PHPUnit-3.6.12.tgz
+/PHPUnit-3.7.8.tgz
diff --git a/php-phpunit-PHPUnit.spec b/php-phpunit-PHPUnit.spec
index 93e5382..303d1dc 100644
--- a/php-phpunit-PHPUnit.spec
+++ b/php-phpunit-PHPUnit.spec
@@ -4,8 +4,8 @@
 %global channel pear.phpunit.de
 
 Name:           php-phpunit-PHPUnit
-Version:        3.6.12
-Release:        2%{?dist}
+Version:        3.7.8
+Release:        1%{?dist}
 Summary:        The PHP Unit Testing framework
 
 Group:          Development/Libraries
@@ -13,25 +13,25 @@ License:        BSD
 URL:            http://www.phpunit.de
 Source0:        http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
 
-Patch0:         phpunit-autoload.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.9.4
 BuildRequires:  php-channel(%{channel})
 
-Requires:       php-xml >= 5.2.7
+Requires:       php-xml >= 5.3.3
 Requires:       php-channel(%{channel})
 Requires(post): %{__pear}
 Requires(postun): %{__pear}
 Requires:       php-pear(%{channel}/File_Iterator) >= 1.3.0
 Requires:       php-pear(%{channel}/Text_Template) >= 1.1.1
-Requires:       php-pear(%{channel}/PHP_CodeCoverage) >= 1.1.0
-Requires:       php-pear(%{channel}/PHP_Timer) >= 1.0.1
-Requires:       php-pear(pear.symfony-project.com/YAML) >= 1.0.2
+Requires:       php-pear(%{channel}/PHP_CodeCoverage) >= 1.2.1
+Conflicts:      php-pear(%{channel}/PHP_CodeCoverage) >  1.2.99
+Requires:       php-pear(%{channel}/PHP_Timer) >= 1.0.2
+Requires:       php-pear(pear.symfony.com/Yaml) >= 2.1.0
 # PHPUnit Extensions (yes, with circular dependency on PHPUnit)
-Requires:       php-pear(%{channel}/PHPUnit_MockObject) >= 1.1.0
+Requires:       php-pear(%{channel}/PHPUnit_MockObject) >= 1.2.0
+Conflicts:      php-pear(%{channel}/PHPUnit_MockObject) >  1.2.99
 
 # Optionnal dependencies
 Requires:       php-json php-pdo php-mbstring
@@ -54,11 +54,8 @@ for the creation, execution and analysis of Unit Tests.
 %prep
 %setup -qc
 cd %{pear_name}-%{version}
-
-%patch0 -p1 -b .compat
-
-sed -e '/GlobalState.php/s/md5sum.*name/name/' \
-    ../package.xml >%{name}.xml
+# package.xml is V2
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -111,6 +108,12 @@ fi
 
 
 %changelog
+* Wed Oct 31 2012 Remi Collet <remi at fedoraproject.org> - 3.7.8-1
+- Version 3.7.8 (stable) - API 3.7.0 (stable)
+- add Conflicts for max version of PHP_CodeCoverage and PHPUnit_MockObject
+- raise dependencies: php 5.3.3, PHP_CodeCoverage 1.2.1,
+  PHP_Timer 1.0.2, Yaml 2.1.0 (instead of YAML from symfony 1)
+
 * Tue Oct 24 2012 Remi Collet <remi at fedoraproject.org> - 3.6.12-2
 - fix compatibility with some recent extensions:  File_Iterator
   PHP_Invoker, PHP_Timer, PHP_Tokenstream, Text_Template (#869367)
diff --git a/sources b/sources
index 3ba415f..268531f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d8cef58e86bfc1774ac4aa3bf5cab79  PHPUnit-3.6.12.tgz
+b7e40d23e937a116c070dfd16e48e840  PHPUnit-3.7.8.tgz


More information about the scm-commits mailing list