diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-11-29 15:09:46 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2013-11-29 15:09:46 +0100 |
| commit | c97c287b3b500b11994850d86ea418fc95d355e2 (patch) | |
| tree | 1c871c816f446a23be5eec2b2fb90f763a5b9ed2 /bin/build-rpm-package | |
| parent | 85abe1d256507bc63266e4a039ef055a0d3a8d9d (diff) | |
| download | buildscripts-c97c287b3b500b11994850d86ea418fc95d355e2.tar.gz buildscripts-c97c287b3b500b11994850d86ea418fc95d355e2.tar.bz2 buildscripts-c97c287b3b500b11994850d86ea418fc95d355e2.zip | |
introduce new var: PKG_SRCRELEASE, with %{?dist} macro strippped off
Diffstat (limited to 'bin/build-rpm-package')
| -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 f70004c..4c1ef4f 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -189,6 +189,7 @@ build_packages() { UPSTREAM_VERSION=$(cat $PROJECT.spec | egrep "^Version:.*" | awk '{ print $2 }') PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }') + PKG_SRCRELEASE=$(echo $PKG_RELEASE | sed -e 's/%{?dist}//') GITREV=$(cd $PROJECT && gitrevno && cd - 1>/dev/null) @@ -245,7 +246,7 @@ build_packages() { ### TODO: build amd64/i386 packages here [ "x$SKIP_ARCH" != "xamd64" ] && { - mock -r ${l_DIST}-${l_CODENAME}-x86_64 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_RELEASE.src.rpm + mock -r ${l_DIST}-${l_CODENAME}-x86_64 ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.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<&- |