[X2Go-Commits] [buildscripts] 01/01: build scripts: fix creation of git changelog

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 34253327553afc71710e49e46c086f67319840c8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Mar 4 12:19:34 2014 +0100

    build scripts: fix creation of git changelog
---
 bin/build-deb-package |    4 +++-
 bin/build-rpm-package |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/build-deb-package b/bin/build-deb-package
index bc4482d..5dd121d 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -121,7 +121,6 @@ prepare_workspace() {
 
 	GIT_OBJECT_ID=`git show-ref -s heads/master`
 	cd "$PROJECT_DIR"
-	git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog
 
 	# by default we build for all current debian versions
 	if [ "x$ARGV2_CODENAME" != "x" ]; then
@@ -245,6 +244,9 @@ build_packages() {
 					OTHERMIRROR="deb http://packages.mate-desktop.org/repo/debian $l_CODENAME main"
 				fi
 
+				# create git changelog immediately prior to building the package
+				git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog
+
 				[ "x$USE_SUDO" != "xyes" ] && {
 					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
 						[ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index d22c517..2892100 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -115,7 +115,6 @@ prepare_workspace() {
 
 	GIT_OBJECT_ID=`git show-ref -s heads/master`
 	cd "$PROJECT_DIR"
-	git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog
 
 	if [ "x$ARGV2_CODENAME" != "x" ]; then
 		if echo "$FEDORA_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
@@ -202,6 +201,9 @@ build_packages() {
 				mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION
 				tar -czf $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION
 
+				# create git changelog immediately prior to building the SRPM package
+				git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog
+
 				# create the SRPM package
 				rpmbuild -D "%_topdir $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild" -bs $PROJECT.spec
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git