diff --git a/.gitignore b/.gitignore index 3027b6e..b3181ea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ clog /php-sebastian-diff3-3.0.3-14f72dd.tar.gz +/php-symfony-process-4.4.44.tar.gz +/php-sebastian-diff3-3.0.4-6296a0c.tar.gz diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec index 5855745..16bcee6 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-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2013-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 14f72dd46eaf2f2293cbe79c93cc0bc43161a211 +%global gh_commit 6296a0c086dd0117c1b78b059374d7fcbe7545ae %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project diff @@ -27,13 +27,16 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.3 -Release: 7%{?dist} -Summary: Diff implementation +Version: 3.0.4 +Release: 1%{?dist} +Summary: Diff implementation, version %{major} -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +# php-symfony4 going to disapear, only used for tests +%global symfony_version 4.4.44 +Source2: https://github.com/symfony/process/archive/v%{symfony_version}/php-symfony-process-%{symfony_version}.tar.gz # Fix for recent Symfony Patch0: %{name}-tests.patch @@ -48,7 +51,6 @@ BuildRequires: php-spl # "phpunit/phpunit": "^7.5 || ^8.0", # "symfony/process": "^2 || ^3.3 || ^4" BuildRequires: phpunit8 -BuildRequires: php-symfony4-process %endif # from composer.json @@ -66,12 +68,14 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} %description Diff implementation. +This package provides the version %{major} of the library. + Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep -%setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p0 +%setup -q -n %{gh_project}-%{gh_commit} -a 2 +%patch -P0 -p0 %build @@ -87,17 +91,12 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} %check %if %{with_tests} mkdir vendor -%{_bindir}/phpab --output vendor/autoload.php tests -cat << 'EOF' | tee -a vendor/autoload.php -\Fedora\Autoloader\Dependencies::required([ - '%{php_home}/Symfony4/Component/Process/autoload.php', -]); -EOF +%{_bindir}/phpab --output vendor/autoload.php tests process-%{symfony_version} : Run upstream test suite ret=0 -for cmd in php php74 php80 php81 php82; do +for cmd in php php80 php81 php82; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit8 --verbose || ret=1 @@ -118,6 +117,11 @@ exit $ret %changelog +* Tue May 9 2023 Remi Collet - 3.0.4-1 +- update to 3.0.4 +- use SPDX license ID +- use bundled symfony/process for test + * Fri Jan 20 2023 Fedora Release Engineering - 3.0.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 117fb0d..5ea5891 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (php-sebastian-diff3-3.0.3-14f72dd.tar.gz) = 8b4822cd9f1d203914dc0d62e328e18a7b993b2f22b20944d12bc61d8aa0eea1f0b881a0c55ed07e65d460ea65391c192693fe00873ad17e7b201399e7558d3f +SHA512 (php-sebastian-diff3-3.0.4-6296a0c.tar.gz) = 487852d49ad55356edfc562ab0aec5d57ab143bde50897e2f23592f25d44330c45c353baf2cc111c1095f4165bcb3dcc437fc36e7a248d2ac849ca36714910ac +SHA512 (php-symfony-process-4.4.44.tar.gz) = f50deca4d93f4252ecd32ff31b4c221ecab49172b369b37d862eca274aeb31fa4396b42224f84492e2cb82107acb8ffa90b39d006d5f9040d793fbe08486af46