From ddec44a1280ef77b5d8c0912eeb5717830c4efad Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Sep 2022 14:18:49 +0200 Subject: [PATCH 1/2] v3.0.4 (cherry picked from commit 49be52323490114149895f512c09e5134812a474) --- .gitignore | 1 + php-sebastian-comparator3.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 88aeaf2..75fd8d0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-sebastian-comparator3-3.0.1-591a309.tar.gz /php-sebastian-comparator3-3.0.2-5de4fc1.tar.gz /php-sebastian-comparator3-3.0.3-1071dfc.tar.gz +/php-sebastian-comparator3-3.0.4-c05dd18.tar.gz diff --git a/php-sebastian-comparator3.spec b/php-sebastian-comparator3.spec index 97461e4..8ade29a 100644 --- a/php-sebastian-comparator3.spec +++ b/php-sebastian-comparator3.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 1071dfcef776a57013124ff35e1fc41ccd294758 +%global gh_commit c05dd1878ec74058a28a569c59fc5c53a8cc1c7a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project comparator @@ -24,8 +24,8 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.3 -Release: 4%{?dist} +Version: 3.0.4 +Release: 1%{?dist} Summary: Compare PHP values for equality License: BSD @@ -96,7 +96,7 @@ mkdir vendor : Run upstream test suite ret=0 -for cmd in php php72 php73 php74 php80; do +for cmd in php php74 php80 php81 php82; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit8 --no-coverage --verbose || ret=1 @@ -117,6 +117,9 @@ exit $ret %changelog +* Wed Sep 14 2022 Remi Collet - 3.0.4-1 +- update to 3.0.4 + * Fri Jan 21 2022 Fedora Release Engineering - 3.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 648f275..014d214 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-comparator3-3.0.3-1071dfc.tar.gz) = 14f70c7ff6c6e29434d98b66c75a80956ec5c10199e0e82712ffc9e4453f0a2efc5d34daad3345fb8fbfb57ada74e0bd172b77cfe957ec71681a8c8f1dece5b2 +SHA512 (php-sebastian-comparator3-3.0.4-c05dd18.tar.gz) = a25d7ec2ccff6ef3a5c85e3df11d585ef93098d6d9b053392ed0d5a93cd628685b67f47aa0e167aef47ab0b8188661076c1d089e910399e5996dc0e3b3624901 From 1434ffd26d3532f5a8cf37d426b3e1a741acf585 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Sep 2022 15:09:32 +0200 Subject: [PATCH 2/2] update to 3.0.5 sources from git snapshot (cherry picked from commit d976cda537445094641cd1ce4de43013805f586e) --- .gitignore | 1 + makesrc.sh | 28 ++++++++++++++++++++++++++++ php-sebastian-comparator3.spec | 13 +++++++++---- sources | 2 +- 4 files changed, 39 insertions(+), 5 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index 75fd8d0..26bd91d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /php-sebastian-comparator3-3.0.2-5de4fc1.tar.gz /php-sebastian-comparator3-3.0.3-1071dfc.tar.gz /php-sebastian-comparator3-3.0.4-c05dd18.tar.gz +/php-sebastian-comparator3-3.0.5-1dc7ceb.tgz diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..4190c13 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/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} + +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 +cp composer.json ../composer.json +popd + +echo "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." diff --git a/php-sebastian-comparator3.spec b/php-sebastian-comparator3.spec index 8ade29a..60c7ce1 100644 --- a/php-sebastian-comparator3.spec +++ b/php-sebastian-comparator3.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-sebastian-comparator3 # -# Copyright (c) 2014-2018 Remi Collet +# Copyright (c) 2014-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit c05dd1878ec74058a28a569c59fc5c53a8cc1c7a +%global gh_commit 1dc7ceb4a24aede938c7af2a9ed1de09609ca770 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project comparator @@ -24,13 +24,14 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.0.4 +Version: 3.0.5 Release: 1%{?dist} Summary: Compare PHP values for equality License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh BuildArch: noarch BuildRequires: php(language) >= 7.1 @@ -117,6 +118,10 @@ exit $ret %changelog +* Wed Sep 14 2022 Remi Collet - 3.0.5-1 +- update to 3.0.5 +- sources from git snapshot + * Wed Sep 14 2022 Remi Collet - 3.0.4-1 - update to 3.0.4 diff --git a/sources b/sources index 014d214..485b464 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-comparator3-3.0.4-c05dd18.tar.gz) = a25d7ec2ccff6ef3a5c85e3df11d585ef93098d6d9b053392ed0d5a93cd628685b67f47aa0e167aef47ab0b8188661076c1d089e910399e5996dc0e3b3624901 +SHA512 (php-sebastian-comparator3-3.0.5-1dc7ceb.tgz) = 3b43e127642a6627e2bc40094b49aca7525ee791440b65b420b7ccc3a1736be3b7230eb8172089768787e2b2f34c3c9e1953f565c7cad22033c6cdca5ada8621