]> git.pld-linux.org Git - packages/libguestfs.git/blobdiff - libguestfs.spec
projects / packages / libguestfs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- started update to 1.40.2
[packages/libguestfs.git] / libguestfs.spec
diff --git a/libguestfs.spec b/libguestfs.spec
index 5db32a950ba8ef3d43cfed8868f194af05abe02b..e3981ab66b27864eb7afe0ae8cea1ec97cc0681d 100644 (file)
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -1,6 +1,40 @@
 # TODO:
 # - 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
@@ -9,7 +43,7 @@
 %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)
@@ -30,22 +64,21 @@
 %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.36.3
+Version:       1.40.2
 Release:       0.1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://libguestfs.org/download/1.36-stable/%{name}-%{version}.tar.gz
-# Source0-md5: 1f4fadd9efca82793b488ae8d489cc50
+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
@@ -61,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
@@ -112,6 +145,7 @@ 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
@@ -119,6 +153,7 @@ BuildRequires:      xz-devel
 %endif
 %if %{with perl}
 BuildRequires: perl-ExtUtils-MakeMaker
+BuildRequires: perl-Module-Build
 BuildRequires: perl-Test-Simple
 BuildRequires: rpm-perlprov
 %endif
@@ -161,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
@@ -202,20 +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
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
-
-%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
@@ -439,12 +468,17 @@ Bashowe uzupełnianie argumentów dla narzędzi libguestfs.
 %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}
@@ -458,15 +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-python-installdir=%{py_sitedir} \
-       --with-qemu=qemu \
        --enable-install-daemon \
        %{!?with_appliance:--disable-appliance} \
        %{!?with_erlang:--disable-erlang} \
@@ -520,6 +553,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{ja,uk}/man3/guestfs-ruby.3
 %endif
 
+install -d $RPM_BUILD_ROOT%{_libdir}/guestfs
+
 %find_lang %{name}
 
 %clean
@@ -539,6 +574,7 @@ 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*
@@ -571,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.*.*.*
@@ -616,6 +648,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -644,6 +677,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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*
@@ -763,11 +797,13 @@ 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*
@@ -842,7 +878,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ocaml-libguestfs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/ocaml/stublibs/dllmlguestfs.so
-%attr(755,root,root) %{_libdir}/ocaml/stublibs/dllv2v_test_harness.so
+#%attr(755,root,root) %{_libdir}/ocaml/stublibs/dllv2v_test_harness.so
 %dir %{_libdir}/ocaml/guestfs
 %{_libdir}/ocaml/guestfs/META
 %{_libdir}/ocaml/guestfs/mlguestfs.cma
@@ -852,20 +888,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/ocaml/guestfs/guestfs.cmi
 %{_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
+#%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.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
+#%{_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}/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*
@@ -916,4 +952,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{bash_compdir}/guestfish
 %{bash_compdir}/guestmount
+%{bash_compdir}/guestunmount
 %{bash_compdir}/virt-*
Library and tools for accessing and modifying virtual machine disk images
This page took 0.084113 seconds and 4 git commands to generate.