diff --git a/.gitignore b/.gitignore index d229e12..af5ce16 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog /phpunit7-7.1.1-f7fe512.tar.gz /phpunit7-7.1.2-6a17c17.tar.gz /phpunit7-7.1.3-a783499.tar.gz +/phpunit7-7.1.4-6d51299.tar.gz diff --git a/phpunit7.spec b/phpunit7.spec index 098bf8a..ae28a2f 100644 --- a/phpunit7.spec +++ b/phpunit7.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9 +%global gh_commit 6d51299e307dc510149e0b7cd1931dd11770e1cb #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -24,7 +24,7 @@ %global php_home %{_datadir}/php %global ver_major 7 %global ver_minor 1 -%global ver_patch 3 +%global ver_patch 4 %global specrel 1 Name: %{pk_project}%{ver_major} @@ -50,7 +50,7 @@ BuildRequires: (php-composer(phpunit/php-file-iterator) >= 1.4.3 with php-co BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) BuildRequires: (php-composer(phpunit/php-timer) >= 2.0 with php-composer(phpunit/php-timer) < 3) BuildRequires: (php-composer(phpunit/phpunit-mock-objects) >= 6.1.1 with php-composer(phpunit/phpunit-mock-objects) < 7) -BuildRequires: (php-composer(sebastian/comparator) >= 2.1 with php-composer(sebastian/comparator) < 3) +BuildRequires: (php-composer(sebastian/comparator) >= 2.1 with php-composer(sebastian/comparator) < 4) BuildRequires: (php-composer(sebastian/diff) >= 3.0 with php-composer(sebastian/diff) < 4) BuildRequires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 4) BuildRequires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4) @@ -83,7 +83,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "phpunit/php-text-template": "^1.2.1", # "phpunit/php-timer": "^2.0", # "phpunit/phpunit-mock-objects": "^6.1.1", -# "sebastian/comparator": "^2.1", +# "sebastian/comparator": "^2.1 || ^3.0", # "sebastian/diff": "^3.0", # "sebastian/environment": "^3.1", # "sebastian/exporter": "^3.1", @@ -107,7 +107,7 @@ Requires: (php-composer(phpunit/php-file-iterator) >= 1.4.3 with php-co Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2) Requires: (php-composer(phpunit/php-timer) >= 2.0 with php-composer(phpunit/php-timer) < 3) Requires: (php-composer(phpunit/phpunit-mock-objects) >= 6.1.1 with php-composer(phpunit/phpunit-mock-objects) < 7) -Requires: (php-composer(sebastian/comparator) >= 2.1 with php-composer(sebastian/comparator) < 3) +Requires: (php-composer(sebastian/comparator) >= 2.1 with php-composer(sebastian/comparator) < 4) Requires: (php-composer(sebastian/diff) >= 3.0 with php-composer(sebastian/diff) < 4) Requires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 4) Requires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4) @@ -158,7 +158,10 @@ cat << 'EOF' | tee -a src/autoload.php '%{ns_vendor}/Framework/MockObject6/autoload.php', '%{php_home}/Prophecy/autoload.php', '%{php_home}/SebastianBergmann/Diff3/autoload.php', // Before comparator which may load v2 - '%{php_home}/SebastianBergmann/Comparator2/autoload.php', + [ + '%{php_home}/SebastianBergmann/Comparator3/autoload.php', + '%{php_home}/SebastianBergmann/Comparator2/autoload.php', + ], '%{php_home}/SebastianBergmann/Environment3/autoload.php', '%{php_home}/SebastianBergmann/Exporter3/autoload.php', '%{php_home}/SebastianBergmann/GlobalState2/autoload.php', @@ -216,6 +219,10 @@ exit $ret %changelog +* Wed Apr 18 2018 Remi Collet - 7.1.4-1 +- update to 7.1.4 +- allow sebastian/comparator 3.0 + * Mon Apr 16 2018 Remi Collet - 7.1.3-1 - update to 7.1.3 (no change) - raise dependency on phpunit/phpunit-mock-objects 6.1.1 diff --git a/sources b/sources index 35da987..698661c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit7-7.1.3-a783499.tar.gz) = dc716b54d8df9ef7d32f08f18112f34178b34cd3314b17bc409e9d9c1f10f2a177b798c3d4d10011e82483f217a941ec644990d9a112a2d63e53cb4e0f32bb11 +SHA512 (phpunit7-7.1.4-6d51299.tar.gz) = 15b07492166c0b56cd41f06e79ecaf84433f73096e4cf4280d870c3f81619b07bb12d26b71dcd24c0804445a5c64cd4f0232b5b431d027e714fb2094960c6153