Don't move libcephfs_jni files around from %{_libdir} to /usr/lib/jni/
in the buildroot. They should be placed in %{_libdir} as all libs.

Signed-off-by: Danny Al-Gaaf <[email protected]>
---
 ceph.spec.in | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ceph.spec.in b/ceph.spec.in
index 67a4915..f6a9006 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -280,10 +280,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/ceph/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ceph/
 
-#  Relocate java packages to expected locations in buildroot.
-mkdir -p $RPM_BUILD_ROOT/usr/lib/jni
-mv $RPM_BUILD_ROOT/usr/lib64/libcephfs_jni.so* $RPM_BUILD_ROOT/usr/lib/jni/.
-
 # udev rules
 install -D -m 644 udev/50-rbd.rules 
$RPM_BUILD_ROOT/lib/udev/rules.d/50-rbd.rules
 
@@ -414,7 +410,7 @@ fi
 %{_libdir}/libcephfs.so
 %{_libdir}/librbd.so
 %{_libdir}/librados.so
-/usr/lib/jni/libcephfs_jni.so
+%{_libdir}/libcephfs_jni.so
 
 
#################################################################################
 %files radosgw
@@ -562,7 +558,7 @@ fi
 
 %files -n libcephfs_jni1
 %defattr(-,root,root,-)
-/usr/lib/jni/libcephfs_jni.so.*
+%{_libdir}/libcephfs_jni.so.*
 
 %files -n cephfs-java
 %defattr(-,root,root,-)
-- 
1.8.1.1

--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to