X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libguestfs.spec;h=e3981ab66b27864eb7afe0ae8cea1ec97cc0681d;hb=b62eed340b4b7cb6718bdb8c15fc46a9170da571;hp=44313c53c739bef39bee444e08dae85e0eea660d;hpb=ef731dae5171156f90a7d3bc245531cf15a9e1a6;p=packages%2Flibguestfs.git

diff --git a/libguestfs.spec b/libguestfs.spec
index 44313c5..e3981ab 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -1,20 +1,55 @@
 # TODO:
-# - finish haskell bindings (when finished upstream, not ready as of 1.26.3)
+# - finish haskell bindings (when finished upstream, not ready as of 1.30.4)
 # - PLD appliance support? (needs at least package list adjustment)
+# 
+# /etc/xdg/virt-builder/repos.d/opensuse.conf
+# /etc/xdg/virt-builder/repos.d/opensuse.gpg
+# %{_bindir}/virt-builder-repository
+# %{bash_compdir}/libguestfs-test-tool
+# %{_mandir}/ja/man1/guestfs-building.1*
+# %{_mandir}/ja/man1/virt-v2v-copy-to-local.1*
+# %{_mandir}/ja/man1/virt-v2v-input-vmware.1*
+# %{_mandir}/ja/man1/virt-v2v-input-xen.1*
+# %{_mandir}/ja/man1/virt-v2v-output-local.1*
+# %{_mandir}/ja/man1/virt-v2v-output-openstack.1*
+# %{_mandir}/ja/man1/virt-v2v-output-rhv.1*
+# %{_mandir}/ja/man1/virt-v2v-support.1*
+# %{_mandir}/ja/man3/guestfs-golang.3*
+# %{_mandir}/ja/man3/guestfs-java.3*
+# %{_mandir}/man1/guestfs-building.1*
+# %{_mandir}/man1/virt-builder-repository.1*
+# %{_mandir}/man1/virt-v2v-input-vmware.1*
+# %{_mandir}/man1/virt-v2v-input-xen.1*
+# %{_mandir}/man1/virt-v2v-output-local.1*
+# %{_mandir}/man1/virt-v2v-output-openstack.1*
+# %{_mandir}/man1/virt-v2v-output-rhv.1*
+# %{_mandir}/man1/virt-v2v-support.1*
+# %{_mandir}/man3/guestfs-gobject.3*
+# %{_mandir}/uk/man1/guestfs-building.1*
+# %{_mandir}/uk/man1/virt-v2v-copy-to-local.1*
+# %{_mandir}/uk/man1/virt-v2v-input-vmware.1*
+# %{_mandir}/uk/man1/virt-v2v-input-xen.1*
+# %{_mandir}/uk/man1/virt-v2v-output-local.1*
+# %{_mandir}/uk/man1/virt-v2v-output-openstack.1*
+# %{_mandir}/uk/man1/virt-v2v-output-rhv.1*
+# %{_mandir}/uk/man1/virt-v2v-support.1*
+# %{_mandir}/uk/man3/guestfs-golang.3*
+# %{_mandir}/uk/man3/guestfs-java.3*
 #
 # Conditional build:
 %bcond_with	static_libs	# build static libraries
 %bcond_with	appliance	# appliance build (no PLD support)
 %bcond_without	erlang		# Erlang binding
-%bcond_without	golang		# Go language binding
+%bcond_with	golang		# Go language binding
 %bcond_without	gtk		# GTK+ based virt-p2v
 %bcond_with	haskell		# Haskell (GHC) binding [incomplete, nothing is installed]
-%bcond_without	java		# Java binding
+%bcond_with	java		# Java binding (broken linking, missing symbols)
 %bcond_without	lua		# Lua binding
 %bcond_without	ocaml		# OCaml binding and tools
+%bcond_without	ocaml_opt	# skip building native optimized binaries (bytecode is always built)
 %bcond_without	perl		# Perl binding
 %bcond_without	perltools	# Perl tools
-%bcond_without	php		# PHP binding
+%bcond_with	php		# PHP binding
 %bcond_without	python		# Python binding
 %bcond_without	ruby		# Ruby binding
 %bcond_without	systemtap	# systemtap/dtrace probes
@@ -22,21 +57,28 @@
 %if 0%{!?php_name:1}
 %define		php_name	php55
 %endif
-%include	/usr/lib/rpm/macros.perl
-%include	/usr/lib/rpm/macros.java
+
+%ifarch x32
+%undefine	with_erlang
+%undefine	with_golang
+%undefine	with_ocaml_opt
+%endif
+
 Summary:	Library and tools for accessing and modifying virtual machine disk images
 Summary(pl.UTF-8):	Biblioteka i narzędzia do dostępu i modyfikacji obrazów dysków maszyn wirtualnych
 Name:		libguestfs
-Version:	1.28.6
-Release:	1
+Version:	1.40.2
+Release:	0.1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://libguestfs.org/download/1.28-stable/%{name}-%{version}.tar.gz
-# Source0-md5:	f9a9dc43460475fe714e22df821c2739
+Source0:	http://libguestfs.org/download/1.40-stable/%{name}-%{version}.tar.gz
+# Source0-md5:	7cf90b71013c83f28fead844d3b343ea
 Patch0:		ncurses.patch
 Patch1:		augeas-libxml2.patch
 Patch2:		%{name}-link.patch
 Patch3:		%{name}-completionsdir.patch
+Patch4:		golang14nosrcpkg.patch
+Patch5:		ocaml-4.12.patch
 URL:		http://libguestfs.org/
 BuildRequires:	acl-devel
 BuildRequires:	attr-devel
@@ -52,13 +94,13 @@ BuildRequires:	glib2-devel >= 1:2.26.0
 BuildRequires:	gobject-introspection-devel >= 1.30.0
 BuildRequires:	gperf
 %{?with_gtk:BuildRequires:	gtk+2-devel >= 2.0}
-BuildRequires:	gtk-doc >= 1.14
 BuildRequires:	hivex-devel >= 1.2.7
 BuildRequires:	libcap-devel
 BuildRequires:	libconfig-devel
 BuildRequires:	libfuse-devel
 BuildRequires:	libmagic-devel
 BuildRequires:	libselinux-devel
+BuildRequires:	libtirpc-devel
 BuildRequires:	libtool
 BuildRequires:	libvirt-devel >= 0.10.2
 BuildRequires:	libxml2-devel >= 2.0
@@ -103,12 +145,15 @@ BuildRequires:	ocaml-camlp4
 BuildRequires:	ocaml-fileutils-devel
 BuildRequires:	ocaml-findlib
 BuildRequires:	ocaml-gettext-devel
+BuildRequires:	ocaml-hivex-devel
+BuildRequires:	ocaml-libvirt-devel >= 0.6.1.4-4
 BuildRequires:	ocaml-pcre-devel
 # for virt-builder
 BuildRequires:	xz-devel
 %endif
 %if %{with perl}
 BuildRequires:	perl-ExtUtils-MakeMaker
+BuildRequires:	perl-Module-Build
 BuildRequires:	perl-Test-Simple
 BuildRequires:	rpm-perlprov
 %endif
@@ -130,8 +175,8 @@ BuildRequires:	%{php_name}-devel
 BuildRequires:	%{php_name}-program
 %endif
 %if %{with python}
-BuildRequires:	python
-BuildRequires:	python-devel
+BuildRequires:	python >= 1:2.7
+BuildRequires:	python-devel >= 1:2.7
 BuildRequires:	rpm-pythonprov
 %endif
 %if %{with ruby}
@@ -151,8 +196,16 @@ Requires:	yajl >= 2.0.4
 Suggests:	db-utils
 Suggests:	icoutils
 Suggests:	netpbm-progs
+Obsoletes:	libguestfs-apidocs < 1.40.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%ifarch %{ix86}
+%define		qemu_bin	/usr/bin/qemu-system-i386
+%endif
+%ifarch %{x8664} x32
+%define		qemu_bin	/usr/bin/qemu-system-x86_64
+%endif
+
 %description
 libguestfs is a library and set of tools for accessing and modifying
 virtual machine (VM) disk images. You can use this for viewing and
@@ -192,17 +245,6 @@ Static libguestfs library.
 %description static -l pl.UTF-8
 Statyczna biblioteka libguestfs.
 
-%package apidocs
-Summary:	libguestfs API documentation
-Summary(pl.UTF-8):	Dokumentacja API libguestfs
-Group:		Documentation
-
-%description apidocs
-libguestfs API documentation.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API libguestfs.
-
 %package gobject
 Summary:	GObject bindings to libguestfs library
 Summary(pl.UTF-8):	Wiązania GObject do biblioteki libguestfs
@@ -247,10 +289,11 @@ Summary:	libguestfs tools for accessing and modifying virtual machine disk image
 Summary(pl.UTF-8):	Narzędzia libguestfs do dostępu i modyfikacji obrazów dysków maszyn wirtualnych
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
+Requires:	augeas-libs >= 1.0.0
 %{?with_ocaml:Requires:	ocaml-libguestfs = %{version}-%{release}}
 %{?with_perltools:Requires:	perl-libguestfs = %{version}-%{release}}
-Requires:	augeas-libs >= 1.0.0
 %if %{with ocaml}
+Requires:	ocaml-libvirt >= 0.6.1.4-4
 Suggests:	unzip
 Suggests:	xz
 Suggests:	zip
@@ -424,12 +467,18 @@ Bashowe uzupełnianie argumentów dla narzędzi libguestfs.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+perl(\s|$),#!%{__perl}\1,' \
+      tools/virt-list-filesystems \
+      tools/virt-list-partitions \
+      tools/virt-tar \
+      tools/virt-win-reg \
 
 %build
 # preserve dir across libtoolize
-%{__mv} build-aux/snippet{,.back}
 %{__libtoolize}
-%{__mv} build-aux/snippet{.back,}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
@@ -443,14 +492,14 @@ Bashowe uzupełnianie argumentów dla narzędzi libguestfs.
 	PNMTOPNG=/usr/bin/pnmtopng \
 	BMPTOPNM=/usr/bin/bmptopnm \
 	PAMCUT=/usr/bin/pamcut \
+	SUPERMIN=/usr/bin/supermin \
 	UNZIP=/usr/bin/unzip \
 	WRESTOOL=/usr/bin/wrestool \
-	QEMU=%{_bindir}/qemu \
+	QEMU=%{?qemu_bin}%{!?qemu_bin:/usr/bin/qemu} \
 	ZIP=/usr/bin/zip \
 	--with-completionsdir=%{_datadir}/bash-completion/completions \
-	--with-html-dir=%{_gtkdocdir} \
 	--with-java=%{?with_java:%{java_home}}%{!?with_java:no} \
-	--with-qemu=qemu \
+	--with-python-installdir=%{py_sitedir} \
 	--enable-install-daemon \
 	%{!?with_appliance:--disable-appliance} \
 	%{!?with_erlang:--disable-erlang} \
@@ -466,7 +515,7 @@ Bashowe uzupełnianie argumentów dla narzędzi libguestfs.
 	--disable-silent-rules \
 	%{__enable_disable static_libs static}
 
-%{__make} \
+%{__make} -j1 \
 	INSTALLDIRS=vendor
 
 %install
@@ -494,14 +543,18 @@ rm -rf $RPM_BUILD_ROOT
 %if %{without appliance}
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{ja,uk}/man1/libguestfs-make-fixed-appliance.1
 %endif
-%if %{without ocaml}
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/{ja,uk}/man1/virt-{builder,index-validate,resize,sparsify,sysprep}.1 \
+%if %{with ocaml}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/dll*.so.owner
+%else
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{ja,uk}/man1/virt-{builder,index-validate,resize,sparsify,sysprep,v2v-test-harness}.1 \
 	$RPM_BUILD_ROOT%{_mandir}/{ja,uk}/man3/guestfs-ocaml.3
 %endif
 %if %{without ruby}
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{ja,uk}/man3/guestfs-ruby.3
 %endif
 
+install -d $RPM_BUILD_ROOT%{_libdir}/guestfs
+
 %find_lang %{name}
 
 %clean
@@ -521,20 +574,30 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS BUGS ChangeLog README TODO
 %attr(755,root,root) %{_libdir}/libguestfs.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libguestfs.so.0
+%dir %{_libdir}/guestfs
 %{_mandir}/man1/guestfs-release-notes.1*
+%{_mandir}/man1/guestfs-security.1*
 %lang(ja) %{_mandir}/ja/man1/guestfs-release-notes.1*
+%lang(ja) %{_mandir}/ja/man1/guestfs-security.1*
 %lang(uk) %{_mandir}/uk/man1/guestfs-release-notes.1*
+%lang(uk) %{_mandir}/uk/man1/guestfs-security.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libguestfs.so
 %{_includedir}/guestfs.h
 %{_pkgconfigdir}/libguestfs.pc
+%{_mandir}/man1/guestfs-hacking.1*
+%{_mandir}/man1/guestfs-internals.1*
 %{_mandir}/man3/guestfs.3*
 %{_mandir}/man3/guestfs-examples.3*
 %{_mandir}/man3/libguestfs.3*
+%lang(ja) %{_mandir}/ja/man1/guestfs-hacking.1*
+%lang(ja) %{_mandir}/ja/man1/guestfs-internals.1*
 %lang(ja) %{_mandir}/ja/man3/guestfs.3*
 %lang(ja) %{_mandir}/ja/man3/guestfs-examples.3*
+%lang(uk) %{_mandir}/uk/man1/guestfs-hacking.1*
+%lang(uk) %{_mandir}/uk/man1/guestfs-internals.1*
 %lang(uk) %{_mandir}/uk/man3/guestfs.3*
 %lang(uk) %{_mandir}/uk/man3/guestfs-examples.3*
 
@@ -544,10 +607,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libguestfs.a
 %endif
 
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/guestfs
-
 %files gobject
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libguestfs-gobject-1.0.so.*.*.*
@@ -579,16 +638,20 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/virt-copy-in
 %attr(755,root,root) %{_bindir}/virt-copy-out
 %attr(755,root,root) %{_bindir}/virt-df
+%attr(755,root,root) %{_bindir}/virt-dib
 %attr(755,root,root) %{_bindir}/virt-diff
 %attr(755,root,root) %{_bindir}/virt-edit
 %attr(755,root,root) %{_bindir}/virt-filesystems
 %attr(755,root,root) %{_bindir}/virt-format
+%attr(755,root,root) %{_bindir}/virt-get-kernel
 %attr(755,root,root) %{_bindir}/virt-inspector
 %attr(755,root,root) %{_bindir}/virt-log
 %attr(755,root,root) %{_bindir}/virt-ls
 %attr(755,root,root) %{_bindir}/virt-rescue
+%attr(755,root,root) %{_bindir}/virt-tail
 %attr(755,root,root) %{_bindir}/virt-tar-in
 %attr(755,root,root) %{_bindir}/virt-tar-out
+%attr(755,root,root) %{_bindir}/virt-v2v-copy-to-local
 %attr(755,root,root) %{_sbindir}/guestfsd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libguestfs-tools.conf
 %{_mandir}/man1/guestfish.1*
@@ -604,16 +667,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/virt-copy-in.1*
 %{_mandir}/man1/virt-copy-out.1*
 %{_mandir}/man1/virt-df.1*
+%{_mandir}/man1/virt-dib.1*
 %{_mandir}/man1/virt-diff.1*
 %{_mandir}/man1/virt-edit.1*
 %{_mandir}/man1/virt-filesystems.1*
 %{_mandir}/man1/virt-format.1*
+%{_mandir}/man1/virt-get-kernel.1*
 %{_mandir}/man1/virt-inspector.1*
 %{_mandir}/man1/virt-log.1*
 %{_mandir}/man1/virt-ls.1*
 %{_mandir}/man1/virt-rescue.1*
+%{_mandir}/man1/virt-tail.1*
 %{_mandir}/man1/virt-tar-in.1*
 %{_mandir}/man1/virt-tar-out.1*
+%{_mandir}/man1/virt-v2v-copy-to-local.1*
 %{_mandir}/man5/libguestfs-tools.conf.5*
 %{_mandir}/man8/guestfsd.8*
 %lang(ja) %{_mandir}/ja/man1/guestfish.1*
@@ -625,13 +692,16 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja) %{_mandir}/ja/man1/guestunmount.1*
 %lang(ja) %{_mandir}/ja/man1/libguestfs-test-tool.1*
 %lang(ja) %{_mandir}/ja/man1/virt-alignment-scan.1*
+%lang(ja) %{_mandir}/ja/man1/virt-diff.1*
 %lang(ja) %{_mandir}/ja/man1/virt-cat.1*
 %lang(ja) %{_mandir}/ja/man1/virt-copy-in.1*
 %lang(ja) %{_mandir}/ja/man1/virt-copy-out.1*
 %lang(ja) %{_mandir}/ja/man1/virt-df.1*
+%lang(ja) %{_mandir}/ja/man1/virt-dib.1*
 %lang(ja) %{_mandir}/ja/man1/virt-edit.1*
 %lang(ja) %{_mandir}/ja/man1/virt-filesystems.1*
 %lang(ja) %{_mandir}/ja/man1/virt-format.1*
+%lang(ja) %{_mandir}/ja/man1/virt-get-kernel.1*
 %lang(ja) %{_mandir}/ja/man1/virt-inspector.1*
 %lang(ja) %{_mandir}/ja/man1/virt-log.1*
 %lang(ja) %{_mandir}/ja/man1/virt-ls.1*
@@ -652,9 +722,12 @@ rm -rf $RPM_BUILD_ROOT
 %lang(uk) %{_mandir}/uk/man1/virt-copy-in.1*
 %lang(uk) %{_mandir}/uk/man1/virt-copy-out.1*
 %lang(uk) %{_mandir}/uk/man1/virt-df.1*
+%lang(ja) %{_mandir}/uk/man1/virt-dib.1*
+%lang(uk) %{_mandir}/uk/man1/virt-diff.1*
 %lang(uk) %{_mandir}/uk/man1/virt-edit.1*
 %lang(uk) %{_mandir}/uk/man1/virt-filesystems.1*
 %lang(uk) %{_mandir}/uk/man1/virt-format.1*
+%lang(ja) %{_mandir}/uk/man1/virt-get-kernel.1*
 %lang(uk) %{_mandir}/uk/man1/virt-inspector.1*
 %lang(uk) %{_mandir}/uk/man1/virt-log.1*
 %lang(uk) %{_mandir}/uk/man1/virt-ls.1*
@@ -684,15 +757,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/virt-sysprep.1*
 %{_mandir}/man1/virt-v2v.1*
 %lang(ja) %{_mandir}/ja/man1/virt-builder.1*
+%lang(ja) %{_mandir}/ja/man1/virt-customize.1*
 %lang(ja) %{_mandir}/ja/man1/virt-index-validate.1*
 %lang(ja) %{_mandir}/ja/man1/virt-resize.1*
 %lang(ja) %{_mandir}/ja/man1/virt-sparsify.1*
 %lang(ja) %{_mandir}/ja/man1/virt-sysprep.1*
+%lang(ja) %{_mandir}/ja/man1/virt-v2v.1*
 %lang(uk) %{_mandir}/uk/man1/virt-builder.1*
+%lang(uk) %{_mandir}/uk/man1/virt-customize.1*
 %lang(uk) %{_mandir}/uk/man1/virt-index-validate.1*
 %lang(uk) %{_mandir}/uk/man1/virt-resize.1*
 %lang(uk) %{_mandir}/uk/man1/virt-sparsify.1*
 %lang(uk) %{_mandir}/uk/man1/virt-sysprep.1*
+%lang(uk) %{_mandir}/uk/man1/virt-v2v.1*
 %endif
 %if %{with perltools}
 %attr(755,root,root) %{_bindir}/virt-list-filesystems
@@ -720,11 +797,19 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with gtk}
 %attr(755,root,root) %{_bindir}/virt-p2v-make-disk
 %attr(755,root,root) %{_bindir}/virt-p2v-make-kickstart
-%attr(755,root,root) %{_libexecdir}/virt-p2v
+%attr(755,root,root) %{_bindir}/virt-p2v-make-kiwi
+%attr(755,root,root) %{_libdir}/virt-p2v
 %{_datadir}/virt-p2v
 %{_mandir}/man1/virt-p2v.1*
 %{_mandir}/man1/virt-p2v-make-disk.1*
 %{_mandir}/man1/virt-p2v-make-kickstart.1*
+%{_mandir}/man1/virt-p2v-make-kiwi.1*
+%lang(ja) %{_mandir}/ja/man1/virt-p2v.1*
+%lang(ja) %{_mandir}/ja/man1/virt-p2v-make-disk.1*
+%lang(ja) %{_mandir}/ja/man1/virt-p2v-make-kickstart.1*
+%lang(uk) %{_mandir}/uk/man1/virt-p2v.1*
+%lang(uk) %{_mandir}/uk/man1/virt-p2v-make-disk.1*
+%lang(uk) %{_mandir}/uk/man1/virt-p2v-make-kickstart.1*
 %endif
 
 %if %{with appliance}
@@ -758,7 +843,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/golang/pkg/linux_*/libguestfs.org
 %dir %{_libdir}/golang/pkg/linux_*/libguestfs.org/guestfs
 %{_libdir}/golang/pkg/linux_*/libguestfs.org/guestfs/guestfs.a
-%{_libdir}/golang/src/pkg/libguestfs.org
+%{_libdir}/golang/src/libguestfs.org
 %{_mandir}/man3/guestfs-golang.3*
 %lang(ja) %{_mandir}/ja/man3/guestfs-golang.3*
 %lang(uk) %{_mandir}/uk/man3/guestfs-golang.3*
@@ -793,20 +878,33 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ocaml-libguestfs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/dllmlguestfs.so
-%{_libdir}/ocaml/stublibs/dllmlguestfs.so.owner
+#%attr(755,root,root) %{_libdir}/ocaml/stublibs/dllv2v_test_harness.so
+%dir %{_libdir}/ocaml/guestfs
+%{_libdir}/ocaml/guestfs/META
+%{_libdir}/ocaml/guestfs/mlguestfs.cma
 
 %files -n ocaml-libguestfs-devel
 %defattr(644,root,root,755)
-%dir %{_libdir}/ocaml/guestfs
-%{_libdir}/ocaml/guestfs/META
 %{_libdir}/ocaml/guestfs/guestfs.cmi
-%{_libdir}/ocaml/guestfs/guestfs.cmx
 %{_libdir}/ocaml/guestfs/guestfs.mli
 %{_libdir}/ocaml/guestfs/libmlguestfs.a
+#%dir %{_libdir}/ocaml/v2v_test_harness
+#%{_libdir}/ocaml/v2v_test_harness/META
+#%{_libdir}/ocaml/v2v_test_harness/libv2v_test_harness.a
+#%{_libdir}/ocaml/v2v_test_harness/v2v_test_harness.cmi
+#%{_libdir}/ocaml/v2v_test_harness/v2v_test_harness.mli
+%if %{with ocaml_opt}
+%{_libdir}/ocaml/guestfs/guestfs.cmx
 %{_libdir}/ocaml/guestfs/mlguestfs.a
-%{_libdir}/ocaml/guestfs/mlguestfs.cma
 %{_libdir}/ocaml/guestfs/mlguestfs.cmxa
+#%{_libdir}/ocaml/v2v_test_harness/v2v_test_harness.a
+#%{_libdir}/ocaml/v2v_test_harness/v2v_test_harness.cmx
+#%{_libdir}/ocaml/v2v_test_harness/v2v_test_harness.cmxa
+%endif
+#%{_mandir}/man1/virt-v2v-test-harness.1*
 %{_mandir}/man3/guestfs-ocaml.3*
+%lang(ja) %{_mandir}/ja/man1/virt-v2v-test-harness.1*
+%lang(uk) %{_mandir}/uk/man1/virt-v2v-test-harness.1*
 %lang(ja) %{_mandir}/ja/man3/guestfs-ocaml.3*
 %lang(uk) %{_mandir}/uk/man3/guestfs-ocaml.3*
 %endif
@@ -815,7 +913,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n perl-libguestfs
 %defattr(644,root,root,755)
 %{perl_vendorarch}/Sys/Guestfs.pm
-%{perl_vendorarch}/Sys/bindtests.pl
 %dir %{perl_vendorarch}/auto/Sys/Guestfs
 %attr(755,root,root) %{perl_vendorarch}/auto/Sys/Guestfs/Guestfs.so
 %{_mandir}/man3/guestfs-perl.3*
@@ -853,6 +950,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n bash-completion-libguestfs
 %defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/guestfish
-%{_datadir}/bash-completion/completions/guestmount
-%{_datadir}/bash-completion/completions/virt-*
+%{bash_compdir}/guestfish
+%{bash_compdir}/guestmount
+%{bash_compdir}/guestunmount
+%{bash_compdir}/virt-*