diff --git a/.gitignore b/.gitignore index 754fc88..1eb8338 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,3 @@ /php-phar-io-version3-3.0.3-726c026.tgz /php-phar-io-version3-3.0.4-e478261.tgz /php-phar-io-version3-3.1.0-bae7c54.tgz -/php-phar-io-version3-3.1.1-15a9084.tgz -/php-phar-io-version3-3.2.1-4f7fd78.tgz diff --git a/php-phar-io-version3.spec b/php-phar-io-version3.spec index 1c772a3..68537bd 100644 --- a/php-phar-io-version3.spec +++ b/php-phar-io-version3.spec @@ -1,7 +1,7 @@ # remirepo/fedora spec file for php-phar-io-version3 # -# Copyright (c) 2017-2023 Remi Collet -# License: CC-BY-SA-4.0 +# Copyright (c) 2017-2021 Remi Collet +# License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 4f7fd7836c6f332bb2933569e566a0d6c4cbed74 +%global gh_commit bae7c545bef187884426f042434e561ab1ddb182 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phar-io %global gh_project version @@ -21,11 +21,11 @@ %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.2.1 -Release: 9%{?dist} +Version: 3.1.0 +Release: 1%{?dist} Summary: Library for handling version information and constraints -License: BSD-3-Clause +License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh @@ -36,7 +36,11 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-fedora-autoloader-devel >= 1.0.0 %if %{with tests} +%if 0%{?fedora} >= 32 %global phpunit %{_bindir}/phpunit9 +%else +%global phpunit %{_bindir}/phpunit8 +%endif BuildRequires: %{phpunit} %endif @@ -77,7 +81,7 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} : Run upstream test suite ret=0 BS=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php -for cmd in "php %{phpunit}" php80 php81 php82; do +for cmd in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do if which $cmd; then set $cmd $1 -d auto_prepend_file=$BS \ @@ -100,48 +104,9 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 3.2.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 3.2.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 3.2.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 3.2.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 3.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 3.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Apr 20 2023 Remi Collet - 3.2.1-3 -- use SPDX license id - -* Fri Jul 22 2022 Fedora Release Engineering - 3.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Feb 21 2022 Remi Collet - 3.2.1-1 -- update to 3.2.1 - -* Tue Feb 8 2022 Remi Collet - 3.1.1-1 -- update to 3.1.1 - -* Fri Jan 21 2022 Fedora Release Engineering - 3.1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 3.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Wed Feb 24 2021 Remi Collet - 3.1.0-1 - update to 3.1.0 -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Mon Dec 14 2020 Remi Collet - 3.0.4-1 - update to 3.0.4 diff --git a/sources b/sources index 269789a..d982e3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phar-io-version3-3.2.1-4f7fd78.tgz) = 6b87689095ccf5305440c5416f14df81b816a8ee1e3d8aa0277b2f92de87d82a8e70388f98353463e58165df981f157156c950d7984f792f7c41197d0af89e47 +SHA512 (php-phar-io-version3-3.1.0-bae7c54.tgz) = aef2ed6ad2fc1a4212e88c73c16e38e1d70e42e32ad6640766038cc3ef5df31259ade67b6c9b59f36422b6fff303feb314387fa60c5bd02372778e322cb1221d