diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-phar-io-version3.spec | 37 |
2 files changed, 23 insertions, 16 deletions
diff --git a/composer.json b/composer.json index 891e8b1..afa7bb6 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "issues": "https://github.com/phar-io/version/issues" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.2" }, "autoload": { "classmap": [ diff --git a/php-phar-io-version3.spec b/php-phar-io-version3.spec index 2227e18..c891b5d 100644 --- a/php-phar-io-version3.spec +++ b/php-phar-io-version3.spec @@ -1,13 +1,13 @@ -# remirepo/fedora spec file for php-phar-io-version +# remirepo/fedora spec file for php-phar-io-version3 # -# Copyright (c) 2017-2018 Remi Collet +# Copyright (c) 2017-2020 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 45a2ec53a73c70ce41d55cedef9063630abaf1b6 +%global gh_commit 1f4eccfe4d486824b9f2b5f21f3442ee7f529351 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phar-io %global gh_project version @@ -15,7 +15,7 @@ %global pk_project %{gh_project} %global ns_vendor PharIo %global ns_project Version -%global major %nil +%global major 3 %global php_home %{_datadir}/php %if %{bootstrap} %global with_tests 0%{?_with_tests:1} @@ -24,7 +24,7 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 2.0.1 +Version: 3.0.0 Release: 1%{?dist} Summary: Library for handling version information and constraints @@ -33,19 +33,18 @@ 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 BuildArch: noarch -# PHP 7 for phpunit6 -BuildRequires: php(language) >= 7 +BuildRequires: php(language) >= 7.2 BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with_tests} -BuildRequires: phpunit6 +BuildRequires: phpunit8 %endif # from composer.json -# "php": "^5.6 || ^7.0" -Requires: php(language) >= 5.6 -# from phpcompatinfo report for version 1.0.1 +# "php": "^7.2" +Requires: php(language) >= 7.2 +# from phpcompatinfo report for version 3.0.0 Requires: php-pcre Requires: php-spl # Autoloader @@ -66,7 +65,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %build # Generate the Autoloader -%{_bindir}/phpab --template fedora2 --output src/autoload.php src +%{_bindir}/phpab --template fedora --output src/autoload.php src %install @@ -78,10 +77,11 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} %if %{with_tests} : Run upstream test suite ret=0 -for cmd in php php70 php71 php72 php73; do +BS=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php +for cmd in php php72 php73 php74 php80; do if which $cmd; then - $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit6 --bootstrap %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php --verbose || ret=1 + $cmd -d auto_prepend_file=$BS \ + %{_bindir}/phpunit8 --bootstrap $BS --verbose || ret=1 fi done exit $ret @@ -99,6 +99,13 @@ exit $ret %changelog +* Thu May 7 2020 Remi Collet <remi@remirepo.net> - 3.0.0-1 +- update to 3.0.0 +- rename to php-phar-io-version3 +- move to /usr/share/php/PharIo/Version3 +- raise dependency on PHP 7.2 +- switch to phpunit8 + * Mon Jul 16 2018 Remi Collet <remi@remirepo.net> - 2.0.1-1 - update to 2.0.1 |