summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-03-17 10:18:21 +0100
committerRemi Collet <remi@remirepo.net>2021-03-17 10:18:21 +0100
commit6b00c2b3db43d8bd4d2436a36a19a9f88ccaa859 (patch)
tree4571dbb7a0f0102317f8fc9028f7ac5a80e8813c
parent5002a1eb299dfc8c09577aaca0efeb248c5e0021 (diff)
update to 9.5.3
-rwxr-xr-xmakesrc.sh36
-rw-r--r--phpunit9.spec17
2 files changed, 31 insertions, 22 deletions
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 5fc2136..7210c37 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
@@ -301,6 +303,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