diff --git a/.gitignore b/.gitignore index a1d4c45..e7012ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-sebastian-diff3-3.0.0-e091609.tar.gz /php-sebastian-diff3-3.0.1-366541b.tar.gz /php-sebastian-diff3-3.0.2-720fcc7.tar.gz +/php-sebastian-diff3-3.0.3-14f72dd.tar.gz diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec index 37c25c9..9be9a5e 100644 --- a/php-sebastian-diff3.spec +++ b/php-sebastian-diff3.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-sebastian-diff3 # -# Copyright (c) 2013-2019 Remi Collet +# Copyright (c) 2013-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 720fcc7e9b5cf384ea68d9d930d480907a0c1a29 +%global gh_commit 14f72dd46eaf2f2293cbe79c93cc0bc43161a211 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project diff @@ -27,7 +27,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.2 +Version: 3.0.3 Release: 4%{?dist} Summary: Diff implementation @@ -44,12 +44,12 @@ BuildRequires: php-spl # from composer.json, "require-dev": { # "phpunit/phpunit": "^7.5 || ^8.0", # "symfony/process": "^2 || ^3.3 || ^4" -BuildRequires: phpunit7 >= 7.5 +BuildRequires: phpunit8 BuildRequires: php-symfony4-process %endif # from composer.json -# "php": "^7.1" +# "php": ">=7.1" Requires: php(language) >= 7.1 # from phpcompatinfo report for version 3.0.0 Requires: php-pcre @@ -85,16 +85,18 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} mkdir vendor %{_bindir}/phpab --output vendor/autoload.php tests cat << 'EOF' | tee -a vendor/autoload.php -\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Process', '%{php_home}/Symfony4/Component/Process'); +\Fedora\Autoloader\Dependencies::required([ + '%{php_home}/Symfony4/Component/Process/autoload.php', +]); EOF : Run upstream test suite ret=0 -for cmd in php php71 php72 php73; do +for cmd in php php73 php74 php80; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit7 --verbose || ret=1 + %{_bindir}/phpunit8 --verbose || ret=1 fi done exit $ret @@ -112,6 +114,10 @@ exit $ret %changelog +* Mon Aug 2 2021 Remi Collet - 3.0.3-4 +- fix symfony autoloader usage +- switch to phpunit8 + * Tue Jul 28 2020 Fedora Release Engineering - 3.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 3f495ab..117fb0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-diff3-3.0.2-720fcc7.tar.gz) = 23a72319b76203a94d9edd14f8d960c9c489773ba9ec2bd7c8fb067332454ff9f83cba620e66da136d963d5599012cf42829c5d5913dd2bad44ed41c69ff9cba +SHA512 (php-sebastian-diff3-3.0.3-14f72dd.tar.gz) = 8b4822cd9f1d203914dc0d62e328e18a7b993b2f22b20944d12bc61d8aa0eea1f0b881a0c55ed07e65d460ea65391c192693fe00873ad17e7b201399e7558d3f