diff --git a/.gitignore b/.gitignore index 945f339..7dc7872 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,21 @@ clog /php-sabre-vobject4-4.2.2-449616b.tar.gz /php-sabre-vobject4-4.3.0-5b2248d.tar.gz /php-sabre-vobject4-4.3.1-a7feca8.tar.gz +/php-sabre-vobject4-4.3.2-e17daaf.tar.gz +/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/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..f9982c6 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +if [ -f $NAME-$VERSION-$SHORT.tgz ]; then + echo "Already there." +else + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + + echo "Cloning..." + rm -rf $PROJECT-$COMMIT + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + + echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || exit 1 + cp composer.json ../composer.json + popd + + echo "Archiving..." + tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT + + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT + + echo "Done." +fi 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.3.1 -Release: 2%{?dist} +Version: 4.5.8 +Release: 1%{?dist} URL: http://sabre.io/vobject/ -License: BSD -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz -Source1: %{name}-autoload.php +License: BSD-3-Clause +Source0: %{name}-%{version}-%{gh_short}.tgz +Source2: makesrc.sh # replace composer autloader Patch0: %{name}-bin.patch @@ -39,29 +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.16.1", -# "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", -# "phpstan/phpstan": "^0.12" -BuildRequires: phpunit8 >= 8.5 -# Autoloader -BuildRequires: php-composer(fedora/autoloader) +# "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 || ^1.12 || ^2.0" +BuildRequires: phpunit9 >= 9.6 +%global phpunit %{_bindir}/phpunit9 %endif +# Autoloader +BuildRequires: php-fedora-autoloader-devel # From composer.json, "require" -# "php" : "^7.1", +# "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 @@ -91,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 @@ -115,21 +123,30 @@ 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)).)*$' $opt" + opt="--filter '^((?!(testNeverEnding|testGeneratorBaseObject|testDailyBySetPosLoop|testYearlyBySetPosLoop)).)*$' $opt" fi : Run upstream test suite against installed library ret=0 -for cmd in php php72 php73 php74 php80; do - if which $cmd; then - $cmd %{_bindir}/phpunit8 $opt || ret=1 +for cmdarg in "php %{phpunit}" php82 php83 php84; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 fi done exit $ret @@ -139,7 +156,6 @@ exit $ret %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *md %doc composer.json @@ -150,6 +166,100 @@ 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 + +* Thu Feb 4 2021 Remi Collet - 4.3.4-1 +- 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 a4c489b..83fc031 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.1-a7feca8.tar.gz) = 192d1d676a982a8c4193396860aa25dc97908d89866f12ae66c4f2943a59b39dfd1b0c77d375accd89e28e995237191bf0a830915af77563ee5844c7c96d960c +SHA512 (php-sabre-vobject4-4.5.8-d554eb2.tgz) = 8e6af0c7069430561b3764e7bf1b4a87979732749f8628a014f34a728c426bcdd3548e56fe398e0c18ae0140a692f9c839ef1d7482e1e06c599fa813c27429d5