From db4fee293362c6967a4db995c4a4c0fb113b5d11 Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Fri, 1 Mar 2013 11:51:26 +0100 Subject: ceph.spec.in: fix 'Requires:' to get sgdisk into the system Fix package Requirements to get sgdisk. On RHEL/CentOS/Fedora the package is gdisk. On SUSE/openSUSE < 12.2 it's scsirastools on openSUSE >= 12.2 it's in gptfdisk. Signed-off-by: Danny Al-Gaaf --- ceph.spec.in | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 4eb1e04794f..7b245436647 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -26,7 +26,6 @@ Requires: librados2 = %{version}-%{release} Requires: libcephfs1 = %{version}-%{release} Requires: python Requires: cryptsetup -Requires: gdisk Requires: parted Requires: util-linux Requires(post): binutils @@ -49,12 +48,18 @@ BuildRequires: leveldb-devel > 1.2 # specific ################################################################################# %if 0%{defined suse_version} -BuildRequires: %insserv_prereq +%if 0%{?suse_version} > 1210 +Requires: gptfdisk +%else +Requires: scsirastools +%endif Recommends: logrotate +BuildRequires: %insserv_prereq BuildRequires: mozilla-nss-devel BuildRequires: keyutils-devel BuildRequires: libatomic-ops-devel %else +Requires: gdisk BuildRequires: nss-devel BuildRequires: keyutils-libs-devel BuildRequires: libatomic_ops-devel -- cgit v1.2.1 From 558681d9fdd6c47003a49bd18fa7f3c6abed88a6 Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Fri, 1 Mar 2013 11:56:54 +0100 Subject: ceph.spec.in: add on non-RHEL sharutils to 'BuildRequires:' Add sharutils to 'BuildRequires:', needed for configure. Signed-off-by: Danny Al-Gaaf --- ceph.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index 7b245436647..9dfe92323cf 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -47,6 +47,9 @@ BuildRequires: leveldb-devel > 1.2 ################################################################################# # specific ################################################################################# +%if ! 0%{?rhel} +BuildRequires: sharutils +%endif %if 0%{defined suse_version} %if 0%{?suse_version} > 1210 Requires: gptfdisk -- cgit v1.2.1 From eed147618a17404c07cdad3f54f9a9d143f4cb2d Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Fri, 1 Mar 2013 12:02:44 +0100 Subject: ceph.spec.in: merge fdupes support from SUSE packages Use fdupes to avoid duplicated files as done in the SUSE packages. Since it doesn't work as expected on Fedora/RHEL do this only on SUSE based distros. Signed-off-by: Danny Al-Gaaf --- ceph.spec.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ceph.spec.in b/ceph.spec.in index 9dfe92323cf..912cb0ca27d 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -61,6 +61,7 @@ BuildRequires: %insserv_prereq BuildRequires: mozilla-nss-devel BuildRequires: keyutils-devel BuildRequires: libatomic-ops-devel +BuildRequires: fdupes %else Requires: gdisk BuildRequires: nss-devel @@ -313,6 +314,12 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/mds mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/bootstrap-osd mkdir -p $RPM_BUILD_ROOT/var/lib/ceph/bootstrap-mds +%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 -- cgit v1.2.1