[X2Go-Commits] buildscripts.git - master (branch) updated: 5b5fa65bcc452f9ec8c44b4c94dd67f9bce59b57

X2Go dev team git-admin at x2go.org
Fri Nov 29 14:25:40 CET 2013


The branch, master has been updated
       via  5b5fa65bcc452f9ec8c44b4c94dd67f9bce59b57 (commit)
       via  fc18c444b2a96ee14ff1e4359a7205a683dfa0e5 (commit)
      from  9fc935b9e8a9a0a3d667eb66b7ff609ecbfaf6ba (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 5b5fa65bcc452f9ec8c44b4c94dd67f9bce59b57
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 29 14:25:09 2013 +0100

    start working on build-rpm-package script

commit fc18c444b2a96ee14ff1e4359a7205a683dfa0e5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 29 14:24:53 2013 +0100

    change var name BUILDS_FOR to DEB_BUILDS_FOR

-----------------------------------------------------------------------

Summary of changes:
 bin/build-deb-package                        |   18 +--
 bin/{build-deb-package => build-rpm-package} |  174 ++++++++++++--------------
 home/.buildscripts/itzks.conf                |    2 +-
 home/.buildscripts/nwt.conf                  |    2 +-
 home/.buildscripts/x2go.conf                 |   10 +-
 5 files changed, 98 insertions(+), 108 deletions(-)
 copy bin/{build-deb-package => build-rpm-package} (58%)

The diff of changes is:
diff --git a/bin/build-deb-package b/bin/build-deb-package
index b612fb6..dbb7a94 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2011 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2011-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # This programme is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ GPG_KEY=
 DISTS_SUPPORTED="debian ubuntu"
 DEBIAN_DISTROS="lenny squeeze wheezy jessie sid"
 UBUNTU_DISTROS="lucid maverick natty oneiric precise"
-BUILDS_FOR="\
+DEB_BUILDS_FOR="\
 debian: squeeze wheezy jessie sid\n\
 ubuntu: lucid precise\n\
 "
@@ -94,8 +94,8 @@ set_vars() {
 }
 
 prepare_workspace() {
-	# in any case remove the BUILDS_FOR file
-	rm -f "$PROJECT_DIR/BUILDS_FOR"
+	# in any case remove the DEB_BUILDS_FOR file
+	rm -f "$PROJECT_DIR/DEB_BUILDS_FOR"
 
 	# make sure our local working copy is up to date...
 
@@ -123,9 +123,9 @@ prepare_workspace() {
 
 	# by default we build for all current debian versions
 	if test -z $ARGV2_CODENAME; then
-		test -f BUILDS_FOR || echo -e "$BUILDS_FOR" > BUILDS_FOR
+		test -f DEB_BUILDS_FOR || echo -e "$DEB_BUILDS_FOR" > DEB_BUILDS_FOR
 	elif echo "$DEBIAN_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
-		echo "debian: $ARGV2_CODENAME" > BUILDS_FOR
+		echo "debian: $ARGV2_CODENAME" > DEB_BUILDS_FOR
 	elif echo "$UBUNUT_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
 		echo "ubuntu: $ARGV2_CODENAME" >/dev/null
 	fi
@@ -134,7 +134,7 @@ prepare_workspace() {
 
 clear_pkgdist() {
 	# pkgdist directory cleanup
-	cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do
+	cat "$PROJECT_DIR/DEB_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:])}"
 		echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
@@ -176,7 +176,7 @@ clear_pkgdist() {
 
 build_packages() {
 	# use pbuilder for building all variants of this package
-	cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do
+	cat "$PROJECT_DIR/DEB_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:])}"
 		echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
@@ -284,7 +284,7 @@ build_packages() {
 
 upload_packages() {
 	# dupload the new packages to the reprepro repository
-	cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do
+	cat "$PROJECT_DIR/DEB_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:])}
 		for l_CODENAME in $l_CODENAMES; do
diff --git a/bin/build-deb-package b/bin/build-rpm-package
similarity index 58%
copy from bin/build-deb-package
copy to bin/build-rpm-package
index b612fb6..0c8a49a 100755
--- a/bin/build-deb-package
+++ b/bin/build-rpm-package
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2011 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+# Copyright (C) 2011-2013 by Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 #
 # This programme is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,15 +20,15 @@
 GIT_USER="gituser"
 GIT_HOSTNAME="git.mydomain.org"
 
-DEBEMAIL="firstname.lastname at mydomain.org"
-DEBFULLNAME="Firstname Lastname"
+RPMEMAIL="firstname.lastname at mydomain.org"
+RPMFULLNAME="Firstname Lastname"
 GPG_KEY=
-DISTS_SUPPORTED="debian ubuntu"
-DEBIAN_DISTROS="lenny squeeze wheezy jessie sid"
-UBUNTU_DISTROS="lucid maverick natty oneiric precise"
-BUILDS_FOR="\
-debian: squeeze wheezy jessie sid\n\
-ubuntu: lucid precise\n\
+DISTS_SUPPORTED="fedora epel"
+FEDORA_DISTROS="fe18 fe19 fe20"
+EPEL_DISTROS="sl6"
+RPM_BUILDS_FOR="\
+fedora: $FEDORA_DISTROS\n\
+epel: $EPEL_DISTROS\n\
 "
 
 COMPONENT_MAIN="main"
@@ -46,8 +46,6 @@ test -f ~/.buildscripts/$PREFIX.conf && . ~/.buildscripts/$PREFIX.conf || { echo
 set -ex
 
 set_vars() {
-	USE_SUDO="yes"
-	PDEBUILD="pdebuild --pbuilder qemubuilder"
 	TEMP_BASE="$HOME/tmp/"
 	mkdir -p "$TEMP_BASE"
 	chmod 2770 "$TEMP_BASE"
@@ -94,8 +92,8 @@ set_vars() {
 }
 
 prepare_workspace() {
-	# in any case remove the BUILDS_FOR file
-	rm -f "$PROJECT_DIR/BUILDS_FOR"
+	# in any case remove the RPM_BUILDS_FOR file
+	rm -f "$PROJECT_DIR/RPM_BUILDS_FOR"
 
 	# make sure our local working copy is up to date...
 
@@ -123,18 +121,18 @@ prepare_workspace() {
 
 	# by default we build for all current debian versions
 	if test -z $ARGV2_CODENAME; then
-		test -f BUILDS_FOR || echo -e "$BUILDS_FOR" > BUILDS_FOR
+		test -f RPM_BUILDS_FOR || echo -e "$RPM_BUILDS_FOR" > RPM_BUILDS_FOR
 	elif echo "$DEBIAN_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
-		echo "debian: $ARGV2_CODENAME" > BUILDS_FOR
+		echo "fedora: $ARGV2_CODENAME" > RPM_BUILDS_FOR
 	elif echo "$UBUNUT_DISTROS" | grep $ARGV2_CODENAME >/dev/null; then
-		echo "ubuntu: $ARGV2_CODENAME" >/dev/null
+		echo "epel: $ARGV2_CODENAME" >/dev/null
 	fi
 	return 0
 }
 
 clear_pkgdist() {
 	# pkgdist directory cleanup
-	cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do
+	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:])}"
 		echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
@@ -176,7 +174,7 @@ clear_pkgdist() {
 
 build_packages() {
 	# use pbuilder for building all variants of this package
-	cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do
+	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:])}"
 		echo "$DISTS_SUPPORTED" | grep $l_DIST >/dev/null && {
@@ -194,87 +192,65 @@ build_packages() {
 				git clone --local "$PROJECT_DIR" "$TEMP_DIR/$PROJECT/"
 				cd "$TEMP_DIR/$PROJECT"
 				git checkout $CHECKOUT || git checkout master
-				find $PROJECT_DIR/../ -type f -maxdepth 0 -mindepth 0 | grep $PROJECT_*.orig.tar.gz &>/dev/null && cp $PROJECT_DIR/../$PROJECT_*.orig.tar.gz ..
-				GITREV=$(gitrevno)
-
-				# we always build native packages for our repos
-				SA_OPTION=""
-
-				# we always build native packages for our repos
-				SA_OPTION=""
-				test -f debian/source/format && cat debian/source/format | egrep '^3.0.*\(quilt\)$' >/dev/null && {
-					git fetch origin upstream:upstream
-					UPSTREAM_VERSION=$(dpkg-parsechangelog | grep Version: | cut -d " " -f2 | sed -e 's/-.*//' -e 's/^.*://')
-					REVISION=$(dpkg-parsechangelog | grep Version: | cut -d " " -f2 | sed -e 's/.*-//')
-					git archive --prefix=${PROJECT}-${UPSTREAM_VERSION}/ -o ../${PROJECT}_${UPSTREAM_VERSION}.orig.tar.gz upstream/${UPSTREAM_VERSION} && {
-						SA_OPTION="--debbuildopts=-sa"
-					} || echo "1.0" > debian/source/format
-				}
 
-				# for Ubuntu version is the codename of the distribution release
+				GITREV=$(gitrevno)
 				VERSION=$l_CODENAME
 
-				# translate the version name for Debian releases
-				[ "x$l_CODENAME" = "xsid" ] && VERSION=unstable
-				#[ "x$l_CODENAME" = "xjessie" ] && VERSION=testing
-				#[ "x$l_CODENAME" = "xwheezy" ] && VERSION=stable
-				#[ "x$l_CODENAME" = "xoldstable" ] && VERSION=oldstable
+				# tar upstream sources from our Git clone
+
+				### TODO: really tar the sources
 
 				# modify the section for non-main package builds
-				[ "x$COMPONENT" != "xmain" ] && {
-					mv debian/control debian/control.tmp
-					cat debian/control.tmp | sed  "s#Section:[\ ]*\(.*\)#Section: $COMPONENT/\1#g" > debian/control
-				}
+
+				### TODO: How to host different builds (releases / nightlies in the same repository???)
+
+				#[ "x$COMPONENT" != "xmain" ] && {
+				#	mv debian/control debian/control.tmp
+				#	cat debian/control.tmp | sed  "s#Section:[\ ]*\(.*\)#Section: $COMPONENT/\1#g" > debian/control
+				#}
 
 				# modify changelog for this build
-				if [ "$COMPONENT" != "$COMPONENT_NIGHTLY" ]; then
-					dch --distribution $VERSION --force-distribution -l "+git$DATE.$GITREV+$l_CODENAME.$COMPONENT." "Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository (Git commit: $GIT_OBJECT_ID)."
-				else
-					dch --distribution $VERSION --force-distribution -l "~git$DATE.$GITREV+$l_CODENAME.$COMPONENT." "Development-Snapshot!!! Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository (Git commit: $GIT_OBJECT_ID)."
-				fi
+
+				### TODO: manipulate the version string in the .spec file
+
+				#if [ "$COMPONENT" != "$COMPONENT_NIGHTLY" ]; then
+				#	dch --distribution $VERSION --force-distribution -l "+git$DATE.$GITREV+$l_CODENAME.$COMPONENT." "Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository (Git commit: $GIT_OBJECT_ID)."
+				#else
+				#	dch --distribution $VERSION --force-distribution -l "~git$DATE.$GITREV+$l_CODENAME.$COMPONENT." "Development-Snapshot!!! Auto-built $l_DIST $l_CODENAME package for $REPOS_SERVER repository (Git commit: $GIT_OBJECT_ID)."
+				#fi
+
+
 				mkdir -p $PKGDIST/$l_DIST/$l_CODENAME/{amd64,i386}
-				OTHERMIRROR=""
-				if [ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ]; then
-					echo $PACKAGE_WITHOUT_OTHERMIRROR | grep $PROJECT >/dev/null || OTHERMIRROR="deb http://$REPOS_SERVER/$l_DIST $l_CODENAME $COMPONENT_MAIN $COMPONENT"
-				else
-					echo $PACKAGE_WITHOUT_OTHERMIRROR | grep $PROJECT >/dev/null || OTHERMIRROR="deb http://$REPOS_SERVER/$l_DIST $l_CODENAME $COMPONENT"
-				fi
-				if [ $PROJECT = "x2gomatebindings" ]; then
-					OTHERMIRROR="deb http://packages.mate-desktop.org/repo/debian $l_CODENAME main"
-				fi
 
-				[ "x$USE_SUDO" != "xyes" ] && {
-					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
-						[ "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" != "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<&-
-						}
-					}
-					for extra_arch in $EXTRA_ARCHS; do
-						mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch"
-						cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && {
-							DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&-
-						}
-					done
-				}
-				[ "x$USE_SUDO" = "xyes" ] && {
-					[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
-						[ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && {
-							sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/amd64 -- --allow-untrusted $SA_OPTION 0<&-
-						}
-						[ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && {
-							sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386  OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult $PKGDIST/$l_DIST/$l_CODENAME/i386  -- --binary-arch --allow-untrusted $SA_OPTION 0<&-
-						}
-					}
-					for extra_arch in $EXTRA_ARCHS; do
-						mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch"
-						cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && {
-							sudo GNUPGHOME=$GNUPGHOME DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch OTHERMIRROR="$OTHERMIRROR" $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&-
-						}
-					done
+				# TODO: obtain packages from our YUM repository???
+
+				#OTHERMIRROR=""
+				#if [ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ]; then
+				#	echo $PACKAGE_WITHOUT_OTHERMIRROR | grep $PROJECT >/dev/null || OTHERMIRROR="deb http://$REPOS_SERVER/$l_DIST $l_CODENAME $COMPONENT_MAIN $COMPONENT"
+				#else
+				#	echo $PACKAGE_WITHOUT_OTHERMIRROR | grep $PROJECT >/dev/null || OTHERMIRROR="deb http://$REPOS_SERVER/$l_DIST $l_CODENAME $COMPONENT"
+				#fi
+
+				[ "x$EXTRA_ARCHS_ONLY" = "x" ] && {
+
+					### TODO: build amd64/i386 packages here
+
+					#[ "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" != "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<&-
+					#}
 				}
+				for extra_arch in $EXTRA_ARCHS; do
+					mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch"
+
+					### TODO: build extra-arch packages here
+
+					#cat debian/control | egrep "Architecture.*(any|$extra_arch)" >/dev/null && {
+					#	DIST=$l_DIST CODENAME=$l_CODENAME ARCH=$extra_arch $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/$extra_arch" -- --binary-arch --allow-untrusted $SA_OPTION 0<&-
+					#}
+				done
 				rm -Rf "$TEMP_DIR"
 			done
 		}
@@ -284,7 +260,7 @@ build_packages() {
 
 upload_packages() {
 	# dupload the new packages to the reprepro repository
-	cat "$PROJECT_DIR/BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do
+	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:])}
 		for l_CODENAME in $l_CODENAMES; do
@@ -297,15 +273,21 @@ upload_packages() {
 				for l_ARCH in amd64 i386; do
 					[ "x$SKIP_ARCH" != "x$l_ARCH" ] && {
 						cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH"
-						test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
-						ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&-
+
+						# TODO: upload package
+
+						#test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
+						#ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&-
 					}
 				done
 			fi
 			for l_EXTRA_ARCH in $EXTRA_ARCHS; do 
 				cd "$PKGDIST/$l_DIST/$l_CODENAME/$l_EXTRA_ARCH"
-				test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
-				ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&-
+
+				# TODO: upload package
+
+				#test -f ./dupload.conf || ln -s ~/.dupload.conf.$PREFIX ./dupload.conf
+				#ls $PROJECT_*.changes &>/dev/null && dupload -c --to $PREFIX-$l_DIST-$l_CODENAME $PROJECT_*.changes 0<&-
 			done
 		done
 	done
@@ -314,7 +296,7 @@ upload_packages() {
 
 ### MAIN ###
 set_vars $@ && {
-	if [ "x$(basename $0)" = "x$PREFIX-build-deb-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-deb-package" ]; then
+	if [ "x$(basename $0)" = "x$PREFIX-build-rpm-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-rpm-package" ]; then
 		cd $PROJECT_DIR && pkgneedsbuild $CHECKOUT || [ "$FORCE_BUILD" -eq 0 ] && {
 			prepare_workspace && {
 				clear_pkgdist
@@ -322,7 +304,7 @@ set_vars $@ && {
 			}
 		}
 	fi
-	if [ "x$(basename $0)" = "x$PREFIX-upload-deb-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-deb-package" ]; then
+	if [ "x$(basename $0)" = "x$PREFIX-upload-rpm-package" ] || [ "x$(basename $0)" = "x$PREFIX-build+upload-rpm-package" ]; then
 		upload_packages
 	fi
 }
diff --git a/home/.buildscripts/itzks.conf b/home/.buildscripts/itzks.conf
index 16ad07c..75c44d1 100644
--- a/home/.buildscripts/itzks.conf
+++ b/home/.buildscripts/itzks.conf
@@ -8,7 +8,7 @@ DEBFULLNAME="ITZKS Packages"
 GPG_KEY="E41B37C658842183"
 
 DISTS_SUPPORTED="debian ubuntu"
-BUILDS_FOR="\
+DEB_BUILDS_FOR="\
 debian: squeeze wheezy jessie sid"
 
 COMPONENT_MAIN="main"
diff --git a/home/.buildscripts/nwt.conf b/home/.buildscripts/nwt.conf
index 37a786f..dd662a6 100644
--- a/home/.buildscripts/nwt.conf
+++ b/home/.buildscripts/nwt.conf
@@ -8,7 +8,7 @@ DEBEMAIL=debian at das-netzwerkteam.de
 DEBFULLNAME="NWT Packages"
 GPG_KEY="4DC41CF116990FF8"
 DISTS_SUPPORTED="debian ubuntu"
-BUILDS_FOR="\
+DEB_BUILDS_FOR="\
 debian: lenny squeeze wheezy jessie sid\n\
 ubuntu: lucid precise"
 
diff --git a/home/.buildscripts/x2go.conf b/home/.buildscripts/x2go.conf
index e51baf0..63a0888 100644
--- a/home/.buildscripts/x2go.conf
+++ b/home/.buildscripts/x2go.conf
@@ -8,9 +8,17 @@ DEBEMAIL=git-admin at x2go.org
 DEBFULLNAME="X2go Git Administrator"
 GPG_KEY="F4A7678C9C6B0B2B"
 DISTS_SUPPORTED="debian"
-BUILDS_FOR="\
+DEB_BUILDS_FOR="\
 debian: squeeze wheezy jessie sid"
 
+RPMEMAIL=git-admin at x2go.org
+RPMFULLNAME="X2go Git Administrator"
+GPG_KEY="F4A7678C9C6B0B2B"
+DISTS_SUPPORTED="fedora epel"
+RPM_BUILDS_FOR="\
+fedora: fe18 fe19 fe20\n\
+epel: sl6\n"
+
 COMPONENT_MAIN="main"
 COMPONENT_NIGHTLY="heuler"
 COMPONENT_RELEASES="baikal"


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