diff --git a/.gitignore b/.gitignore index 7dc7872..79dcf62 100644 --- a/.gitignore +++ b/.gitignore @@ -22,8 +22,3 @@ clog /php-sabre-vobject4-4.5.0-d1fdc0c.tgz /php-sabre-vobject4-4.5.1-1f83674.tgz /php-sabre-vobject4-4.5.3-fe6d918.tgz -/php-sabre-vobject4-4.5.4-a6d53a3.tgz -/php-sabre-vobject4-4.5.5-7148cf5.tgz -/php-sabre-vobject4-4.5.6-900266b.tgz -/php-sabre-vobject4-4.5.7-ff22611.tgz -/php-sabre-vobject4-4.5.8-d554eb2.tgz diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 70d73ee..26b0296 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,24 +1,31 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# SPDX-FileCopyrightText: Copyright 2013-2026 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2013-2023 Remi Collet +# License: CC-BY-SA-4.0 +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %bcond_without tests +# For compatibility with SCL +%undefine __brp_mangle_shebangs -%global gh_commit d554eb24d64232922e1eab5896cc2f84b3b9ffb1 +%global gh_commit fe6d9183154ed6f2f913f2b568d3d51d8ae9b308 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject -%global with_cmd 1 + +%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 +%global with_cmd 1 +%else +%global with_cmd 0 +%endif Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.8 +Version: 4.5.3 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -41,10 +48,10 @@ BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" # "friendsofphp/php-cs-fixer": "^2.17.1", -# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6", +# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", # "phpunit/php-invoker" : "^2.0 || ^3.1", -# "phpstan/phpstan": "^0.12 || ^1.12 || ^2.0" -BuildRequires: phpunit9 >= 9.6 +# "phpstan/phpstan": "^0.12" +BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 %endif # Autoloader @@ -87,7 +94,7 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch -P0 -p1 -b .rpm +%patch0 -p1 -b .rpm phpab -t fedora -o lib/autoload.php lib @@ -143,7 +150,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php82 php83 php84; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -166,48 +173,11 @@ exit $ret %endif %changelog -* Mon Jan 12 2026 Remi Collet - 4.5.8-1 -- update to 4.5.8 - -* Fri Jul 25 2025 Fedora Release Engineering - 4.5.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Apr 18 2025 Remi Collet - 4.5.7-1 -- update to 4.5.7 -- re-license spec file to CECILL-2.1 - -* Sat Jan 18 2025 Fedora Release Engineering - 4.5.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Oct 15 2024 Remi Collet - 4.5.6-1 -- update to 4.5.6 - -* Fri Jul 19 2024 Fedora Release Engineering - 4.5.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jul 3 2024 Remi Collet - 4.5.5-1 -- update to 4.5.5 - -* Thu Jan 25 2024 Fedora Release Engineering - 4.5.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 4.5.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Nov 9 2023 Remi Collet - 4.5.4-1 -- update to 4.5.4 - -* Fri Jul 21 2023 Fedora Release Engineering - 4.5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - * Wed Jan 25 2023 Remi Collet - 4.5.3-1 - update to 4.5.3 - allow sabre/xml v3 or v4 - switch to classmap autoloader -* Fri Jan 20 2023 Fedora Release Engineering - 4.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Mon Oct 10 2022 Remi Collet - 4.5.1-1 - update to 4.5.1 diff --git a/sources b/sources index 83fc031..aa51a9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.8-d554eb2.tgz) = 8e6af0c7069430561b3764e7bf1b4a87979732749f8628a014f34a728c426bcdd3548e56fe398e0c18ae0140a692f9c839ef1d7482e1e06c599fa813c27429d5 +SHA512 (php-sabre-vobject4-4.5.3-fe6d918.tgz) = 4aab893c740ae1a0b770ded667f95b06d02bf172bb4cfb82bb18e7dd604620e8009d3fe9c4b555fa228b72f002bfedf3a82dd9533c4093cef8b94e8ab2713c7a