diff --git a/.gitignore b/.gitignore index 74b034d..7dc7872 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,9 @@ clog /php-sabre-vobject4-4.4.3-2a043b9.tgz /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-autoload.php b/php-sabre-vobject4-autoload.php deleted file mode 100644 index 57829aa..0000000 --- a/php-sabre-vobject4-autoload.php +++ /dev/null @@ -1,10 +0,0 @@ -= 26 || 0%{?rhel} >= 8 -%global with_cmd 1 -%else -%global with_cmd 0 -%endif +%global with_cmd 1 Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.5.1 +Version: 4.5.8 Release: 1%{?dist} URL: http://sabre.io/vobject/ -License: BSD +License: BSD-3-Clause Source0: %{name}-%{version}-%{gh_short}.tgz -Source1: %{name}-autoload.php Source2: makesrc.sh # replace composer autloader @@ -41,31 +33,31 @@ BuildArch: noarch %if %{with tests} BuildRequires: php(language) >= 7.1 BuildRequires: php-mbstring -BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 5) BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre 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.0", +# "friendsofphp/php-cs-fixer": "^2.17.1", +# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.6", # "phpunit/php-invoker" : "^2.0 || ^3.1", -# "phpstan/phpstan": "^0.12" -BuildRequires: phpunit9 +# "phpstan/phpstan": "^0.12 || ^1.12 || ^2.0" +BuildRequires: phpunit9 >= 9.6 %global phpunit %{_bindir}/phpunit9 -# Autoloader -BuildRequires: php-composer(fedora/autoloader) %endif +# Autoloader +BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" # "php" : "^7.1 || ^8.0", # "ext-mbstring" : "*", -# "sabre/xml" : "^2.1" +# "sabre/xml" : "^2.1 || ^3.0 || ^4.0" Requires: php(language) >= 7.1 Requires: php-mbstring # -Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) +Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 5) # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli @@ -95,9 +87,21 @@ Autoloader: %{_datadir}/php/Sabre/VObject4/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -b .rpm +%patch -P0 -p1 -b .rpm -cp %{SOURCE1} lib/autoload.php +phpab -t fedora -o lib/autoload.php lib + +cat << 'EOF' | tee -a lib/autoload.php + +// Dependencies +\Fedora\Autoloader\Dependencies::required([ + [ + '%{_datadir}/php/Sabre/Xml4/autoload.php', + '%{_datadir}/php/Sabre/Xml3/autoload.php', + '%{_datadir}/php/Sabre/Xml2/autoload.php', + ], +]); +EOF %build @@ -139,7 +143,7 @@ fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do +for cmdarg in "php %{phpunit}" php82 php83 php84; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 @@ -162,6 +166,48 @@ 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 b512811..83fc031 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.1-1f83674.tgz) = 2d6df21a8ef43b155f139105b662cb4ae84374110aa4187324fd775b5d71cd05fc467efe1a95dadd07b755585cf2c1bd63095a22e8747548c021be7dad1adcd2 +SHA512 (php-sabre-vobject4-4.5.8-d554eb2.tgz) = 8e6af0c7069430561b3764e7bf1b4a87979732749f8628a014f34a728c426bcdd3548e56fe398e0c18ae0140a692f9c839ef1d7482e1e06c599fa813c27429d5