From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 25 Jun 2015 16:55:39 +0000 (+0200)
Subject: ceph.spec.in: clarify two important comments
X-Git-Tag: v0.94.6~70^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a2cbcb0a4efa365b6d92ec58d7acf4a66e9d2b1;p=ceph.git

ceph.spec.in: clarify two important comments

First, the terms "common" and "specific" are vague. Second,
"common" can easily be confused with the ceph-common subpackage.

Fix this by rephrasing to "distro-unconditional dependencies" and
"distro-conditional dependencies", respectively.

Third, move the "distro-unconditional dependencies" header so it
is above the part where these dependencies are actually defined.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit dd212fd1d367f70c61f65a97599959668b44aa53)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index cf2d901f585d..6497e9893b30 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -8,9 +8,6 @@
 
 %{!?_udevrulesdir: %global _udevrulesdir /lib/udev/rules.d}
 
-#################################################################################
-# common
-#################################################################################
 Name:		ceph
 Version:	@VERSION@
 Release:	@RPM_RELEASE@%{?dist}
@@ -23,6 +20,9 @@ Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
 %if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
 Patch0:		init-ceph.in-fedora.patch
 %endif
+#################################################################################
+# dependencies that apply across all distro families
+#################################################################################
 Requires:	librbd1 = %{epoch}:%{version}-%{release}
 Requires:	librados2 = %{epoch}:%{version}-%{release}
 Requires:	libcephfs1 = %{epoch}:%{version}-%{release}
@@ -80,7 +80,7 @@ BuildRequires:	net-tools
 %endif
 
 #################################################################################
-# specific
+# distro-conditional dependencies
 #################################################################################
 %if 0%{defined suse_version}
 %if 0%{?suse_version} > 1210