diff options
| author | Gary Lowell <glowell@inktank.com> | 2013-03-01 16:02:50 -0800 |
|---|---|---|
| committer | Gary Lowell <glowell@inktank.com> | 2013-03-01 18:55:35 -0800 |
| commit | b9bfc579106b8862b599eb2133f8ac464152e454 (patch) | |
| tree | 6485327da0a44119a854509808be5738e248c5d3 | |
| parent | d54ded4991a23e37357f4e38e42810b0ee411ff1 (diff) | |
| parent | eed147618a17404c07cdad3f54f9a9d143f4cb2d (diff) | |
| download | ceph-b9bfc579106b8862b599eb2133f8ac464152e454.tar.gz | |
Merge pull request #85 from dalgaaf/wip-da-spec-1wip-da-spec-1
Fix package requirements to get sgdisk and merge some changes back from SUSE spec file.
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
| -rw-r--r-- | ceph.spec.in | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/ceph.spec.in b/ceph.spec.in index 00b1d51c779..6ddec37ea56 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -47,14 +47,23 @@ BuildRequires: leveldb-devel > 1.2 ################################################################################# # specific ################################################################################# +%if ! 0%{?rhel} +BuildRequires: sharutils +%endif %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 -Requires: gptfdisk +BuildRequires: fdupes %else +Requires: gdisk BuildRequires: nss-devel BuildRequires: keyutils-libs-devel BuildRequires: libatomic_ops-devel @@ -306,6 +315,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 |