For the moment, hardcode SUSE-isms in spec file

Conflicts:
	ceph.spec.in

(cherry picked from commit fe24ef77038e56fe685f2769e20d7d3f8d325df7)

Conflicts:
	ceph.spec.in

(cherry picked from commit 21b5a67575b9b8c3f7a5e8d2171f537b3925330a)

diff --git a/ceph.spec.in b/ceph.spec.in
index 567586cdb0b41a82ba5a02b34b5d738cf1b5b991..1249e1ec5cdc8f202fb04a6c4d817eed00daf9ae 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -9,14 +9,14 @@
 # common
 #################################################################################
 Name:          ceph
-Version:       @VERSION@
-Release:       @RPM_RELEASE@%{?dist}
+Version:       latest_suse+git.2235aa9
+Release:       0%{?dist}
 Epoch:         1
 Summary:       User space components of the Ceph file system
 License:       GPL-2.0
 Group:         System Environment/Base
 URL:           http://ceph.com/
-Source0:       http://ceph.com/download/%{name}-%{version}.tar.bz2
+Source0:       http://ceph.com/download/%{name}-%{version}.tar.xz
 %if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
 Patch0:                init-ceph.in-fedora.patch
 %endif
@@ -39,7 +39,7 @@ Requires:     cryptsetup
 Requires(post):        binutils
 BuildRequires: gcc-c++
 BuildRequires: boost-devel
-BuildRequires:  bzip2-devel
+BuildRequires:  libbz2-devel
 BuildRequires: cryptsetup
 BuildRequires: gdbm
 BuildRequires: hdparm
@@ -66,7 +66,7 @@ BuildRequires:        xfsprogs
 BuildRequires: xfsprogs-devel
 BuildRequires: xmlstarlet
 BuildRequires: yasm
-%if 0%{?rhel} || 0%{?centos} || 0%{?fedora}
+%if 0%{?rhel} || 0%{?centos} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: snappy-devel
 %endif
 
@@ -379,43 +379,6 @@ former ceph-libs package, which is now split up into these three subpackages.
 Packages still depending on ceph-libs should be fixed to depend on librados2,
 librbd1 or libcephfs1 instead.
 
-%package devel-compat
-Summary:       Compatibility package for Ceph headers
-Group:         Development/Libraries
-License:       LGPL-2.0
-Obsoletes:     ceph-devel
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      librados2-devel = %{epoch}:%{version}-%{release}
-Requires:      libradosstriper1-devel = %{epoch}:%{version}-%{release}
-Requires:      librbd1-devel = %{epoch}:%{version}-%{release}
-Requires:      libcephfs1-devel = %{epoch}:%{version}-%{release}
-Requires:      libcephfs_jni1-devel = %{epoch}:%{version}-%{release}
-Provides:      ceph-devel
-%description devel-compat
-This is a compatibility package to accommodate ceph-devel split into
-librados2-devel, librbd1-devel and libcephfs1-devel. Packages still depending
-on ceph-devel should be fixed to depend on librados2-devel, librbd1-devel,
-libcephfs1-devel or libradosstriper1-devel instead.
-
-%package -n python-ceph-compat
-Summary:       Compatibility package for Cephs python libraries
-Group:         System Environment/Libraries
-License:       LGPL-2.0
-Obsoletes:     python-ceph
-Requires:      python-rados = %{epoch}:%{version}-%{release}
-Requires:      python-rbd = %{epoch}:%{version}-%{release}
-Requires:      python-cephfs = %{epoch}:%{version}-%{release}
-Provides:      python-ceph
-%description -n python-ceph-compat
-This is a compatibility package to accommodate python-ceph split into
-python-rados, python-rbd and python-cephfs. Packages still depending on
-python-ceph should be fixed to depend on python-rados, python-rbd or
-python-cephfs instead.
-
-%if 0%{?opensuse} || 0%{?suse_version}
-%debug_package
-%endif
-
 #################################################################################
 # common
 #################################################################################
@@ -513,12 +476,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-osd
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/bootstrap-mds
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/radosgw
 
-%if %{defined suse_version}
-# Fedora seems to have some problems with this macro, use it only on SUSE
-%fdupes -s $RPM_BUILD_ROOT/%{python_sitelib}
-%fdupes %buildroot
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT