Fixes for Java.

diff --git a/java/Makefile.am b/java/Makefile.am
index 85cb372..ea4de6a 100644 (file)
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -80,6 +80,10 @@ doc-stamp: $(java_sources)
          com.redhat.et.libguestfs
        touch $@
 
+install-data-hook:
+       mkdir -p $(DESTDIR)$(datadir)/javadoc/$(PACKAGE_NAME)-java-$(PACKAGE_VERSION)
+       cp -a api/* $(DESTDIR)$(datadir)/javadoc/$(PACKAGE_NAME)-java-$(PACKAGE_VERSION)
+
 # Tests (not comprehensive).
 
 TESTS = $(java_tests:.java=.class)

diff --git a/libguestfs.spec.in b/libguestfs.spec.in
index 9cc9266..84ace5c 100644 (file)
--- a/libguestfs.spec.in
+++ b/libguestfs.spec.in
@@ -286,6 +286,10 @@ mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}
 install -p -m0644 ruby/lib/guestfs.rb $RPM_BUILD_ROOT%{ruby_sitelib}
 install -p -m0755 ruby/ext/guestfs/_guestfs.so $RPM_BUILD_ROOT%{ruby_sitearch}
 
+# Remove static-linked Java bindings.
+rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_jni.a
+rm $RPM_BUILD_ROOT%{_libdir}/libguestfs_jni.la
+
 # Generator shouldn't be executable when we distribute it.
 chmod -x src/generator.ml
 
@@ -377,14 +381,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files java-devel
 %defattr(-,root,root,-)
-%doc java/
+%doc README
 %{_libdir}/libguestfs_jni*.so
 
 
-%files java
+%files javadoc
 %defattr(-,root,root,-)
 %doc README
-/usr/share/javadoc/%{name}-java-%{version}
+%{_datadir}/javadoc/%{name}-java-%{version}
 
 
 %changelog