v4.3.5

(cherry picked from commit 77254397a4)

.gitignore

@@ -9,3 +9,7 @@ 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

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

php-sabre-vobject4.spec

@@ -1,20 +1,21 @@
 # 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/
 #
 # Please, preserve the changelog entries
 #
 
+%bcond_without       tests
+
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    a7feca8311462e5da16952454e420b92c20d3586
+%global gh_commit    d8a0a9ae215a8acfb51afc29101c7344670b9c83
 %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,13 +25,14 @@
 
 Name:           php-sabre-vobject4
 Summary:        Library to parse and manipulate iCalendar and vCard objects
-Version:        4.3.1
-Release:        2%{?dist}
+Version:        4.3.5
+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
@@ -46,16 +48,23 @@ 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.17.1",
 #        "phpunit/phpunit" : "^7.5 || ^8.5 || ^9.0",
+#        "phpunit/php-invoker" : "^2.0 || ^3.1",
 #        "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 +136,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 +160,16 @@ exit $ret
 %endif
 
 %changelog
+* Mon Feb 15 2021 Remi Collet <remi@remirepo.net> - 4.3.5-1
+- update to 4.3.5
+
+* Thu Feb  4 2021 Remi Collet <remi@remirepo.net> - 4.3.4-1
+- update to 4.3.4
+- sources from git snapshot
+
+* Mon Nov  9 2020 Remi Collet <remi@remirepo.net> - 4.3.3-1
+- update to 4.3.3
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (php-sabre-vobject4-4.3.1-a7feca8.tar.gz) = 192d1d676a982a8c4193396860aa25dc97908d89866f12ae66c4f2943a59b39dfd1b0c77d375accd89e28e995237191bf0a830915af77563ee5844c7c96d960c
+SHA512 (php-sabre-vobject4-4.3.5-d8a0a9a.tgz) = 6380fe2e349a0d875847168500e45e5ca42b8e232af78d1b486650fd6e6382a643e51687cc4ae8f99e6dd21c202c70d9c330424608a860d816db289242f6e5ec