From 66b64a58f3ded18c0b48d415896fe403d1f2a689 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 17 Mar 2021 10:36:28 +0100
Subject: [PATCH] v9.5.3

---
 .gitignore    |  1 +
 makesrc.sh    | 36 ++++++++++++++++++++----------------
 phpunit9.spec | 17 +++++++++++------
 sources       |  2 +-
 4 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd17330..50f63fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /phpunit9-9.4.4-6535e63.tgz
 /phpunit9-9.5.0-8e16c22.tgz
 /phpunit9-9.5.2-f661659.tgz
+/phpunit9-9.5.3-27241ac.tgz
diff --git a/makesrc.sh b/makesrc.sh
index 8152336..3580b58 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -1,28 +1,32 @@
 #!/bin/bash
 
 NAME=$(basename $PWD)
-OWNER=$(sed   -n '/^%global gh_vendor/{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 '/^Version:/{s/.* //;p}'           $NAME.spec)
+VERSION=$(sed -n '/^%global upstream_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"
+if [ -f $NAME-$VERSION-$SHORT.tgz ]; then
+	echo "$NAME-$VERSION-$SHORT.tgz 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 "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 "Getting commit..."
+	pushd $PROJECT-$COMMIT
+		git checkout $COMMIT || exit1
+		cp composer.json ../composer.json
+	popd
 
-echo "Archiving..."
-tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
+	echo "Archiving..."
+	tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
 
-echo "Cleaning..."
-rm -rf $PROJECT-$COMMIT
+	echo "Cleaning..."
+	rm -rf $PROJECT-$COMMIT
 
-echo "Done."
+	echo "Done."
+fi
diff --git a/phpunit9.spec b/phpunit9.spec
index b10b22b..c3f7a85 100644
--- a/phpunit9.spec
+++ b/phpunit9.spec
@@ -11,10 +11,10 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    f661659747f2f87f9e72095bb207bceb0f151cb4
+%global gh_commit    27241ac75fc37ecf862b6e002bf713b6566cbe41
 #global gh_date      20150927
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_vendor    sebastianbergmann
+%global gh_owner     sebastianbergmann
 %global gh_project   phpunit
 # Packagist
 %global pk_vendor    phpunit
@@ -24,16 +24,18 @@
 %global php_home     %{_datadir}/php
 %global ver_major    9
 %global ver_minor    5
-%global specrel      1
+
+%global upstream_version 9.5.3
+#global upstream_prever  dev
 
 Name:           %{pk_project}%{ver_major}
-Version:        9.5.2
-Release:        %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
+Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Release:        1%{?dist}
 Summary:        The PHP Unit Testing framework version %{ver_major}
 
 License:        BSD
 URL:            https://github.com/%{gh_vendor}/%{gh_project}
-Source0:        %{name}-%{version}-%{gh_short}.tgz
+Source0:        %{name}-%{upstream_version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
 # Fix command for autoload
@@ -247,6 +249,9 @@ exit $ret
 
 
 %changelog
+* Wed Mar 17 2021 Remi Collet <remi@remirepo.net> - 9.5.3-1
+- update to 9.5.3
+
 * Wed Feb  3 2021 Remi Collet <remi@remirepo.net> - 9.5.2-1
 - update to 9.5.2
 
diff --git a/sources b/sources
index b4ca32c..17cdf1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (phpunit9-9.5.2-f661659.tgz) = c8879717ea9adf5e4ad7317253cf7b0dc8eb9bb3d1357a145e79dd20d2f495fa07b5bd6f9b0b5a4b81d2c9a9068e1258c2db8d6089c702960448a5b8ff9c96d6
+SHA512 (phpunit9-9.5.3-27241ac.tgz) = e1ea3783d045590dcee6f3ccb4971cd33062e670607f1bfeb4b13b60520451d46d771d4edc707abe938bb49c1f2d4cc5631223b1a0fcec0e930b612930f73508