From 5b0c8ce5bbdfbe65916dcc290ad678026b2e7472 Mon Sep 17 00:00:00 2001 From: Jens Lody Date: Fri, 18 Sep 2015 01:44:42 +0200 Subject: [PATCH] Fixed spec-file and update-script to use the checkout-date and not the build-date in the rpm-revision. --- gnome-shell-extension-panel-osd.spec | 8 ++++++-- update_revision.sh | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gnome-shell-extension-panel-osd.spec b/gnome-shell-extension-panel-osd.spec index a2aec60..31635b7 100644 --- a/gnome-shell-extension-panel-osd.spec +++ b/gnome-shell-extension-panel-osd.spec @@ -1,11 +1,12 @@ -%global git 60eff04 +%global git 0205d68 %global uuid panel-osd@berend.de.schouwer.gmail.com %global github jenslody-gnome-shell-extension-panel-osd %global checkout git%{git} +%global checkout_date 20150918 Name: gnome-shell-extension-panel-osd Version: 1 -Release: 0.0.%(date +%Y%m%d)%{checkout}%{?dist} +Release: 0.1.%{checkout_date}%{checkout}%{?dist} Summary: Configure the place where notifications are shown Group: User Interface/Desktops @@ -62,6 +63,9 @@ fi %{_datadir}/gnome-shell/extensions/%{uuid} %changelog +* Thu Sep 17 2015 Jens Lody - 1-0.1.20150918git0205d68 +- Use checkout-date instead of build-date in package-version. + * Thu Aug 20 2015 Jens Lody - 1-0.1.20150821gitcb1f6f6 - Remove dot before git in Release-tag. - Use (conditional) file-triggers for schema compiling, introduced in fc24. diff --git a/update_revision.sh b/update_revision.sh index a814c66..f47563a 100755 --- a/update_revision.sh +++ b/update_revision.sh @@ -63,8 +63,13 @@ COMMIT=`git log -1 --pretty=format:"%h"` echo "Found revision: '${COMMIT}'" -mv ${SPEC_FILE} ${SPEC_FILE}.tmp -sed "1 s/%global git .*/%global git $COMMIT/" < ${SPEC_FILE}.tmp > ${SPEC_FILE} +DATE=`date +%Y%m%d` + +echo "Use checkout-date: '${DATE}'" + +cp ${SPEC_FILE} ${SPEC_FILE}.tmp +sed -i "s/%global git .*/%global git $COMMIT/" ${SPEC_FILE} +sed -i "s/%global checkout_date .*/%global checkout_date $DATE/" ${SPEC_FILE} rpmdev-bumpspec --comment="Fresh git checkout." --userstring="Jens Lody " ${SPEC_FILE}