diff --git a/.gitignore b/.gitignore index 7dc7872..c4af56e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,17 +13,3 @@ clog /php-sabre-vobject4-4.3.3-58f9f9b.tar.gz /php-sabre-vobject4-4.3.4-3168acd.tgz /php-sabre-vobject4-4.3.5-d8a0a9a.tgz -/php-sabre-vobject4-4.3.7-c3fa8c8.tgz -/php-sabre-vobject4-4.3.8-a7460c5.tgz -/php-sabre-vobject4-4.4.0-0a2e27c.tgz -/php-sabre-vobject4-4.4.1-06feff3.tgz -/php-sabre-vobject4-4.4.2-b8a44ea.tgz -/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 new file mode 100644 index 0000000..57829aa --- /dev/null +++ b/php-sabre-vobject4-autoload.php @@ -0,0 +1,10 @@ += 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.3.5 Release: 1%{?dist} URL: http://sabre.io/vobject/ -License: BSD-3-Clause +License: BSD Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: %{name}-autoload.php Source2: makesrc.sh # replace composer autloader @@ -33,31 +41,36 @@ 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) < 5) +BuildRequires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) 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.6", +# "friendsofphp/php-cs-fixer": "~2.17.1", +# "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" +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +BuildRequires: phpunit9 %global phpunit %{_bindir}/phpunit9 +%else +BuildRequires: phpunit8 +%global phpunit %{_bindir}/phpunit8 %endif # Autoloader -BuildRequires: php-fedora-autoloader-devel +BuildRequires: php-composer(fedora/autoloader) +%endif # From composer.json, "require" # "php" : "^7.1 || ^8.0", # "ext-mbstring" : "*", -# "sabre/xml" : "^2.1 || ^3.0 || ^4.0" +# "sabre/xml" : "^2.1" Requires: php(language) >= 7.1 Requires: php-mbstring # -Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 5) +Requires: (php-composer(sabre/xml) >= 2.1 with php-composer(sabre/xml) < 3) # From phpcompatinfo report for version 4.1.2 %if %{with_cmd} Requires: php-cli @@ -87,21 +100,9 @@ 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 - -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 +cp %{SOURCE1} lib/autoload.php %build @@ -123,27 +124,19 @@ install -Dpm 0755 bin/generate_vcards \ %check +%if %{with tests} : Fix bootstrap cd tests sed -e 's:@BUILDROOT@:%{buildroot}:' -i bootstrap.php -: Check version -php -r ' -require "%{_datadir}/php/Fedora/Autoloader/autoload.php"; -require "bootstrap.php"; -echo Sabre\VObject\Version::VERSION . "\n"; -exit (Sabre\VObject\Version::VERSION === "%{version}" ? 0 : 1); -' - -%if %{with tests} opt="--verbose" if [ $(php -r 'echo PHP_INT_SIZE;') -lt 8 ]; then - opt="--filter '^((?!(testNeverEnding|testGeneratorBaseObject|testDailyBySetPosLoop|testYearlyBySetPosLoop)).)*$' $opt" + opt="--filter '^((?!(testNeverEnding)).)*$' $opt" fi : Run upstream test suite against installed library ret=0 -for cmdarg in "php %{phpunit}" 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} $opt || ret=1 @@ -156,6 +149,7 @@ exit $ret %files +%{!?_licensedir:%global license %%doc} %license LICENSE %doc *md %doc composer.json @@ -166,84 +160,6 @@ 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 - -* Thu Aug 18 2022 Remi Collet - 4.5.0-1 -- update to 4.5.0 - -* Fri Jul 22 2022 Fedora Release Engineering - 4.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jul 18 2022 Remi Collet - 4.4.3-1 -- update to 4.4.3 - -* Fri Jun 24 2022 Remi Collet - 4.4.2-1 -- update to 4.4.2 - -* Fri Jan 21 2022 Fedora Release Engineering - 4.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Dec 7 2021 Remi Collet - 4.4.1-1 -- update to 4.4.1 - -* Tue Nov 16 2021 Remi Collet - 4.4.0-1 -- update to 4.4.0 - -* Mon Nov 15 2021 Remi Collet - 4.3.8-1 -- update to 4.3.8 - -* Thu Nov 4 2021 Remi Collet - 4.3.7-1 -- update to 4.3.7 - -* Mon Jul 26 2021 Remi Collet - 4.3.5-3 -- ignore 1 more test failing on 32-bit - -* Fri Jul 23 2021 Fedora Release Engineering - 4.3.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Mon Feb 15 2021 Remi Collet - 4.3.5-1 - update to 4.3.5 @@ -251,15 +167,9 @@ exit $ret - update to 4.3.4 - sources from git snapshot -* Wed Jan 27 2021 Fedora Release Engineering - 4.3.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - * Mon Nov 9 2020 Remi Collet - 4.3.3-1 - update to 4.3.3 -* Mon Oct 5 2020 Remi Collet - 4.3.2-1 -- update to 4.3.2 - * Tue Jul 28 2020 Fedora Release Engineering - 4.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 83fc031..d1b49e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.5.8-d554eb2.tgz) = 8e6af0c7069430561b3764e7bf1b4a87979732749f8628a014f34a728c426bcdd3548e56fe398e0c18ae0140a692f9c839ef1d7482e1e06c599fa813c27429d5 +SHA512 (php-sabre-vobject4-4.3.5-d8a0a9a.tgz) = 6380fe2e349a0d875847168500e45e5ca42b8e232af78d1b486650fd6e6382a643e51687cc4ae8f99e6dd21c202c70d9c330424608a860d816db289242f6e5ec