From 77e1f02c7b8f1b1a50833adac2e8a41fa212086a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Oct 2020 10:23:38 +0200 Subject: [PATCH 1/3] v4.3.3 --- .gitignore | 2 ++ php-sabre-vobject4.spec | 31 +++++++++++++++++++++---------- sources | 2 +- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 945f339..7324ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ 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 diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 2f47416..413cb7c 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -7,14 +7,15 @@ # Please, preserve the changelog entries # +%bcond_without tests + # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a7feca8311462e5da16952454e420b92c20d3586 +%global gh_commit 58f9f9b46a1080c0130bd86f4df9a568aacb9c79 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject -%bcond_without tests %if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 %global with_cmd 1 @@ -24,8 +25,8 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.1 -Release: 2%{?dist} +Version: 4.3.3 +Release: 1%{?dist} URL: http://sabre.io/vobject/ License: BSD @@ -46,16 +47,22 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "friendsofphp/php-cs-fixer": "~2.16.1", +# "friendsofphp/php-cs-fixer": "~2.16.7", # "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0", # "phpstan/phpstan": "^0.12" -BuildRequires: phpunit8 >= 8.5 +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit9 +%else +BuildRequires: phpunit8 +%global phpunit %{_bindir}/phpunit8 +%endif # Autoloader BuildRequires: php-composer(fedora/autoloader) %endif # From composer.json, "require" -# "php" : "^7.1", +# "php" : "^7.1 || ^8.0", # "ext-mbstring" : "*", # "sabre/xml" : "^2.1" Requires: php(language) >= 7.1 @@ -127,9 +134,10 @@ 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}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit9} $opt || ret=1 fi done exit $ret @@ -150,6 +158,9 @@ exit $ret %endif %changelog +* Mon Nov 9 2020 Remi Collet - 4.3.3-1 +- update to 4.3.3 + * 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..eb4abd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.1-a7feca8.tar.gz) = 192d1d676a982a8c4193396860aa25dc97908d89866f12ae66c4f2943a59b39dfd1b0c77d375accd89e28e995237191bf0a830915af77563ee5844c7c96d960c +SHA512 (php-sabre-vobject4-4.3.3-58f9f9b.tar.gz) = 9b77d6a6e0b4c9cdf38cb6f48ab0ccdde3e08cdd221fd64c14dbbc9df85ae20f6140f2183ad871b29fbd86bbf57c44047fc9d2180b42b68733def4be9861bfea From 70a55f571869314db64485c9324215468b50856c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Feb 2021 11:47:37 +0100 Subject: [PATCH 2/3] update to 4.3.4 sources from git snapshot (cherry picked from commit effbc4b28f630bdcaf18db42c3783cd9aebae5c8) --- .gitignore | 1 + makesrc.sh | 32 ++++++++++++++++++++++++++++++++ php-sabre-vobject4.spec | 16 +++++++++++----- sources | 2 +- 4 files changed, 45 insertions(+), 6 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index 7324ee1..65f3209 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /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 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.spec b/php-sabre-vobject4.spec index 413cb7c..73def83 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sabre-vobject4 # -# Copyright (c) 2013-2019 Remi Collet +# Copyright (c) 2013-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 58f9f9b46a1080c0130bd86f4df9a568aacb9c79 +%global gh_commit 3168acd7c22fa3c96cb115539f93b59818ba1f06 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,13 +25,14 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.3 +Version: 4.3.4 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 +Source0: %{name}-%{version}-%{gh_short}.tgz Source1: %{name}-autoload.php +Source2: makesrc.sh # replace composer autloader Patch0: %{name}-bin.patch @@ -47,8 +48,9 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xml # From composer.json, "require-dev" -# "friendsofphp/php-cs-fixer": "~2.16.7", +# "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" %if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 BuildRequires: phpunit9 @@ -158,6 +160,10 @@ exit $ret %endif %changelog +* Thu Feb 4 2021 Remi Collet - 4.3.4-1 +- update to 4.3.4 +- sources from git snapshot + * Mon Nov 9 2020 Remi Collet - 4.3.3-1 - update to 4.3.3 diff --git a/sources b/sources index eb4abd4..e8491f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.3-58f9f9b.tar.gz) = 9b77d6a6e0b4c9cdf38cb6f48ab0ccdde3e08cdd221fd64c14dbbc9df85ae20f6140f2183ad871b29fbd86bbf57c44047fc9d2180b42b68733def4be9861bfea +SHA512 (php-sabre-vobject4-4.3.4-3168acd.tgz) = cf1c84b1e4e68bedc91a18f07ea0408c94c6008e331598ca7d390bd253e8c33ecc74f4b2ae9f87f9e925f42b2cb953d4229508388472ef7efc447598521d8884 From 84fb18e324bd167ea725c358332ec7b10b6e9878 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Feb 2021 12:07:33 +0100 Subject: [PATCH 3/3] v4.3.5 (cherry picked from commit 77254397a408920cd3cf231c1be681b640135ddb) --- .gitignore | 1 + php-sabre-vobject4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 65f3209..c4af56e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /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 diff --git a/php-sabre-vobject4.spec b/php-sabre-vobject4.spec index 73def83..bc365fb 100644 --- a/php-sabre-vobject4.spec +++ b/php-sabre-vobject4.spec @@ -12,7 +12,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 3168acd7c22fa3c96cb115539f93b59818ba1f06 +%global gh_commit d8a0a9ae215a8acfb51afc29101c7344670b9c83 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sabre-io %global gh_project vobject @@ -25,7 +25,7 @@ Name: php-sabre-vobject4 Summary: Library to parse and manipulate iCalendar and vCard objects -Version: 4.3.4 +Version: 4.3.5 Release: 1%{?dist} URL: http://sabre.io/vobject/ @@ -160,6 +160,9 @@ exit $ret %endif %changelog +* 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 diff --git a/sources b/sources index e8491f1..d1b49e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sabre-vobject4-4.3.4-3168acd.tgz) = cf1c84b1e4e68bedc91a18f07ea0408c94c6008e331598ca7d390bd253e8c33ecc74f4b2ae9f87f9e925f42b2cb953d4229508388472ef7efc447598521d8884 +SHA512 (php-sabre-vobject4-4.3.5-d8a0a9a.tgz) = 6380fe2e349a0d875847168500e45e5ca42b8e232af78d1b486650fd6e6382a643e51687cc4ae8f99e6dd21c202c70d9c330424608a860d816db289242f6e5ec