[X2Go-Commits] [buildscripts] 01/01: build-rpm-package: fix package builds / git log file creation

git-admin at x2go.org git-admin at x2go.org
Sun Mar 9 12:08:43 CET 2014


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

x2go pushed a commit to branch master
in repository buildscripts.

commit 4956bf8a5b94d2a93576e5619c9fc9c15b9b73d2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Mar 9 12:07:35 2014 +0100

    build-rpm-package: fix package builds / git log file creation
---
 bin/build-rpm-package |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 2892100..997f94f 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -171,6 +171,10 @@ build_packages() {
 				git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/"
 				cd $TEMP_DIR
 				GITREV=$(cd $PROJECT && gitrevno && cd - 1>/dev/null)
+
+				# 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
+
 				rm -Rf "$PROJECT/.git"
 				mv $PROJECT/$PROJECT.spec .
 
@@ -201,9 +205,6 @@ 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



More information about the x2go-commits mailing list