diff --git a/.gitignore b/.gitignore index 2e34d75..a05de35 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ gnome-commander-1.2.8.7.tar.bz2 /gnome-commander-1.12.0.tar.xz /gnome-commander-1.12.1.tar.xz /gnome-commander-1.12.2.tar.xz +/gnome-commander-20211118T1354.tar.gz diff --git a/create-gcmd-git-bare-tarball.sh b/create-gcmd-git-bare-tarball.sh index 6ec6fa7..8326c21 100644 --- a/create-gcmd-git-bare-tarball.sh +++ b/create-gcmd-git-bare-tarball.sh @@ -5,7 +5,7 @@ set -e REPONAME=gnome-commander GITURL=https://gitlab.gnome.org/GNOME/${REPONAME}.git -BRANCH=gcmd-1-12 +BRANCH=master DATE=$(date '+%Y%m%d') TIME=$(date '+%H%M') diff --git a/gnome-commander.spec b/gnome-commander.spec index ca265ac..b87febf 100644 --- a/gnome-commander.spec +++ b/gnome-commander.spec @@ -15,8 +15,8 @@ %global use_gcc_strict_sanitize 0 -%global use_release 1 -%global use_gitbare 0 +%global use_release 0 +%global use_gitbare 1 %if 0%{?use_gitbare} < 1 # force @@ -29,10 +29,10 @@ %endif %if 0%{?use_gitbare} -%global gittardate 20210319 -%global gittartime 1025 -%global gitbaredate 20210318 -%global git_rev 3ebb680e6a181d1dc6f7c3a188f3d5d90ff26d32 +%global gittardate 20211118 +%global gittartime 1354 +%global gitbaredate 20211117 +%global git_rev aa5b6b51f42b63a2dbba243878688490ecfd7a6d %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{gitbaredate}git%{git_short} @@ -41,7 +41,7 @@ %global shortver 1.12 %global fullver %{shortver}.2 -%global mainrel 2 +%global mainrel 2.1 %if 0%{?use_release} >= 1 %global fedorarel %{?prever:0.}%{mainrel}%{?prever:.%{prerpmver}} diff --git a/sources b/sources index add081b..0d0aa89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-commander-1.12.2.tar.xz) = 0f56450a09fcf8a73cc31e91564b133fd5fd199ea75c9376a2c329e070554c2c3ae4916f899940f92ddea5fff29656c9485a207dd22a28f1cda12a46f4cab32c +SHA512 (gnome-commander-20211118T1354.tar.gz) = 96d56b23cc4bdde941679696039a2fa01b6669f47cbf8322f1dceed80aeadc95d307ab183521adec8d9c81e70a97a8b0f3f959359bd61e8268ac297671648c5c