diff --git a/cairo-dock-create-fedora-tarball.sh b/cairo-dock-create-fedora-tarball.sh index 686e659..f3f1970 100644 --- a/cairo-dock-create-fedora-tarball.sh +++ b/cairo-dock-create-fedora-tarball.sh @@ -5,7 +5,6 @@ set -x umask 0022 -VERSION=${VERSION:-3.5.0} VERSION_PARENT=${VERSION%.[0-9]} @@ -18,7 +17,6 @@ GIT_URL=https://github.com/Cairo-Dock/${REPONAME}.git CURRENT_DIR=$(pwd) TMPDIR=$(mktemp -d /var/tmp/${REPONAME}-XXXXXX) -GITTAR_VERSION=${VERSION} FEDORA_TAR_VERSION=${VERSION} pushd $TMPDIR @@ -33,6 +31,12 @@ if [ "x${USE_GIT}" != "x" ] ; then GITDAME_B="$(date -d "${GITDATE}" '+%Y%m%d')" GITHASH="$(git log -1 | sed -n -e 's|^commit[ \t]||p')" SHORTHASH=$(echo ${GITHASH:0:7}) + + if [ "x${VERSION}" = "x" ] ; then + VERSION=$(cat CMakeLists.txt | sed -n -e 's|^.*set.*VERSION "||p' | sed -e 's|".*||') + fi + + cd .. cd .. @@ -42,6 +46,11 @@ else true fi +VERSION=${VERSION:-3.5.0} +if [ "x${GITTAR_VERSION}" = x ] ; then + GITTAR_VERSION=${VERSION} +fi + TARBALL_NAME=${TARNAME}-${FEDORA_TAR_VERSION}.tar.gz SOURCE_URL=${SOURCE_TOP_URL}/${GITTAR_VERSION}/${TARBALL_NAME} diff --git a/cairo-dock.spec b/cairo-dock.spec index 7d63fff..5594dd5 100644 --- a/cairo-dock.spec +++ b/cairo-dock.spec @@ -4,8 +4,8 @@ %global plugin_least_ver 3.6.0 %global use_git 1 -%global gitdate 20251221 -%global githash 2d4b9c9b10e639ee46b73b171101550666890220 +%global gitdate 20251222 +%global githash 528820110a3c085ba1f6a421c4d1886a3bc86e2c %global shorthash %(c=%{githash} ; echo ${c:0:7}) %global tarballver %{mainver}%{?use_git:-%{gitdate}git%{shorthash}} diff --git a/sources b/sources index 76c4236..043080c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cairo-dock-fedora-3.6.94-20251221git2d4b9c9.tar.gz) = ff509deea8be67f3998fc8bfa0a0631023caed15a0f81fb9c2007dcff86a5e631c183693019d3a99adbea7e0cf075f61b7c07618e20500c59f11776b9ac564cb +SHA512 (cairo-dock-fedora-3.6.94-20251222git5288201.tar.gz) = e4542af82175db8aba61aa97938567324405dfc39767f42cdac04690b0f8390fdf90ab2c253880ed65f3914b5f531a5d115e1b82823749f6e982cc453043bd38