[X2Go-Commits] buildscripts.git - master (branch) updated: 98c2c20b15e64d3730ec32b6019e5d72f070fa24
X2Go dev team
git-admin at x2go.org
Fri Nov 29 23:46:05 CET 2013
The branch, master has been updated
via 98c2c20b15e64d3730ec32b6019e5d72f070fa24 (commit)
from 7774c9200054ed4d18d50cf4964b912cdb3aaafe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 98c2c20b15e64d3730ec32b6019e5d72f070fa24
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Nov 29 23:45:32 2013 +0100
manipulate %_topdir macro when evoking rpmbuild
-----------------------------------------------------------------------
Summary of changes:
bin/build-rpm-package | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
The diff of changes is:
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index ab85fcc..2fcdb59 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -95,7 +95,6 @@ prepare_workspace() {
mkdir -p $PKGDIST/rpmbuild/SOURCES
# make sure our local working copy is up to date...
-
if [ -d "$PROJECT_DIR/.git" ]; then
cd "$PROJECT_DIR" && git reset --hard
git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT
@@ -180,7 +179,7 @@ build_packages() {
tar -czf $PKGDIST/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION
# create the SRPM package
- rpmbuild --dbpath $PKGDIST/rpmbuild -bs $PROJECT.spec
+ rpmbuild -D "%_topdir $PKGDIST/rpmbuild" -bs $PROJECT.spec
# clean up the Git clone from the temp folder
cd && rm $TEMP_DIR/$PROJECT -Rf
hooks/post-receive
--
buildscripts.git (X2Go packaging scripts)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "buildscripts.git" (X2Go packaging scripts).
More information about the x2go-commits
mailing list