From ea1bb05035046ea03fbb18e27a96e2edcd491230 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 24 Apr 2024 11:13:25 +0200
Subject: [PATCH] v10.5.20

(cherry picked from commit 51de57045c59ee215b1cfd4ad3a9543dc0896ba9)
---
 .gitignore     | 1 +
 makesrc.sh     | 6 ++++--
 phpunit10.spec | 9 ++++++---
 sources        | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7eff6ba..a2a3b80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /phpunit10-10.5.17-c1f736a.tgz
 /phpunit10-10.5.18-835df17.tgz
 /phpunit10-10.5.19-c726f0d.tgz
+/phpunit10-10.5.20-547d314.tgz
diff --git a/makesrc.sh b/makesrc.sh
index c85b319..04ad6a0 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -5,10 +5,12 @@ DATE=$(sed    -n '/^%global gh_date/{s/.* //;p}'    $NAME.spec)
 OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
 PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
 VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec)
+MAJOR=$(sed   -n '/^%global ver_major/{s/.* //;p}'  $NAME.spec)
+MINOR=$(sed   -n '/^%global ver_minor/{s/.* //;p}'  $NAME.spec)
 COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
 SHORT=${COMMIT:0:7}
 
-DATE=$(date -d "$DATE -4 days" +%Y-%m-%d)
+DATE=$(date -d "$DATE -1 week" +%Y-%m-%d)
 
 if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
 	echo "$NAME-$VERSION-$SHORT.tgz already there"
@@ -17,7 +19,7 @@ else
 
 	echo "Cloning..."
 	rm -rf $PROJECT-$COMMIT
-	git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1
+	git clone --branch $MAJOR.$MINOR --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1
 
 	echo "Getting commit..."
 	pushd $PROJECT-$COMMIT
diff --git a/phpunit10.spec b/phpunit10.spec
index 8fd0966..7b1de60 100644
--- a/phpunit10.spec
+++ b/phpunit10.spec
@@ -17,8 +17,8 @@
 %bcond_with          defcmd
 %endif
 
-%global gh_commit    c726f0de022368f6ed103e452a765d3304a996a4
-%global gh_date      2024-04-17
+%global gh_commit    547d314dc24ec1e177720d45c6263fb226cc2ae3
+%global gh_date      2024-04-24
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   phpunit
@@ -31,7 +31,7 @@
 %global ver_major    10
 %global ver_minor    5
 
-%global upstream_version 10.5.19
+%global upstream_version 10.5.20
 #global upstream_prever  dev
 
 Name:           %{pk_project}%{ver_major}
@@ -270,6 +270,9 @@ exit $ret
 
 
 %changelog
+* Wed Apr 24 2024 Remi Collet <remi@remirepo.net> - 10.5.20-1
+- update to 10.5.20
+
 * Thu Apr 18 2024 Remi Collet <remi@remirepo.net> - 10.5.19-1
 - update to 10.5.19
 
diff --git a/sources b/sources
index 53064f1..c82920f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (phpunit10-10.5.19-c726f0d.tgz) = 7edf918536e04cddce89d92a7375a149ba2c25a9fd30839f778ea22d4ea82ca522133f035d3d07afc744909bb1a69a6571983e0fb21c1da4193658cdd2f7fb4e
+SHA512 (phpunit10-10.5.20-547d314.tgz) = 49366edfde85452b203e63a8463613386a7015e9e3a57a524cd97ae536dd6003183057818e52aa4058dd874c7a9e66657db7e437ab6e692150921faa6a4ec978