ceph.spec.in: Fixes for centos build under mock.wip-build-fixes

Fixes some rmplint complaints and provides workarounds for some
package dependecies.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>

1 files changed, 34 insertions, 33 deletions

diff --git a/ceph.spec.in b/ceph.spec.in
index 8091018c1dc..59555c1243a 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -22,13 +22,13 @@ Requires:	libcephfs1 = %{version}-%{release}
 Requires:	python
 Requires:	python-argparse
 Requires:	python-ceph
-Requires:       xfsprogs
+Requires:	xfsprogs
 Requires:	cryptsetup
 Requires:	parted
 Requires:	util-linux
 Requires:	hdparm
 Requires(post):	binutils
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 BuildRequires:	gcc-c++
 BuildRequires:	libtool
 BuildRequires:	boost-devel
@@ -37,39 +37,40 @@ BuildRequires:	perl
 BuildRequires:	gdbm
 BuildRequires:	pkgconfig
 BuildRequires:	python
-BuildRequires:  libaio-devel
-BuildRequires:  libcurl-devel
-BuildRequires:  libxml2-devel
-BuildRequires:  libuuid-devel
-BuildRequires:  leveldb-devel > 1.2
-BuildRequires:  yasm
-%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora}
-BuildRequires:  snappy-devel
-%endif
+BuildRequires:	libaio-devel
+BuildRequires:	libcurl-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	libuuid-devel
+BuildRequires:	leveldb-devel > 1.2
+BuildRequires:	yasm
 
 #################################################################################
 # specific
 #################################################################################
 %if ! 0%{?rhel}
-BuildRequires:  sharutils
+BuildRequires:	sharutils
+%endif
+
+%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora}
+BuildRequires:	snappy-devel
 %endif
 
 %if 0%{defined suse_version}
 %if 0%{?suse_version} > 1210
-Requires:       gptfdisk
-BuildRequires:  gperftools-devel
+Requires:	gptfdisk
+BuildRequires:	gperftools-devel
 %else
-Requires:       scsirastools
-BuildRequires:  google-perftools-devel
+Requires:	scsirastools
+BuildRequires:	google-perftools-devel
 %endif
 Recommends:	logrotate
 BuildRequires:	%insserv_prereq
 BuildRequires:	mozilla-nss-devel
 BuildRequires:	keyutils-devel
 BuildRequires:	libatomic-ops-devel
-BuildRequires:  fdupes
+BuildRequires:	fdupes
 %else
-Requires:       gdisk
+Requires:	gdisk
 BuildRequires:	nss-devel
 BuildRequires:	keyutils-libs-devel
 BuildRequires:	libatomic_ops-devel
@@ -77,7 +78,7 @@ Requires:	gdisk
 Requires(post):	chkconfig
 Requires(preun):chkconfig
 Requires(preun):initscripts
-BuildRequires:  gperftools-devel
+BuildRequires:	gperftools-devel
 %endif
 
 %description
@@ -150,7 +151,7 @@ Summary:	RADOS distributed object store client library
 Group:		System Environment/Libraries
 License:	LGPL-2.0
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora}
-Obsoletes:	ceph-libs
+Obsoletes:	ceph-libs <= %{version}
 %endif
 %description -n librados2
 RADOS is a reliable, autonomic distributed object storage cluster
@@ -163,7 +164,7 @@ Summary:	RADOS block device client library
 Group:		System Environment/Libraries
 License:	LGPL-2.0
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora}
-Obsoletes:	ceph-libs
+Obsoletes:	ceph-libs <= %{version}
 %endif
 %description -n librbd1
 RBD is a block device striped across multiple distributed objects in
@@ -176,7 +177,7 @@ Summary:	Ceph distributed file system client library
 Group:		System Environment/Libraries
 License:	LGPL-2.0
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora}
-Obsoletes:	ceph-libs
+Obsoletes:	ceph-libs  <= %{version}
 %endif
 %description -n libcephfs1
 Ceph is a distributed network file system designed to provide excellent
@@ -226,7 +227,7 @@ Group:		System Environment/Libraries
 License:	LGPL-2.0
 Requires:	java
 Requires:	libcephfs1 = %{version}-%{release}
-BuildRequires:  java-devel
+BuildRequires:	java-devel
 %description -n libcephfs_jni1
 This package contains the Java Native Interface library for CephFS Java
 bindings.
@@ -237,15 +238,15 @@ Group:		System Environment/Libraries
 License:	LGPL-2.0
 Requires:	java
 Requires:	libcephfs_jni1 = %{version}-%{release}
-BuildRequires:  java-devel
+BuildRequires:	java-devel
 %if 0%{?suse_version} > 1220
-Requires:       junit4
-BuildRequires:  junit4
+Requires:	junit4
+BuildRequires:	junit4
 %else
-Requires:       junit
-BuildRequires:  junit
+Requires:	junit
+BuildRequires:	junit
 %endif
-BuildRequires:  junit
+BuildRequires:	junit
 %description -n cephfs-java
 This package contains the Java libraries for the Ceph File System.
 
@@ -545,10 +546,10 @@ fi
 %if %{with ocf}
 %files resource-agents
 %defattr(0755,root,root,-)
-%dir /usr/lib/ocf
-%dir /usr/lib/ocf/resource.d
-%dir /usr/lib/ocf/resource.d/ceph
-/usr/lib/ocf/resource.d/%{name}/*
+%dir %{_libdir}/ocf
+%dir %{_libdir}/ocf/resource.d
+%dir %{_libdir}/ocf/resource.d/ceph
+%{_libdir}/ocf/resource.d/%{name}/*
 %endif
 
 #################################################################################