aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wfar...@apache.org
Subject aurora git commit: Tidying RPM packaging README and specfile
Date Tue, 14 Jul 2015 17:50:43 GMT
Repository: aurora
Updated Branches:
  refs/heads/master 1a01a5bf0 -> 884581b9a


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/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/884581b9
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/884581b9
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/884581b9

Branch: refs/heads/master
Commit: 884581b9aced39e81d48d3e2975b51f0d5742f0e
Parents: 1a01a5b
Author: Steve Salevan <steve.salevan@gmail.com>
Authored: Tue Jul 14 10:50:34 2015 -0700
Committer: Bill Farner <wfarner@apache.org>
Committed: Tue Jul 14 10:50:34 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/blob/884581b9/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/blob/884581b9/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}
 


Mime
View raw message