[X2Go-Commits] buildscripts.git - master (branch) updated: 379ab25b918909c8fc20727d1c7bd266c9b50ba2
X2Go dev team
git-admin at x2go.org
Fri Nov 29 14:56:52 CET 2013
The branch, master has been updated
via 379ab25b918909c8fc20727d1c7bd266c9b50ba2 (commit)
from c95897846764ac082c6ce3d1a78786ca4cd31e8a (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 379ab25b918909c8fc20727d1c7bd266c9b50ba2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Nov 29 14:56:21 2013 +0100
build amd64 bin:package
-----------------------------------------------------------------------
Summary of changes:
bin/build-rpm-package | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
The diff of changes is:
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 155b5b1..87021a8 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -186,7 +186,10 @@ build_packages() {
cd $TEMP_DIR
rm -Rf "$PROJECT/.git"
cp $PROJECT/$PROJECT.spec .
+
UPSTREAM_VERSION=$(cat $PROJECT.spec | egrep "^Version:.*" | awk '{ print $2 }')
+ PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }')
+
GITREV=$(cd $PROJECT && gitrevno && cd - 1>/dev/null)
mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION
@@ -198,7 +201,6 @@ build_packages() {
# clean up the Git clone from the temp folder
cd && rm $TEMP_DIR/$PROJECT -Rf
-
cat "$PROJECT_DIR/RPM_BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do
l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])"
l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | tr [:upper:] [:lower:])}"
@@ -242,10 +244,9 @@ build_packages() {
### TODO: build amd64/i386 packages here
- echo .
- #[ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
- # DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" -- --allow-untrusted $SA_OPTION 0<&-
- #}
+ [ "x$SKIP_ARCH" != "xamd64" ] && {
+ mock ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_RELEASE.src.rpm
+ }
#[ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
# DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch --allow-untrusted $SA_OPTION 0<&-
#}
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