diff options
| author | Sage Weil <sage@newdream.net> | 2011-10-07 14:09:42 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-10-07 14:29:35 -0700 |
| commit | 88de6ab53be12d90175b3531c6fbbadda8175ec2 (patch) | |
| tree | f14e3e0a66a5f523b84aec4aaa0e400ca6dd4902 /ceph.spec.in | |
| parent | 0121bcd2f87335bab4269e7e9913b420b4f07fcf (diff) | |
| download | ceph-88de6ab53be12d90175b3531c6fbbadda8175ec2.tar.gz | |
ceph.spec.in: handle docdir properly
Pass correct path to configure (fixes SuSE builds).
Use %doc command to install sample.ceph.conf and sample.fetch_conf.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'ceph.spec.in')
| -rw-r--r-- | ceph.spec.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ceph.spec.in b/ceph.spec.in index 702fbc24326..8ba99f317ae 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -128,6 +128,7 @@ MY_CONF_OPT="$MY_CONF_OPT --without-gtk2" # default differs from what's needed for rpm %{configure} --prefix=/usr --sbindir=/sbin \ --localstatedir=/var --sysconfdir=/etc \ +--docdir=%{_docdir}/ceph \ --without-hadoop $MY_CONF_OPT \ %{?with_tcmalloc:--with-tcmalloc} %{!?with_tcmalloc:--without-tcmalloc} @@ -139,8 +140,6 @@ make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';' install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph -install -D src/init-radosgw $RPM_BUILD_ROOT%{_initrddir}/radosgw -chmod 0644 $RPM_BUILD_ROOT%{_docdir}/ceph/sample.ceph.conf install -m 0644 -D src/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ceph mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/tmp/ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/ @@ -168,7 +167,7 @@ fi %files %defattr(-,root,root,-) -%doc README COPYING +%doc README COPYING src/sample.ceph.conf src/sample.fetch_config %{_bindir}/ceph %{_bindir}/cephfs %{_bindir}/ceph-conf @@ -198,8 +197,6 @@ fi /sbin/mkcephfs /sbin/mount.ceph %{_libdir}/ceph -%{_docdir}/ceph/sample.ceph.conf -%{_docdir}/ceph/sample.fetch_config %{_sysconfdir}/bash_completion.d/ceph %{_sysconfdir}/bash_completion.d/rados %{_sysconfdir}/bash_completion.d/radosgw-admin |