summaryrefslogtreecommitdiff
path: root/bin/build-rpm-package
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-03-09 12:07:35 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-03-09 12:08:19 +0100
commit4956bf8a5b94d2a93576e5619c9fc9c15b9b73d2 (patch)
tree5124c53da3dc1b25e1060a0d678fa5478d940c8a /bin/build-rpm-package
parentd97f975d6cc3869d5a1c798fd83f6692cc400400 (diff)
downloadbuildscripts-4956bf8a5b94d2a93576e5619c9fc9c15b9b73d2.tar.gz
buildscripts-4956bf8a5b94d2a93576e5619c9fc9c15b9b73d2.tar.bz2
buildscripts-4956bf8a5b94d2a93576e5619c9fc9c15b9b73d2.zip
build-rpm-package: fix package builds / git log file creation
Diffstat (limited to 'bin/build-rpm-package')
-rwxr-xr-xbin/build-rpm-package7
1 files 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