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/04 23:44:13 UTC

[07/11] aurora-packaging git commit: Tidying RPM packaging README and specfile

Tidying RPM packaging README and specfile

Bugs closed: AURORA-1391

Reviewed at https://reviews.apache.org/r/36370/


Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/928afd40
Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/928afd40
Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/928afd40

Branch: refs/heads/master
Commit: 928afd401fd05bfa24f85fd47c43ad8a472c755a
Parents: f0fe01f
Author: Steve Salevan <st...@gmail.com>
Authored: Tue Jul 14 10:50:34 2015 -0700
Committer: Bill Farner <wf...@twitter.com>
Committed: Tue Aug 4 14:07:42 2015 -0700

----------------------------------------------------------------------
 build-support/packaging/rpm/README.md   | 15 +++------------
 build-support/packaging/rpm/aurora.spec |  2 ++
 2 files changed, 5 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/928afd40/build-support/packaging/rpm/README.md
----------------------------------------------------------------------
diff --git a/build-support/packaging/rpm/README.md b/build-support/packaging/rpm/README.md
index c5916e0..2432dc7 100644
--- a/build-support/packaging/rpm/README.md
+++ b/build-support/packaging/rpm/README.md
@@ -1,14 +1,5 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+Building Aurora RPMs
+====================
 
 This directory contains all necessary scripting to support the building of Aurora
 nightly and release RPMs.  Building and deployment have been tested against the following
@@ -18,7 +9,7 @@ Red Hat flavors:
  * Fedora 19/20 on x86_64
 
 How to build using Make and rpmbuild
-====================================
+------------------------------------
 
 1. Install the necessary build dependencies via yum-builddep:
 

http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/928afd40/build-support/packaging/rpm/aurora.spec
----------------------------------------------------------------------
diff --git a/build-support/packaging/rpm/aurora.spec b/build-support/packaging/rpm/aurora.spec
index 03b9ee3..0c4c106 100644
--- a/build-support/packaging/rpm/aurora.spec
+++ b/build-support/packaging/rpm/aurora.spec
@@ -85,7 +85,9 @@ BuildRequires: unzip
 BuildRequires: wget
 BuildRequires: zlib-devel
 
+%if 0%{?rhel} && 0%{?rhel} < 7
 Requires:      daemonize
+%endif
 Requires:      java-%{JAVA_VERSION}-openjdk
 Requires:      mesos = %{MESOS_VERSION}