diff --git a/.gitignore b/.gitignore index ce9b8bf..4a59db9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,10 @@ +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 9dd103d..4553218 100644 --- a/php-sabre-event5.spec +++ b/php-sabre-event5.spec @@ -1,13 +1,16 @@ # remirepo/fedora spec file for php-sabre-event5 # -# Copyright (c) 2013-2018 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 # + +%bcond_without tests + # Github -%global gh_commit f5cf802d240df1257866d8813282b98aee3bc548 +%global gh_commit 86d57e305c272898ba3c28e9bd3d65d5464587c2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project event @@ -19,33 +22,34 @@ %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.0.3 +Version: 5.1.7 Release: 3%{?dist} URL: http://sabre.io/event -License: BSD +License: BSD-3-Clause Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with_tests} -BuildRequires: php(language) >= 7.0 +%if %{with tests} +BuildRequires: php(language) >= 7.1 BuildRequires: php-spl # From composer.json, "require-dev": { -# "sabre/cs": "~1.0.0", -# "phpunit/phpunit" : ">=6" -BuildRequires: phpunit6 +# "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 +%global phpunit %{_bindir}/phpunit9 # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require": { -# "php": ">=7.0" -Requires: php(language) >= 7.0 +# "php": "^7.1 || ^8.0" +Requires: php(language) >= 7.1 # From phpcompatinfo report for version 5.0.2 Requires: php-spl # Autoloader @@ -75,9 +79,12 @@ cat << 'EOF' | tee lib/autoload.php /* Autoloader for %{name} and its dependencies */ require_once '/usr/share/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('Sabre\\Event\\', __DIR__); -require_once __DIR__ . '/coroutine.php'; -require_once __DIR__ . '/Loop/functions.php'; -require_once __DIR__ . '/Promise/functions.php'; + +if (!function_exists('Sabre\\Event\\coroutine')) { + require_once __DIR__ . '/coroutine.php'; + require_once __DIR__ . '/Loop/functions.php'; + require_once __DIR__ . '/Promise/functions.php'; +} EOF @@ -91,13 +98,22 @@ cp -pr lib %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major} %check -%if %{with_tests} +: 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} : Run upstream test suite against installed library ret=0 -for cmd in php php71 php72 php73; do - if which $cmd; then - $cmd %{_bindir}/phpunit6 \ +for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit9} \ --bootstrap=%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ + --configuration tests/phpunit.xml \ --verbose || ret=1 fi done @@ -108,7 +124,6 @@ exit $ret %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *md %doc composer.json @@ -117,6 +132,72 @@ 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 + +* Tue Jul 28 2020 Fedora Release Engineering - 5.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Feb 1 2020 Remi Collet - 5.1.0-1 +- update to 5.1.0 +- raise dependency on PHP 7.1 +- switch to phpunit8 + +* Thu Jan 30 2020 Fedora Release Engineering - 5.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 5.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index a2ab100..9bb6b92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-event5-5.0.3-f5cf802.tgz) = 29e6b6b63bf536ae87caa00f43e46b82cdc4d2ec3b91779598821732733dcbead827d285819bb02293c5205dcf6f482f0681f0c73260e793fcdfc282f2cd41cb +SHA512 (php-sabre-event5-5.1.7-86d57e3.tgz) = 6fe878488996a0473bca7becc7de89a246d99d768fc26e6987eb330bf96348ab2e7ca955f50f2b32072d024e17753906a474d475fe646f44cfc943a5b8dbd712