X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=ceph.spec;h=6f72fa70ea948ca5c031f5011d5941f8952c35e4;hb=ac843c96532477b55ef073b661160ceace21c00f;hp=605158cb1ad0099b5ab2ec5f138ae3f42572cb98;hpb=46e291f3e57dcb09e2dca4f7f1dd7c2a67750153;p=packages%2Fceph.git

diff --git a/ceph.spec b/ceph.spec
index 605158c..6f72fa7 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -6,12 +6,12 @@
 Summary:	User space components of the Ceph file system
 Summary(pl.UTF-8):	Działające w przestrzeni użytkownika elementy systemu plików Ceph
 Name:		ceph
-Version:	0.58
-Release:	2
+Version:	0.66
+Release:	1
 License:	LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:		Base
 Source0:	http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	86c03dbae51545dadfd3ff27371bf15b
+# Source0-md5:	dee4cf21cfb1aedebc29a0a52921c235
 Patch0:		%{name}-init-fix.patch
 Patch1:		%{name}.logrotate.patch
 Patch2:		%{name}-link.patch
@@ -190,12 +190,16 @@ Klient Hadoopa dla systemu plików Ceph.
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %{?with_hadoop:CPPFLAGS="%{rpmcppflags} -I%{_jvmdir}/java/include -I%{_jvmdir}/java/include/linux"}
+# ac_cv_prog_uudecode_base64=no is a hack to compile Test.class instead of
+# using included one which fails with Sun/Oracle JDK 1.6
 %configure \
+	%{?with_java:JAVAC=/usr/bin/javac} \
+	ac_cv_prog_uudecode_base64=no \
 	--sbindir=/sbin \
 	--with-cryptopp \
 	--with-hadoop%{!?with_hadoop:=no} \
@@ -276,6 +280,7 @@ fi
 %attr(755,root,root) %{_bindir}/ceph-run
 %attr(755,root,root) %{_bindir}/ceph-syn
 %attr(755,root,root) %{_bindir}/ceph_filestore_dump
+%attr(755,root,root) %{_bindir}/ceph_mon_store_converter
 %attr(755,root,root) %{_bindir}/cephfs
 %attr(755,root,root) %{_bindir}/crushtool
 %attr(755,root,root) %{_bindir}/librados-config
@@ -284,9 +289,11 @@ fi
 %attr(755,root,root) %{_bindir}/rados
 %attr(755,root,root) %{_bindir}/rbd
 %attr(755,root,root) %{_bindir}/rbd-fuse
-%attr(755,root,root) /sbin/ceph-create-keys
-%attr(755,root,root) /sbin/ceph-disk-activate
-%attr(755,root,root) /sbin/ceph-disk-prepare
+%attr(755,root,root) %{_sbindir}/ceph-create-keys
+%attr(755,root,root) %{_sbindir}/ceph-disk
+%attr(755,root,root) %{_sbindir}/ceph-disk-activate
+%attr(755,root,root) %{_sbindir}/ceph-disk-prepare
+%attr(755,root,root) %{_sbindir}/ceph-disk-udev
 %attr(755,root,root) /sbin/mkcephfs
 %attr(755,root,root) /sbin/mount.ceph
 %attr(755,root,root) /sbin/mount.fuse.ceph
@@ -360,6 +367,8 @@ fi
 
 %files -n python-ceph
 %defattr(644,root,root,755)
+%{py_sitescriptdir}/ceph_argparse.py[co]
+%{py_sitescriptdir}/cephfs.py[co]
 %{py_sitescriptdir}/rados.py[co]
 %{py_sitescriptdir}/rbd.py[co]