diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-11-30 00:14:03 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-11-30 00:14:03 +0100 |
| commit | 0caea4a7d865166b1f2e55b996d8ced19387e319 (patch) | |
| tree | 3b8b73227911ff9833d27fdca1e2c483031de20e | |
| parent | 42fcd7edd771e2d22b70406c55aef3e0785ba599 (diff) | |
| download | buildscripts-0caea4a7d865166b1f2e55b996d8ced19387e319.tar.gz buildscripts-0caea4a7d865166b1f2e55b996d8ced19387e319.tar.bz2 buildscripts-0caea4a7d865166b1f2e55b996d8ced19387e319.zip | |
tilde not allowed in RPM version strings, use some other way to make stable release supercede nightly builds
| -rwxr-xr-x | bin/build-rpm-package | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 2f856a6..02e7a32 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -173,8 +173,11 @@ build_packages() { PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }') PKG_SRCRELEASE=$(echo $PKG_RELEASE | sed -e 's/%{?dist}//') - sed -i $PROJECT.spec -e "s/%{?dist}/~git$DATE.$GITREV.$COMPONENT%{?dist}/" - + if [ "$COMPONENT" = "$COMPONENT_NIGHTLY" ]; then + sed -i $PROJECT.spec -e "s/%{?dist}/.0.git$DATE.$GITREV.$COMPONENT%{?dist}/" + else + sed -i $PROJECT.spec -e "s/%{?dist}/.1.git$DATE.$GITREV.$COMPONENT%{?dist}/" + fi mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION tar -czf $PKGDIST/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION |