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 f8b8cd9..d6ad63b 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 -Release: 2%{?dist} +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 + * Wed Jan 27 2021 Fedora Release Engineering - 4.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild 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