diff --git a/.gitignore b/.gitignore index d98e3a1..53c2293 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,2 @@ /php-sabre-uri2-2.1.2-c260a55.tgz /php-sabre-uri2-2.1.3-18f4543.tgz -/php-sabre-uri2-2.2.0-059d110.tgz -/php-sabre-uri2-2.2.1-f502edf.tgz -/php-sabre-uri2-2.2.2-7cb0f48.tgz -/php-sabre-uri2-2.3.0-4e84208.tgz -/php-sabre-uri2-2.3.1-2ec3dce.tgz -/php-sabre-uri2-2.3.2-eceb4a1.tgz -/php-sabre-uri2-2.3.3-7e0e7df.tgz -/php-sabre-uri2-2.3.4-b76524c.tgz diff --git a/php-sabre-uri2.spec b/php-sabre-uri2.spec index a8eb33d..bd4395c 100644 --- a/php-sabre-uri2.spec +++ b/php-sabre-uri2.spec @@ -1,16 +1,13 @@ # remirepo/fedora spec file for php-sabre-uri2 # -# Copyright (c) 2016-2024 Remi Collet +# Copyright (c) 2016-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # - -%bcond_without tests - # Github -%global gh_commit b76524c22de90d80ca73143680a8e77b1266c291 +%global gh_commit 18f454324f371cbcabdad3d0d3755b4b0182095d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project uri @@ -21,38 +18,33 @@ %global ns_vendor Sabre %global ns_project Uri %global major 2 +%global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Functions for making sense out of URIs -Version: 2.3.4 -Release: 3%{?dist} +Version: 2.1.3 +Release: 1%{?dist} URL: https://github.com/%{gh_owner}/%{gh_project} -License: BSD-3-Clause +License: BSD # Git snapshot with tests, because of .gitattributes Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with tests} -BuildRequires: php(language) >= 7.4 +%if %{with_tests} +BuildRequires: php(language) >= 7 # From composer.json, "require-dev": { -# "friendsofphp/php-cs-fixer": "^3.63", -# "phpstan/phpstan": "^1.12", -# "phpstan/phpstan-phpunit": "^1.4", -# "phpstan/phpstan-strict-rules": "^1.6", -# "phpstan/extension-installer": "^1.4", -# "phpunit/phpunit" : "^9.6" +# "phpunit/phpunit" : "^6" BuildRequires: php-pcre -BuildRequires: phpunit9 >= 9.6 -%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit6 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" : { -# "php": "^7.4 || ^8.0" -Requires: php(language) > 7.4 +# "php": ">=7" +Requires: php(language) > 7 # From phpcompatinfo report for version 2.1.2 Requires: php-pcre # Autoloader @@ -103,23 +95,16 @@ cp -pr lib %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major} %check -: Check version -php -r ' -require "%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php"; -echo Sabre\Uri\Version::VERSION . "\n"; -exit (Sabre\Uri\Version::VERSION === "%{version}" ? 0 : 1); -' - -%if %{with tests} +%if %{with_tests} : Run upstream test suite against installed library mkdir vendor ln -s %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php vendor/autoload.php cd tests -for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do - if which $cmdarg; then - set $cmdarg - $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 +for cmd in php php71 php72 php73 php74 +do + if which $cmd; then + $cmd %{_bindir}/phpunit6 --verbose || ret=1 fi done exit $ret @@ -137,81 +122,9 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 2.3.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 2.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Aug 28 2024 Remi Collet - 2.3.4-1 -- update to 2.3.4 (no change, CS only) - -* Fri Jul 19 2024 Fedora Release Engineering - 2.3.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 29 2024 Fedora Release Engineering - 2.3.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 2.3.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2.3.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 2.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jun 12 2023 Remi Collet - 2.3.3-1 -- update to 2.3.3 - -* Fri Jan 20 2023 Fedora Release Engineering - 2.3.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Sep 19 2022 Remi Collet - 2.3.2-1 -- update to 2.3.2 - -* Mon Sep 12 2022 Remi Collet - 2.3.1-1 -- update to 2.3.1 - -* Thu Aug 18 2022 Remi Collet - 2.3.0-1 -- update to 2.3.0 - -* Fri Jul 22 2022 Fedora Release Engineering - 2.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 2.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Nov 4 2021 Remi Collet - 2.2.2-1 -- update to 2.2.2 - -* Fri Jul 23 2021 Fedora Release Engineering - 2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 2.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Oct 5 2020 Remi Collet - 2.2.1-1 -- update to 2.2.1 -- switch to phpunit9 - -* Tue Jul 28 2020 Fedora Release Engineering - 2.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Feb 1 2020 Remi Collet - 2.2.0-1 -- update to 2.2.0 -- raise dependency on PHP 7.1 -- switch to phpunit8 - -* Thu Jan 30 2020 Fedora Release Engineering - 2.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Tue Sep 10 2019 Remi Collet - 2.1.3-1 - update to 2.1.3 -* Fri Jul 26 2019 Fedora Release Engineering - 2.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Fri Jul 5 2019 Remi Collet - 2.1.2-2 - fix autoloader diff --git a/sources b/sources index 7fc2f4e..8522760 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-uri2-2.3.4-b76524c.tgz) = 7662d3d32004e184bc26465ea42f171006492b32f28e09ac22ff0bc227a368d427fe7b1dd51bd9a011129fc641821827b8c2c8bc8c55673d0ba2c630df6b34fe +SHA512 (php-sabre-uri2-2.1.3-18f4543.tgz) = 59ff60bc4771d9b369231aa52954f0b1cf868c11c74b52d8bf01eda7e3d0b435671e94c8b5990857d6977bd30b99f313400bfd78c466dbde19e9aee72501082d