diff options
-rw-r--r-- | composer.json | 2 | ||||
-rw-r--r-- | php-sebastian-diff3.spec | 64 |
2 files changed, 48 insertions, 18 deletions
diff --git a/composer.json b/composer.json index 59520e9..fe2d77f 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "^7.1" + "php": ">=7.1" }, "require-dev": { "phpunit/phpunit": "^7.5 || ^8.0", diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec index 0069ea1..0410e32 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 -# License: CC-BY-SA +# Copyright (c) 2013-2024 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 720fcc7e9b5cf384ea68d9d930d480907a0c1a29 +%global gh_commit 98ff311ca519c3aa73ccd3de053bdb377171d7b6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project diff @@ -27,13 +27,20 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.2 +Version: 3.0.6 Release: 1%{?dist} -Summary: Diff implementation +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 +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh +# 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 BuildArch: noarch BuildRequires: php-fedora-autoloader-devel @@ -44,12 +51,11 @@ 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: php-symfony4-process +BuildRequires: phpunit8 %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 @@ -63,11 +69,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} +%setup -q -n %{gh_project}-%{gh_commit} -a 2 +%patch -P0 -p0 %build @@ -83,10 +92,7 @@ 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\Autoload::addPsr4('Symfony\\Component\\Process', '%{php_home}/Symfony4/Component/Process'); -EOF +%{_bindir}/phpab --output vendor/autoload.php tests process-%{symfony_version} # remirepo:4 %if 0%{?rhel} == 6 || 0%{?rhel} == 7 @@ -96,10 +102,10 @@ rm -r tests/Output/Integration : Run upstream test suite ret=0 -for cmd in php php71 php72 php73; do +for cmd in php php81 php82 php83; 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 @@ -119,6 +125,30 @@ exit $ret %changelog +* Tue Mar 5 2024 Remi Collet <remi@remirepo.net> - 3.0.6-1 +- update to 3.0.6 + +* Fri Mar 1 2024 Remi Collet <remi@remirepo.net> - 3.0.5-1 +- update to 3.0.5 (no change) +- sources from git snapshot + +* Tue May 9 2023 Remi Collet <remi@remirepo.net> - 3.0.4-1 +- update to 3.0.4 + +* Fri Apr 21 2023 Remi Collet <remi@remirepo.net> - 3.0.3-8 +- use SPDX license ID +- use bundled symfony/process for test + +* Wed Aug 3 2022 Remi Collet <remi@remirepo.net> - 3.0.3-6 +- fix test suite with recent symfony, FTBFS #2113592 + +* Mon Aug 2 2021 Remi Collet <remi@remirepo.net> - 3.0.3-4 +- fix symfony autoloader usage + +* Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 3.0.3-1 +- update to 3.0.3 (no change) +- switch to phpunit8 + * Mon Feb 4 2019 Remi Collet <remi@remirepo.net> - 3.0.2-1 - update to 3.0.2 |