diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-04 23:48:17 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-04 23:48:17 +0100 |
| commit | 5dd3bd2bf948bc97c5c309666e55ff074654a9ee (patch) | |
| tree | 674c8a0cc819a6d2532a9b8b440978cd326498d3 /bin | |
| parent | bf3b55a19f3ecec7e6e4389ea253a392151eadb1 (diff) | |
| download | buildscripts-5dd3bd2bf948bc97c5c309666e55ff074654a9ee.tar.gz buildscripts-5dd3bd2bf948bc97c5c309666e55ff074654a9ee.tar.bz2 buildscripts-5dd3bd2bf948bc97c5c309666e55ff074654a9ee.zip | |
fix for last commit
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/build-rpm-package | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package index ffde823..3ae5b2c 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -74,6 +74,7 @@ set_vars() { CHECKOUT="${3:-build-main}" elif [ "x$COMPONENT" = "x${COMPONENT_MAIN}-test" ]; then CHECKOUT="${3:-build-main-test}" + COMPONENT="maintest" elif echo "$COMPONENT_RELEASES" | grep "$COMPONENT" >/dev/null; then CHECKOUT="${3:-build-$COMPONENT}" elif [ "x$COMPONENT" = "x$COMPONENT_NIGHTLY" ]; then @@ -187,7 +188,7 @@ build_packages() { mv $PROJECT/$PROJECT.spec . UPSTREAM_VERSION=$(cat $PROJECT.spec | egrep "^Version:.*" | awk '{ print $2 }') - PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }' | sed 's/-//') + PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }') PKG_SRCRELEASE=$(echo $PKG_RELEASE | sed -e 's/%{?dist}//') IS_NOARCH=$(cat $PROJECT.spec | egrep "^BuildArch:.*noarch\$" 1>/dev/null 2>/dev/null && echo yes || echo no) |