You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2015/08/26 21:04:57 UTC
aurora-packaging git commit: Rpm: replace hyphens from version.
Repository: aurora-packaging
Updated Branches:
refs/heads/master 8c9c2f6ad -> 7ed66ba0c
Rpm: replace hyphens from version.
Reviewed at https://reviews.apache.org/r/37806/
Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/7ed66ba0
Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/7ed66ba0
Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/7ed66ba0
Branch: refs/heads/master
Commit: 7ed66ba0cda3acc5e48b5f553a0fd509b26e3edc
Parents: 8c9c2f6
Author: Bill Farner <wf...@apache.org>
Authored: Wed Aug 26 12:03:06 2015 -0700
Committer: Bill Farner <wf...@twitter.com>
Committed: Wed Aug 26 12:03:06 2015 -0700
----------------------------------------------------------------------
builder/deb/ubuntu-trusty/build.sh | 3 ---
builder/rpm/centos-7/build.sh | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/7ed66ba0/builder/deb/ubuntu-trusty/build.sh
----------------------------------------------------------------------
diff --git a/builder/deb/ubuntu-trusty/build.sh b/builder/deb/ubuntu-trusty/build.sh
index 87c2bc0..bb2b799 100755
--- a/builder/deb/ubuntu-trusty/build.sh
+++ b/builder/deb/ubuntu-trusty/build.sh
@@ -25,9 +25,6 @@ cp -R /specs/debian .
export DEBFULLNAME='Apache Aurora'
export DEBEMAIL='dev@aurora.apache.org'
-# Replace underscores in version ID.
-export AURORA_VERSION=$(echo $AURORA_VERSION | tr '_' '-')
-
dch \
--newversion $AURORA_VERSION \
--package apache-aurora \
http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/7ed66ba0/builder/rpm/centos-7/build.sh
----------------------------------------------------------------------
diff --git a/builder/rpm/centos-7/build.sh b/builder/rpm/centos-7/build.sh
index 9e8eae9..912f7c7 100755
--- a/builder/rpm/centos-7/build.sh
+++ b/builder/rpm/centos-7/build.sh
@@ -23,6 +23,9 @@ tar --strip-components 1 -C src -xf /src.tar.gz
cp -R /specs/rpm .
cd rpm
+# Replace hyphens in version ID.
+export AURORA_VERSION=$(echo $AURORA_VERSION | tr '-' '_')
+
make srpm
yum-builddep -y ../../../dist/rpmbuild/SRPMS/*
make rpm