ceph.spec changes

diff --git a/ceph.spec b/ceph.spec
index fb30dcc161076cffb190aa4b5688c454628da75e..5318e1a07abe38a00d3e0442e267d8ed57a08aa5 100644 (file)
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,5 +1,4 @@
-%define pkg_version 0.3
-%define kernel 2.6.23.1-42.fc8
+%define pkg_version @VERSION@
 # Build against the running kernel - this can be changed to whatever
 kernel version you want to build against.
 %define kernel %(uname -r)
@@ -7,59 +6,66 @@ kernel version you want to build against.
 %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %define optflags ""
 
-Name:             ceph
-Version:    %{pkg_version}~gitdccae6d2cdff13f6a1ce545fde2623222222979a
-Release:    1%{?dist}
-Packager:   Brock Erwin <brock.erwin@pnl.gov>
-Summary:    ceph mon, mds, osd, fuse-client, and kernel-client
-License:    LGPL
-Group:            Utilities/System
-URL:        http://ceph.newdream.net/
-Source:     %{name}-%{pkg_version}.tar.gz
-BuildRequires:    gcc-c++, libtool, libtool-ltdl-devel, boost-devel, git,
+Name:          ceph
+Version:       %{pkg_version}
+Release:       1%{?dist}
+Packager:      Brock Erwin <brock.erwin@pnl.gov>
+Summary:       ceph mon, mds, osd, fuse-client, and kernel-client
+License:       LGPL
+Group:         Utilities/System
+URL:           http://ceph.newdream.net/
+Source:        %{name}-%{pkg_version}.tar.gz
+BuildRequires: gcc-c++, libtool, libtool-ltdl-devel, boost-devel, git,
 perl, perl-devel, gdbm, kernel-devel == %{kernel}
-BuildRoot:  %{mybuildroot}
-Requires:   ceph-mon, ceph-mds, ceph-osd, kmod-ceph-%{kernel}
+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
+%package    mon
 Summary:    ceph monitor and admin binaries
-Group:            Utilities/System
+Group:      Utilities/System
 Requires:   libstdc++, glibc-devel, glibc, libgcc
 %description mon
 monitor and admin binaries
 
-%package mds
+%package    mds
 Summary:    ceph mds binaries
-Group:            Utilities/System
+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
+%package     osd
+Summary:     ceph osd binaries
+Group:       Utilities/System
+Requires:    libstdc++, glibc-devel, glibc, libgcc
 %description osd
 osd binaries
 
-%package fuse-client
-Summary:        ceph fuse-based client
-Group:          Utilities/System
-Requires:   libstdc++, glibc-devel, glibc, libgcc, fuse-devel
-%description fuse client
+%package     fuse-client
+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}
+%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}
@@ -74,11 +80,10 @@ 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 src/kernel/ceph.ko $RPM_BUILD_ROOT/lib/modules/%{kernel}/extra
 # Install the kernel module
 mkdir -p $RPM_BUILD_ROOT/usr/share/ceph
 install README $RPM_BUILD_ROOT/usr/share/ceph
-install INSTALL $RPM_BUILD_ROOT/usr/share/ceph
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -108,3 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n kmod-ceph-%{kernel}
 /lib/modules/%{kernel}/extra/ceph.ko
 
+%files testing
+%{_bindir}/dumpjournal
+%{_bindir}/streamtest
+