diff options
| author | Richard Jones <rjones@redhat.com> | 2009-04-21 23:15:25 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2009-04-21 23:15:25 +0100 |
| commit | b36dab0552df45d3d08aeeaf931294d091516f1f (patch) | |
| tree | ca171e59096c87ea688c130e2b1936469a7a9839 | |
| parent | 6d5f69f81a888e26a425800c80d2892e10d74cea (diff) | |
| download | libguestfs-b36dab0552df45d3d08aeeaf931294d091516f1f.tar.gz libguestfs-b36dab0552df45d3d08aeeaf931294d091516f1f.tar.xz libguestfs-b36dab0552df45d3d08aeeaf931294d091516f1f.zip | |
Fixes for Java.1.0.5
| -rw-r--r-- | java/Makefile.am | 4 | ||||
| -rw-r--r-- | libguestfs.spec.in | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/java/Makefile.am b/java/Makefile.am index 85cb372b..ea4de6ab 100644 --- 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 9cc9266b..84ace5cd 100644 --- 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 |