diff --git a/.gitignore b/.gitignore index 4a59db9..4f0a7d9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,3 @@ -clog /php-sabre-event5-5.0.3-f5cf802.tgz /php-sabre-event5-5.1.0-d00a175.tgz /php-sabre-event5-5.1.1-a37c73e.tgz -/php-sabre-event5-5.1.2-c120bec.tgz -/php-sabre-event5-5.1.3-6d86fd1.tgz -/php-sabre-event5-5.1.4-d7da228.tgz -/php-sabre-event5-5.1.5-934a1fa.tgz -/php-sabre-event5-5.1.6-e0e1ccb.tgz -/php-sabre-event5-5.1.7-86d57e3.tgz diff --git a/php-sabre-event5.spec b/php-sabre-event5.spec index 4553218..eb7d473 100644 --- a/php-sabre-event5.spec +++ b/php-sabre-event5.spec @@ -1,16 +1,13 @@ # remirepo/fedora spec file for php-sabre-event5 # -# Copyright (c) 2013-2024 Remi Collet -# License: CC-BY-SA-4.0 +# Copyright (c) 2013-2020 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 86d57e305c272898ba3c28e9bd3d65d5464587c2 +%global gh_commit a37c73e535ddab02bd892f4bdab4867f9778cbea %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project event @@ -22,33 +19,39 @@ %global ns_project Event # For RPM %global major 5 +%global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project}%{major} Summary: Lightweight library for event-based programming -Version: 5.1.7 -Release: 3%{?dist} +Version: 5.1.1 +Release: 1%{?dist} URL: http://sabre.io/event -License: BSD-3-Clause +License: BSD Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with tests} +%if %{with_tests} BuildRequires: php(language) >= 7.1 BuildRequires: php-spl # From composer.json, "require-dev": { -# "friendsofphp/php-cs-fixer": "~2.17.1", -# "phpstan/phpstan": "^0.12||^3.63", -# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6" -BuildRequires: phpunit9 >= 9.6 +# "friendsofphp/php-cs-fixer": "~2.16.1", +# "phpstan/phpstan": "^0.12", +# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0" +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 +%else +BuildRequires: phpunit8 +%global phpunit %{_bindir}/phpunit8 +%endif # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require": { -# "php": "^7.1 || ^8.0" +# "php": "^7.1|^8.0" Requires: php(language) >= 7.1 # From phpcompatinfo report for version 5.0.2 Requires: php-spl @@ -98,17 +101,10 @@ 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\Event\Version::VERSION . "\n"; -exit (Sabre\Event\Version::VERSION === "%{version}" ? 0 : 1); -' - -%if %{with tests} +%if %{with_tests} : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} \ @@ -132,57 +128,6 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 5.1.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 5.1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Aug 28 2024 Remi Collet - 5.1.7-1 -- update to 5.1.7 (no change, CS only) - -* Fri Jul 26 2024 Remi Collet - 5.1.6-1 -- update to 5.1.6 - -* Thu Jul 25 2024 Remi Collet - 5.1.5-1 -- update to 5.1.5 - -* Fri Jul 19 2024 Fedora Release Engineering - 5.1.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 5.1.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 5.1.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 5.1.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Jan 20 2023 Fedora Release Engineering - 5.1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 5.1.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 5.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Nov 4 2021 Remi Collet - 5.1.4-1 -- update to 5.1.4 - -* Thu Nov 4 2021 Remi Collet - 5.1.3-1 -- update to 5.1.3 - -* Fri Jul 23 2021 Fedora Release Engineering - 5.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 5.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Oct 5 2020 Remi Collet - 5.1.2-1 -- update to 5.1.2 - * Mon Sep 21 2020 Remi Collet - 5.1.1-1 - update to 5.1.1 - switch to phpunit9 diff --git a/sources b/sources index 9bb6b92..0a88b19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-event5-5.1.7-86d57e3.tgz) = 6fe878488996a0473bca7becc7de89a246d99d768fc26e6987eb330bf96348ab2e7ca955f50f2b32072d024e17753906a474d475fe646f44cfc943a5b8dbd712 +SHA512 (php-sabre-event5-5.1.1-a37c73e.tgz) = e338bfe421224c008c69af609008ef1ce814c9d07170b7ba70675fb30317213dcfed6d547fe2c9b6713f1cdc65b0e7f02e848d985cbf234b16cfdb8bbf9ad3d6