From 4956bf8a5b94d2a93576e5619c9fc9c15b9b73d2 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 9 Mar 2014 12:07:35 +0100
Subject: build-rpm-package: fix package builds / git log file creation

---
 bin/build-rpm-package | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'bin')

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
 
-- 
cgit v1.2.3


From 1191f525ff54ac3827ce16d7b7e098c23036b343 Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 9 Mar 2014 12:15:04 +0100
Subject: build-rpm-package: be in the correct directory when creating the
 Changelog.gitlog file

---
 bin/build-rpm-package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 997f94f..96886fb 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -173,7 +173,7 @@ build_packages() {
 				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
+				cd $PROJECT && git --no-pager log --since "2 years ago" --format="%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n" > ChangeLog.gitlog && cd - 1>/dev/null
 
 				rm -Rf "$PROJECT/.git"
 				mv $PROJECT/$PROJECT.spec .
-- 
cgit v1.2.3


From dc78ce89feb345a19da17b3d17ed7ea45330fd1e Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 9 Mar 2014 12:23:14 +0100
Subject: build-nsis-script: provide a much better git changelog

---
 bin/build-nsis-package.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/build-nsis-package.sh b/bin/build-nsis-package.sh
index 89484ae..40186b5 100644
--- a/bin/build-nsis-package.sh
+++ b/bin/build-nsis-package.sh
@@ -204,11 +204,11 @@ build_packages() {
 
 			cd $PROJECT_DIR
 			cp -a debian/changelog txt/
-			echo "GIT info:" > txt/git-info
-			git branch >> txt/git-info
-			echo "=================================" >> txt/git-info
-			echo "GIT history:" >> txt/git-info
-			git log -n 10 >> txt/git-info
+
+			# 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
+			cp ChangeLog.gitlog txt/git-info
+
 			cd /cygdrive/d/Build/scripts/
 
 			nice /cygdrive/d/Build/scripts/nsis-builder.bat --buildresult "D:\\Build\\Scripts\\test\\$l_DIST\\$l_CODENAME\\i386"
-- 
cgit v1.2.3