From b17dcf1ade983dd04fe9428974f07e67a566d982 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Jan 03 2021 02:29:31 +0000
Subject: Update to the latest git


---

diff --git a/.gitignore b/.gitignore
index cf27758..088e58b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 cairo-dock-sources-svn1527_trunk.tar.bz2
 /cairo-dock-fedora-3.4.0.tar.gz
 /cairo-dock-fedora-3.4.1.tar.gz
+/cairo-dock-fedora-3.4.1-20201103git0836f5d.tar.gz
diff --git a/cairo-dock-create-fedora-tarball.sh b/cairo-dock-create-fedora-tarball.sh
index b1c5798..9fe70da 100644
--- a/cairo-dock-create-fedora-tarball.sh
+++ b/cairo-dock-create-fedora-tarball.sh
@@ -8,21 +8,52 @@ umask 0022
 VERSION=${VERSION:-3.4.0}
 VERSION_PARENT=${VERSION%.[0-9]}
 
+
+REPONAME=cairo-dock-core
+TARNAME=cairo-dock
+
+SOURCE_TOP_URL=https://github.com/Cairo-Dock/${REPONAME}/archive/
+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}
 
-TMPDIR=$(mktemp -d /var/tmp/cairo-dock-XXXXXX)
 pushd $TMPDIR
 
-#wget -N http://launchpad.net/cairo-dock-core/${VERSION_PARENT}/${VERSION}/+download/cairo-dock-${VERSION}.tar.gz
-wget -N https://github.com/Cairo-Dock/cairo-dock-core/archive/${VERSION}/cairo-dock-${VERSION}.tar.gz
-rm -rf cairo-dock-${VERSION}
-tar xzf cairo-dock-${VERSION}.tar.gz
+if [ "x${USE_GIT}" != "x" ] ; then
+	mkdir HASH
+	cd HASH
+
+	git clone --depth 1 ${GIT_URL}
+	cd ${REPONAME}
+	GITDATE=$(git log | sed -n -e 's|^Date:[ \t]*||p' | sed -e 's| \([+-][0-9][0-9]*\)$| UTC\1|')
+	GITDAME_B="$(date -d "${GITDATE}" '+%Y%m%d')"
+	GITHASH="$(git log | sed -n -e 's|^commit[ \t]||p')"
+	SHORTHASH=$(echo ${GITHASH:0:7})
+	cd ..
+	cd ..
+
+	GITTAR_VERSION=${GITHASH}
+	FEDORA_TAR_VERSION=${VERSION}-${GITDAME_B}git${SHORTHASH}
+else
+	true
+fi
+
+TARBALL_NAME=${TARNAME}-${FEDORA_TAR_VERSION}.tar.gz
+SOURCE_URL=${SOURCE_TOP_URL}/${GITTAR_VERSION}/${TARBALL_NAME}
+
+wget -N ${SOURCE_URL}
+rm -rf ${TARNAME}-${GITTAR_VERSION}
+tar xzf ${TARBALL_NAME}
 
-if [ -d cairo-dock-core-${VERSION} ] ; then
-	mv cairo-dock{-core,}-${VERSION}
+if [ -d ${REPONAME}-${GITTAR_VERSION} ] ; then
+	mv ${REPONAME}-${GITTAR_VERSION} ${TARNAME}-${FEDORA_TAR_VERSION}
 fi
 
-pushd cairo-dock-${VERSION}
+pushd ${TARNAME}-${FEDORA_TAR_VERSION}
 
 set +x
 echo -n -e "Modifying source \t"
@@ -62,8 +93,8 @@ echo "done"
 set -x
 popd
 
-tar czf cairo-dock-fedora-${VERSION}.tar.gz cairo-dock-${VERSION}/
-mv cairo-dock-fedora-${VERSION}.tar.gz ${CURRENT_DIR}/
+tar czf ${TARNAME}-fedora-${FEDORA_TAR_VERSION}.tar.gz ${TARNAME}-${FEDORA_TAR_VERSION}/
+mv ${TARNAME}-fedora-${FEDORA_TAR_VERSION}.tar.gz ${CURRENT_DIR}/
 
 popd
 rm -rf $TMPDIR
diff --git a/cairo-dock.spec b/cairo-dock.spec
index 6c64315..8c2d70b 100644
--- a/cairo-dock.spec
+++ b/cairo-dock.spec
@@ -1,22 +1,31 @@
-%global	urlver		3.4
+%global	urlver	3.4
 %global	mainver	3.4.1
 
 %global	plugin_least_ver	3.4.1
 
+%global	use_git	1
+%global	gitdate	20201103
+%global	githash	0836f5d1c3e18be0995320175b8bf21d28264a1
+%global	shorthash	%(c=%{githash} ; echo ${c:0:7})
+
+%global	tarballver	%{mainver}%{?use_git:-%{gitdate}git%{shorthash}}
+%global	mainrel	16
+
+
 %undefine _strict_symbol_defs_build
 %undefine __brp_mangle_shebangs
 
 
 Name:			cairo-dock
 Version:		3.4.1
-Release:		15%{?dist}
+Release:		%{mainrel}%{?use_git:.%{gitdate}git%{shorthash}}%{?dist}
 Summary:		Light eye-candy fully themable animated dock
 
 License:		GPLv3+
 URL:			http://glx-dock.org/
 # Source0:		http://launchpad.net/cairo-dock-core/%%{urlver}/%%{mainver}/+download/cairo-dock-%%{mainver}.tar.gz
 # Modified due to some may-be-patent-infringement issue
-Source0:		cairo-dock-fedora-%{version}.tar.gz
+Source0:		cairo-dock-fedora-%{tarballver}.tar.gz
 # Source0 is created by Source1
 Source1:		cairo-dock-create-fedora-tarball.sh
 # And some legal explanation
@@ -93,7 +102,7 @@ The %{name}-devel package contains libraries, build data, and header
 files for developing applications that use %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?use_git:-%{gitdate}git%{shorthash}}
 
 ## permission
 # %%_fixperms cannot fix permissions completely here
@@ -112,6 +121,9 @@ sed -i.stat \
 	-e 's|\${MSGFMT_EXECUTABLE}|\${MSGFMT_EXECUTABLE} --statistics|' \
 	po/CMakeLists.txt
 
+# Modify version forcely
+sed -i CMakeLists.txt -e '\@set (VERSION @s|VERSION.*|VERSION "%{version}")|'
+
 %build
 rm -f CMakeCache.txt
 %cmake -DCMAKE_SKIP_RPATH:BOOL=ON
@@ -202,6 +214,9 @@ popd
 %{_libdir}/pkgconfig/gldi.pc
 
 %changelog
+* Sun Jan  3 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.4.1-16.20201103git0836f5d
+- Update to the latest git
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-15
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 85c9f9e..3b2febf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07371e345e7f36b8ce30d8bd3c274e60  cairo-dock-fedora-3.4.1.tar.gz
+SHA512 (cairo-dock-fedora-3.4.1-20201103git0836f5d.tar.gz) = 4ec0cae10521648983b6c2fea976139265cc398fd188939101d55aef93e9b0b8bbd29eea84cb5f35c27912a77afe1ec2c82b17b8a0be52aa804b21124036194e