ceph.spec: mostly in line with .deb

No packages for radosgw or libcrush/ceph/rados, though.

diff --git a/ceph.spec.in b/ceph.spec.in
index e14b31445c565010e1cfda3820299484dc5046f6..b73a1f2ccba27b3d4ff157cf32c960f49907f83b 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -2,7 +2,6 @@
 # Build against the running kernel - this can be changed to whatever kernel version you want to build against.
 %define kernel %(uname -r)
 # Get the kernel version that is running, but chop off the architecture part (e.g. 2.6.25.10-86.fc9.x86_64 goes to 2.6.25.10-86.fc9)
-%define knoarch %(uname -r | sed s/\.[^.]*$//g)
 %define mybuildroot %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %define optflags "-O2"
 
@@ -15,56 +14,20 @@ License:       LGPL
 Group:         Utilities/System
 URL:           http://ceph.newdream.net/
 Source:        %{name}-%{pkg_version}.tar.gz
-BuildRequires: fuse-devel, gcc-c++, libtool, libtool-ltdl-devel, boost-devel, git, perl, perl-devel, gdbm, kernel-devel == %{knoarch}
+BuildRequires: fuse-devel, gcc-c++, libtool, libtool-ltdl-devel, boost-devel, libedit-devel, fuse-devel, git, perl, perl-devel, gdbm
 BuildRoot:     %{mybuildroot}
-Requires:      ceph-mon, ceph-mds, ceph-osd, kmod-ceph-%{kernel}
 
 %description
 Ceph is a distributed network file system designed to provide excellent
 performance, reliability, and scalability.
 
-%package    mon
-Summary:    ceph monitor and admin binaries
-Group:      Utilities/System
-Requires:   libstdc++, glibc-devel, glibc, libgcc
-%description mon
-monitor and admin binaries
-
-%package    mds
-Summary:    ceph mds binaries
-Group:      Utilities/System
-Requires:   libstdc++, glibc-devel, glibc, libgcc
-%description mds
-mds binaries
-
-%package     osd
-Summary:     ceph osd binaries
-Group:       Utilities/System
-Requires:    libstdc++, glibc-devel, glibc, libgcc
-%description osd
-osd binaries
-
-%package     fuse-client
+%package     fuse
 Summary:     ceph fuse-based client
 Group:       Utilities/System
 Requires:    libstdc++, glibc-devel, glibc, libgcc, fuse-devel
 %description fuse-client
 fuse-based client
 
-%package     -n kmod-ceph-%{kernel}
-Summary:        kernel-client tools for mounting the ceph file system.
-Group:          Utilities/System
-Requires:       libstdc++, glibc-devel, glibc, libgcc
-%description -n kmod-ceph-%{kernel}
-kernel-client module
-
-%package        testing 
-Summary:        kernel-client tools for mounting the ceph file system.
-Group:          Utilities/System
-Requires:       libstdc++, glibc-devel, glibc, libgcc
-%description    testing
-Used as a placeholder for binaries that are installed but unused by the user (testing purposes only)
-
 %prep
 %setup -q -n %{name}-%{pkg_version}
 
@@ -72,14 +35,13 @@ Used as a placeholder for binaries that are installed but unused by the user (te
 ./autogen.sh
 %{configure}
 make %{_smp_mflags}
-make -C src/kernel KERNELDIR=/lib/modules/%{kernel}/build # Build the kernel module
 
 %install
 %{makeinstall}
-mkdir -p $RPM_BUILD_ROOT/lib/modules/%{kernel}/extra
-install src/kernel/ceph.ko $RPM_BUILD_ROOT/lib/modules/%{kernel}/extra   
-# Install the kernel module
+
 mkdir -p $RPM_BUILD_ROOT/usr/share/ceph
+mkdir -p $RPM_BUILD_ROOT/etc/ceph
+mkdir -l $RPM_BUILD_ROOT%{_libdir}/ceph
 install README $RPM_BUILD_ROOT/usr/share/ceph
 
 %clean
@@ -87,30 +49,35 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 /usr/share/ceph/README
-
-%files mon
-%{_bindir}/cmon
 %{_bindir}/ceph
+%{_bindir}/cconf
 %{_bindir}/crushtool
-%{_bindir}/mkmonfs
 %{_bindir}/monmaptool
 %{_bindir}/osdmaptool
 %{_bindir}/csyn
 %{_bindir}/crun
-
-%files mds
+%{_bindir}/cmon
 %{_bindir}/cmds
-
-%files osd
 %{_bindir}/cosd
-%{_bindir}/dupstore
-
-%files fuse-client
+%{_bindir}/mkmonfs
+%{_sbindir}/mount.ceph
+%{_sbindir}/mkcephfs
+%{_libdir}/ceph/ceph_common.sh
+/etc/ceph/sample.ceph.conf
+%{_mandir}/man8/cmon.8
+%{_mandir}/man8/cmds.8
+%{_mandir}/man8/cosd.8
+%{_mandir}/man8/mkcephfs.8
+%{_mandir}/man8/mkmonfs.8
+%{_mandir}/man8/crun.8
+%{_mandir}/man8/csyn.8
+%{_mandir}/man8/crushtool.8
+%{_mandir}/man8/osdmaptool.8
+%{_mandir}/man8/monmaptool.8
+%{_mandir}/man8/cconf.8
+%{_mandir}/man8/ceph.8
+%{_mandir}/man8/mount.ceph.8
+
+%files fuse
 %{_bindir}/cfuse
-
-%files -n kmod-ceph-%{kernel}
-/lib/modules/%{kernel}/extra/ceph.ko
-
-%files testing
-%{_bindir}/dumpjournal
-%{_bindir}/streamtest
+%{_mandir}/man8/cfuse.8