diff --git a/.gitignore b/.gitignore index a062d6b..7148b6b 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,7 @@ clog /phpunit8-8.5.31-33c126b.tgz /phpunit8-8.5.32-3756869.tgz /phpunit8-8.5.33-7d1ff0e.tgz +/phpunit8-8.5.34-622d018.tgz +/phpunit8-8.5.35-c14b7dc.tgz +/phpunit8-8.5.36-9652df5.tgz +/phpunit8-8.5.37-fce30f3.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 5063154..c0c9da2 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for phpunit8 # -# Copyright (c) 2010-2023 Remi Collet +# Copyright (c) 2010-2024 Remi Collet # # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ @@ -8,10 +8,8 @@ # Please, preserve the changelog entries # -# For compatibility with SCL -%undefine __brp_mangle_shebangs -%global gh_commit 7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e +%global gh_commit fce30f306cee78be33ba00c8f9a853f41db0491b #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +23,7 @@ %global ver_major 8 %global ver_minor 5 -%global upstream_version 8.5.33 +%global upstream_version 8.5.37 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -132,6 +130,7 @@ Suggests: php-xdebug # recommends latest versions Recommends: phpunit9 Recommends: phpunit10 +Recommends: phpunit11 # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 8.0.0 @@ -155,7 +154,7 @@ Documentation: https://phpunit.readthedocs.io/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p0 -b .rpm +%patch -P0 -p0 -b .rpm %build @@ -171,7 +170,6 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/Text/Template/Autoload.php', '%{php_home}/SebastianBergmann/CodeCoverage7/autoload.php', '%{php_home}/SebastianBergmann/Timer/autoload.php', - '%{php_home}/Prophecy/autoload.php', '%{php_home}/SebastianBergmann/Diff3/autoload.php', // Before comparator which may load v2 '%{php_home}/SebastianBergmann/Comparator3/autoload.php', '%{php_home}/SebastianBergmann/Environment4/autoload.php', @@ -186,6 +184,8 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/SebastianBergmann/Invoker/autoload.php', '%{php_home}/PharIo/Manifest2/autoload.php', '%{php_home}/PharIo/Version3/autoload.php', + // May load Comparator/RecursionContext bad version + '%{php_home}/Prophecy/autoload.php', ]); // Extensions \Fedora\Autoloader\Dependencies::optional( @@ -218,7 +218,7 @@ sed -e 's:@PATH@:%{buildroot}%{php_home}/%{ns_vendor}:' -i tests/bootstrap.php sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit ret=0 -for cmd in php php74 php80 php81 php82; do +for cmd in php php80 php81 php82 php83; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -235,6 +235,12 @@ exit $ret %changelog +* Wed Mar 6 2024 Remi Collet - 8.5.37-1 +- update to 8.5.37 + +* Tue Sep 19 2023 Remi Collet - 8.5.34-1 +- update to 8.5.34 + * Tue Feb 28 2023 Remi Collet - 8.5.33-1 - update to 8.5.33 diff --git a/sources b/sources index 22322de..ac79f5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.33-7d1ff0e.tgz) = 24d801a3846cd4a49b7ad8ed76c832ca4c9c44ba084a643ac0b0a222a4dee10b44aef23aacb989804c7a8d2331fb8d43dfd0d7bdf264717b849e53c275af00c8 +SHA512 (phpunit8-8.5.37-fce30f3.tgz) = 87e2b29d1d775329138ec8619d8b37c57fdc39af284a6b54c5fcec571477461ce4857b1aad4161be31369a6bd2fc65c31381b4e88f302fd3acc21637df036b31