# TODO:
-# - finish haskell bindings (when finished upstream, not ready as of 1.20.2)
-# - systemtap probes
+# - finish haskell bindings (when finished upstream, not ready as of 1.30.4)
# - PLD appliance support? (needs at least package list adjustment)
#
# 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_without gtk # GTK+ based virt-p2v
%bcond_with haskell # Haskell (GHC) binding [incomplete, nothing is installed]
%bcond_without java # Java binding
%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_without python # Python binding
%bcond_without ruby # Ruby binding
+%bcond_without systemtap # systemtap/dtrace probes
+
+%if 0%{!?php_name:1}
+%define php_name php55
+%endif
+
+%ifarch x32
+%undefine with_erlang
+%undefine with_golang
+%undefine with_ocaml_opt
+%endif
%include /usr/lib/rpm/macros.perl
%include /usr/lib/rpm/macros.java
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.22.2
-Release: 1
+Version: 1.30.4
+Release: 5
License: LGPL v2+
Group: Libraries
-Source0: http://libguestfs.org/download/1.22-stable/%{name}-%{version}.tar.gz
-# Source0-md5: cc95d9619a32586990a2dd43bb6b77ca
+Source0: http://libguestfs.org/download/1.30-stable/%{name}-%{version}.tar.gz
+# Source0-md5: 1703d870544fbd4f43259f5339834e44
Patch0: ncurses.patch
Patch1: augeas-libxml2.patch
Patch2: %{name}-link.patch
-Patch3: %{name}-am.patch
+Patch3: %{name}-completionsdir.patch
+Patch4: golang14nosrcpkg.patch
URL: http://libguestfs.org/
BuildRequires: acl-devel
BuildRequires: attr-devel
-BuildRequires: augeas-devel >= 0.5.0
+BuildRequires: augeas-devel >= 1.0.0
BuildRequires: autoconf >= 2.50
BuildRequires: automake
+BuildRequires: bison
BuildRequires: cdrkit-mkisofs
+BuildRequires: cpio
BuildRequires: db-utils
-# erl_interface package
-%{?with_erlang:BuildRequires: erlang}
-%if %{with appliance}
-#BuildRequires: febootstrap >= 3.20
-# or
-#BuildRequires: supermin >= 4.1.0
-%endif
-BuildRequires: gettext-devel
-%{?with_haskell:BuildRequires: ghc}
+BuildRequires: flex
+BuildRequires: gettext-tools
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
-%{?with_java:BuildRequires: jdk}
BuildRequires: libcap-devel
BuildRequires: libconfig-devel
BuildRequires: libfuse-devel
BuildRequires: libvirt-devel >= 0.10.2
BuildRequires: libxml2-devel >= 2.0
BuildRequires: libxml2-progs
-%{?with_java:BuildRequires: rpm-javaprov}
+BuildRequires: ncurses-devel
+BuildRequires: pcre-devel
+BuildRequires: perl-base
+BuildRequires: perl-tools-pod
+BuildRequires: pkgconfig
+BuildRequires: po4a
+BuildRequires: qemu-img >= 1.0
+BuildRequires: readline-devel
+BuildRequires: rpmbuild(macros) >= 1.656
+# libsystemd-journal
+BuildRequires: systemd-devel >= 1:196
+BuildRequires: yajl-devel >= 2.0.4
+%if %{with appliance}
+BuildRequires: supermin >= 5.1.0
+%endif
+%if %{with erlang}
+# erl_interface package
+BuildRequires: erlang
+%endif
+%if %{with golang}
+BuildRequires: golang
+%endif
+%if %{with haskell}
+BuildRequires: ghc
+%endif
+%if %{with java}
+BuildRequires: jdk
+BuildRequires: rpm-javaprov
+%endif
%if %{with lua}
# use 5.2 as 5.1 packaging in PLD was incompatible with what's expected by configure
BuildRequires: lua52
BuildRequires: lua52-devel
%endif
-BuildRequires: ncurses-devel
%if %{with ocaml}
-BuildRequires: ocaml
+BuildRequires: ocaml >= 1:4.0
BuildRequires: ocaml-camlp4
-BuildRequires: ocaml-fileutils
+BuildRequires: ocaml-fileutils-devel
BuildRequires: ocaml-findlib
BuildRequires: ocaml-gettext-devel
+BuildRequires: ocaml-libvirt-devel >= 0.6.1.4-4
BuildRequires: ocaml-pcre-devel
+# for virt-builder
+BuildRequires: xz-devel
%endif
-BuildRequires: pcre-devel
-BuildRequires: perl-base
-BuildRequires: perl-tools-pod
%if %{with perl}
BuildRequires: perl-ExtUtils-MakeMaker
BuildRequires: perl-Test-Simple
BuildRequires: perl-libintl
BuildRequires: perl-modules
%endif
-%{?with_php:BuildRequires: /usr/bin/php}
-%{?with_php:BuildRequires: php-devel}
-BuildRequires: pkgconfig
-BuildRequires: po4a
+%if %{with php}
+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
-BuildRequires: readline-devel
-BuildRequires: rpmbuild(macros) >= 1.656
%if %{with ruby}
BuildRequires: rpm-rubyprov
BuildRequires: ruby
BuildRequires: ruby-devel
+BuildRequires: ruby-irb
BuildRequires: ruby-rake
BuildRequires: ruby-rdoc
BuildRequires: ruby-rubygems
%endif
-BuildRequires: yajl-devel >= 2
+%if %{with systemtap}
+BuildRequires: systemtap-sdt-devel
+%endif
Requires: qemu-common >= 1.1.0
+Requires: yajl >= 2.0.4
Suggests: db-utils
Suggests: icoutils
Suggests: netpbm-progs
Requires: %{name} = %{version}-%{release}
%{?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
+%endif
%description tools
libguestfs tools for accessing and modifying virtual machine (VM) disk
%description -n erlang-libguestfs -l pl.UTF-8
Wiązania Erlanga do libguestfs.
+%package -n golang-libguestfs
+Summary: Go language bindings for libguestfs
+Summary(pl.UTF-8): Wiązania języka Go do libguestfs
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+%description -n golang-libguestfs
+Go language bindings for libguestfs.
+
+%description -n golang-libguestfs -l pl.UTF-8
+Wiązania języka Go do libguestfs.
+
%package -n java-libguestfs
Summary: Java bindings for libguestfs
Summary(pl.UTF-8): Wiązania Javy do libguestfs
%description -n perl-libguestfs -l pl.UTF-8
Wiązania Perla do libguestfs.
-%package -n php-guestfs
+%package -n %{php_name}-guestfs
Summary: PHP bindings for libguestfs
Summary(pl.UTF-8): Wiązania PHP do libguestfs
Group: Development/Languages/PHP
Requires: %{name} = %{version}-%{release}
%{?requires_php_extension}
-%description -n php-guestfs
+%description -n %{php_name}-guestfs
PHP bindings for libguestfs.
-%description -n php-guestfs -l pl.UTF-8
+%description -n %{php_name}-guestfs -l pl.UTF-8
Wiązania PHP do libguestfs.
%package -n python-libguestfs
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
+# preserve dir across libtoolize
+%{__mv} build-aux/snippet{,.back}
%{__libtoolize}
+%{__mv} build-aux/snippet{.back,}
%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
vmchannel_test=no \
+ DB_DUMP=/usr/bin/db_dump \
+ DB_LOAD=/usr/bin/db_load \
%{?with_lua:LUA=/usr/bin/lua5.2} \
PBMTEXT=/usr/bin/pbmtext \
PNMTOPNG=/usr/bin/pnmtopng \
BMPTOPNM=/usr/bin/bmptopnm \
PAMCUT=/usr/bin/pamcut \
+ UNZIP=/usr/bin/unzip \
WRESTOOL=/usr/bin/wrestool \
QEMU=%{_bindir}/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-python-installdir=%{py_sitedir} \
--with-qemu=qemu \
--enable-install-daemon \
%{!?with_appliance:--disable-appliance} \
%{!?with_erlang:--disable-erlang} \
+ %{!?with_golang:--disable-golang} \
%{!?with_haskell:--disable-haskell} \
%{!?with_lua:--disable-lua} \
%{!?with_ocaml:--disable-ocaml} \
%{!?with_perl:--disable-perl} \
%{!?with_php:--disable-php} \
+ %{!?with_systemtap:--disable-probes} \
%{!?with_python:--disable-python} \
%{!?with_ruby:--disable-ruby} \
--disable-silent-rules \
%{__enable_disable static_libs static}
-%{__make} \
+%{__make} -j1 \
INSTALLDIRS=vendor
%install
%{__make} install \
INSTALLDIRS=vendor \
DESTDIR=$RPM_BUILD_ROOT \
- phpdir=%{_sysconfdir}/php/conf.d
+ phpdir=%{php_sysconfdir}/conf.d
%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
%if %{with lua}
%if %{with python}
%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.la
%endif
+# doc cleanup
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/libguestfs/{example-*,virt-inspector.rng}
%py_comp $RPM_BUILD_ROOT%{py_sitedir}
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%py_postclean
+%if %{without appliance}
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/{ja,uk}/man1/libguestfs-make-fixed-appliance.1
+%endif
+%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
+
%find_lang %{name}
%clean
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog README ROADMAP TODO
+%doc AUTHORS BUGS ChangeLog README TODO
%attr(755,root,root) %{_libdir}/libguestfs.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libguestfs.so.0
%{_mandir}/man1/guestfs-release-notes.1*
%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-tar-in
%attr(755,root,root) %{_bindir}/virt-tar-out
%attr(755,root,root) %{_sbindir}/guestfsd
-%attr(755,root,root) %{_sbindir}/libguestfs-make-fixed-appliance
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libguestfs-tools.conf
-/lib/udev/rules.d/99-guestfs-serial.rules
-%dir %{_libdir}/guestfs
-%dir %{_libdir}/guestfs/supermin.d
-%{_libdir}/guestfs/supermin.d/daemon.img
-%{_libdir}/guestfs/supermin.d/init.img
-%{_libdir}/guestfs/supermin.d/udev-rules.img
-%if %{with appliance}
-%{_libdir}/guestfs/supermin.d/base.img
-%{_libdir}/guestfs/supermin.d/hostfiles
-%endif
%{_mandir}/man1/guestfish.1*
%{_mandir}/man1/guestfs-faq.1*
%{_mandir}/man1/guestfs-performance.1*
%{_mandir}/man1/guestfs-testing.1*
%{_mandir}/man1/guestmount.1*
%{_mandir}/man1/guestunmount.1*
-%{_mandir}/man1/libguestfs-make-fixed-appliance.1*
%{_mandir}/man1/libguestfs-test-tool.1*
%{_mandir}/man1/virt-alignment-scan.1*
%{_mandir}/man1/virt-cat.1*
%{_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-tar-in.1*
%{_mandir}/man1/virt-tar-out.1*
+%{_mandir}/man5/libguestfs-tools.conf.5*
%{_mandir}/man8/guestfsd.8*
%lang(ja) %{_mandir}/ja/man1/guestfish.1*
%lang(ja) %{_mandir}/ja/man1/guestfs-faq.1*
%lang(ja) %{_mandir}/ja/man1/guestfs-testing.1*
%lang(ja) %{_mandir}/ja/man1/guestmount.1*
%lang(ja) %{_mandir}/ja/man1/guestunmount.1*
-%lang(ja) %{_mandir}/ja/man1/libguestfs-make-fixed-appliance.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-filesystems.1*
%lang(ja) %{_mandir}/ja/man1/virt-format.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*
%lang(ja) %{_mandir}/ja/man1/virt-rescue.1*
%lang(ja) %{_mandir}/ja/man1/virt-tar-in.1*
%lang(ja) %{_mandir}/ja/man1/virt-tar-out.1*
+%lang(ja) %{_mandir}/ja/man5/libguestfs-tools.conf.5*
%lang(uk) %{_mandir}/uk/man1/guestfish.1*
%lang(uk) %{_mandir}/uk/man1/guestfs-faq.1*
%lang(uk) %{_mandir}/uk/man1/guestfs-performance.1*
%lang(uk) %{_mandir}/uk/man1/guestfs-testing.1*
%lang(uk) %{_mandir}/uk/man1/guestmount.1*
%lang(uk) %{_mandir}/uk/man1/guestunmount.1*
-%lang(uk) %{_mandir}/uk/man1/libguestfs-make-fixed-appliance.1*
%lang(uk) %{_mandir}/uk/man1/libguestfs-test-tool.1*
%lang(uk) %{_mandir}/uk/man1/virt-alignment-scan.1*
%lang(uk) %{_mandir}/uk/man1/virt-cat.1*
%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(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(uk) %{_mandir}/uk/man1/virt-inspector.1*
+%lang(uk) %{_mandir}/uk/man1/virt-log.1*
%lang(uk) %{_mandir}/uk/man1/virt-ls.1*
%lang(uk) %{_mandir}/uk/man1/virt-rescue.1*
%lang(uk) %{_mandir}/uk/man1/virt-tar-in.1*
%lang(uk) %{_mandir}/uk/man1/virt-tar-out.1*
+%lang(uk) %{_mandir}/uk/man5/libguestfs-tools.conf.5*
%if %{with ocaml}
+%attr(755,root,root) %{_bindir}/virt-builder
+%attr(755,root,root) %{_bindir}/virt-customize
+%attr(755,root,root) %{_bindir}/virt-index-validate
%attr(755,root,root) %{_bindir}/virt-resize
%attr(755,root,root) %{_bindir}/virt-sparsify
%attr(755,root,root) %{_bindir}/virt-sysprep
+%attr(755,root,root) %{_bindir}/virt-v2v
+# compat dir symlink
+%{_sysconfdir}/virt-builder
+%dir /etc/xdg/virt-builder
+%dir /etc/xdg/virt-builder/repos.d
+%config(noreplace) %verify(not md5 mtime size) /etc/xdg/virt-builder/repos.d/libguestfs.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/xdg/virt-builder/repos.d/libguestfs.gpg
+%{_mandir}/man1/virt-builder.1*
+%{_mandir}/man1/virt-customize.1*
+%{_mandir}/man1/virt-index-validate.1*
%{_mandir}/man1/virt-resize.1*
%{_mandir}/man1/virt-sparsify.1*
%{_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
%lang(uk) %{_mandir}/uk/man1/virt-win-reg.1*
%endif
+%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
+%{_datadir}/virt-p2v
+%{_mandir}/man1/virt-p2v.1*
+%{_mandir}/man1/virt-p2v-make-disk.1*
+%{_mandir}/man1/virt-p2v-make-kickstart.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}
+%attr(755,root,root) %{_sbindir}/libguestfs-make-fixed-appliance
+%{_mandir}/man1/libguestfs-make-fixed-appliance.1*
+%lang(ja) %{_mandir}/ja/man1/libguestfs-make-fixed-appliance.1*
+%lang(uk) %{_mandir}/uk/man1/libguestfs-make-fixed-appliance.1*
+/lib/udev/rules.d/99-guestfs-serial.rules
+%dir %{_libdir}/guestfs
+%dir %{_libdir}/guestfs/supermin.d
+%{_libdir}/guestfs/supermin.d/daemon.img
+%{_libdir}/guestfs/supermin.d/init.img
+%{_libdir}/guestfs/supermin.d/udev-rules.img
+%{_libdir}/guestfs/supermin.d/base.img
+%{_libdir}/guestfs/supermin.d/hostfiles
+%endif
+
%if %{with erlang}
%files -n erlang-libguestfs
%defattr(644,root,root,755)
%lang(uk) %{_mandir}/uk/man3/guestfs-erlang.3*
%endif
+%if %{with golang}
+%files -n golang-libguestfs
+%defattr(644,root,root,755)
+%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/libguestfs.org
+%{_mandir}/man3/guestfs-golang.3*
+%lang(ja) %{_mandir}/ja/man3/guestfs-golang.3*
+%lang(uk) %{_mandir}/uk/man3/guestfs-golang.3*
+%endif
+
%if %{with java}
%files -n java-libguestfs
%defattr(644,root,root,755)
%files -n java-libguestfs-javadoc
%defattr(644,root,root,755)
-%{_javadocdir}/libguestfs-java-%{version}
+%{_javadocdir}/libguestfs
%endif
%if %{with lua}
%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
%{perl_vendorarch}/Sys/Guestfs.pm
%{perl_vendorarch}/Sys/bindtests.pl
%dir %{perl_vendorarch}/auto/Sys/Guestfs
-%{perl_vendorarch}/auto/Sys/Guestfs/Guestfs.bs
%attr(755,root,root) %{perl_vendorarch}/auto/Sys/Guestfs/Guestfs.so
%{_mandir}/man3/guestfs-perl.3*
%{_mandir}/man3/Sys::Guestfs.3pm*
%endif
%if %{with php}
-%files -n php-guestfs
+%files -n %{php_name}-guestfs
%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php/conf.d/guestfs_php.ini
-%attr(755,root,root) %{_libdir}/php/guestfs_php.so
+%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/guestfs_php.ini
+%attr(755,root,root) %{php_extensiondir}/guestfs_php.so
%endif
%if %{with python}
%files -n bash-completion-libguestfs
%defattr(644,root,root,755)
-%{_datadir}/bash-completion/completions/*
+%{_datadir}/bash-completion/completions/guestfish
+%{_datadir}/bash-completion/completions/guestmount
+%{_datadir}/bash-completion/completions/virt-*