diff --git a/ceph.spec b/ceph.spec index 9f15b46..6c6e3ce 100644 --- a/ceph.spec +++ b/ceph.spec @@ -1,6 +1,6 @@ Name: ceph Version: 0.37 -Release: 2%{?dist} +Release: 2%{?dist}.0.usrmove.1 Summary: User space components of the Ceph file system License: LGPLv2 Group: System Environment/Base @@ -15,12 +15,13 @@ BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, %ifnarch ppc64 s390 s390x BuildRequires: google-perftools-devel %endif -BuildRequires: cryptopp-devel, libatomic_ops-devel-static +BuildRequires: cryptopp-devel, libatomic_ops-devel BuildRequires: pkgconfig, libcurl-devel, keyutils-libs-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig, binutils, libedit Requires(preun): chkconfig Requires(preun): initscripts +Conflicts: filesystem < 3 %description Ceph is a distributed network file system designed to provide excellent @@ -82,8 +83,7 @@ file system. %build ./autogen.sh -%{configure} --prefix=/usr --sbindir=/sbin \ ---localstatedir=/var --sysconfdir=/etc \ +%{configure} \ %ifarch ppc64 s390 s390x --without-tcmalloc \ %endif @@ -152,8 +152,8 @@ fi %{_libdir}/librgw.so.* %{_libdir}/rados-classes/libcls_rbd.so.* %{_libdir}/rados-classes/libcls_rgw.so* -/sbin/mkcephfs -/sbin/mount.ceph +%{_sbindir}/mkcephfs +%{_sbindir}/mount.ceph %{_libdir}/ceph %{_docdir}/ceph/sample.ceph.conf %{_docdir}/ceph/sample.fetch_config