Fix handling of JAVA (jar) files. Don't move the files around in the install
section since the related Makefile is fixed instead.
Use %{_javadir} instead of /usr/share/java/
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@xxxxxxxxx>
---
ceph.spec.in | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/ceph.spec.in b/ceph.spec.in
index 7aae6fe..cd93573 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -281,9 +281,6 @@ 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/.
-mkdir -p $RPM_BUILD_ROOT/usr/share/java
-mv $RPM_BUILD_ROOT/usr/lib64/libcephfs.jar $RPM_BUILD_ROOT/usr/share/java/.
-mv $RPM_BUILD_ROOT/usr/lib64/libcephfs-test.jar $RPM_BUILD_ROOT/usr/share/java/.
%clean
rm -rf $RPM_BUILD_ROOT
@@ -561,7 +558,7 @@ fi
%files -n libcephfs-java
%defattr(-,root,root,-)
-/usr/share/java/libcephfs.jar
-/usr/share/java/libcephfs-test.jar
+%{_javadir}/libcephfs.jar
+%{_javadir}/libcephfs-test.jar
%changelog
--
1.8.0.2
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
