Accepting request 499659 from home:olh:branches:Virtualization

- Update to version 1.32.4
  ... to fix build with gperf 3.1

OBS-URL: https://build.opensuse.org/request/show/499659
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=390

appliance.patch

@@ -1,8 +1,6 @@
-Index: libguestfs-1.32.4/appliance/init
+--- a/appliance/init
-===================================================================
++++ b/appliance/init
---- libguestfs-1.32.4.orig/appliance/init
+@@ -206,7 +206,9 @@ else
-+++ libguestfs-1.32.4/appliance/init
-@@ -182,7 +182,9 @@ else
    echo
    echo "Note: The contents of / are the rescue appliance."
    echo "You have to mount the guest's partitions under /sysroot"
@@ -11,5 +9,5 @@ Index: libguestfs-1.32.4/appliance/init
 +  echo "mount-rootfs-and-chroot.sh /dev/sda2"
 +
    echo
-   bash -i
+   run_bash_with_ctty
    echo

libguestfs-1.32.4.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b0cf71c773bb51d0a3dd992e931becc1791a40846818043d70bc94ccf32cc092
-size 7606468

libguestfs-1.36.4.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9bc559fb1b5339dd7a74f834263480b857d3c4d4dc275abc8e3087ef6e6deaa
+size 6550456

libguestfs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 30 09:42:47 UTC 2017 - ohering@suse.de
+
+- Update to version 1.32.4
+  ... to fix build with gperf 3.1
+
 -------------------------------------------------------------------
 Mon May 15 12:13:40 UTC 2017 - cbosdonnat@suse.com
 

libguestfs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libguestfs
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2011 Michal Hrusecky <mhrusecky@novell.com>
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,50 +18,24 @@
 # needsbinariesforbuild
 
 
-Version:        1.32.4
+Version:        1.36.4
 Release:        0
+%{ocaml_preserve_bytecode}
 
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%if !%opt
-# get rid of /usr/lib/rpm/find-debuginfo.sh
-# strip kills the bytecode part of ELF binaries
-# see also NO_BRP_STRIP_DEBUG in install section
-%undefine _build_create_debug
-%endif
-
-# disable certain features for a SLES11 build
-# in Virtualization repo in OBS they're reenabled via prjconf
-%if %suse_version == 1110
-%bcond_with ocaml_bindings
-%bcond_with lua_bindings
-%bcond_with python_bindings
-%bcond_with perl_bindings
-%bcond_with hivex
-%bcond_with zerofree
-%else
 %bcond_without ocaml_bindings
 %bcond_without lua_bindings
 %bcond_without python_bindings
 %bcond_without perl_bindings
 %bcond_without hivex
 %bcond_without zerofree
-%endif
 
 %bcond_without fuse
 
-%if %suse_version > 1210
 %bcond_without ruby_bindings
-%else
-%bcond_with ruby_bindings
-%endif
 
 %bcond_without p2v
 
-%if %suse_version >= 1230
 %bcond_without bash_completion
-%else
-%bcond_with bash_completion
-%endif
 # The following defines are overridden in the individual subpackages
 %define _configure_fuse --disable-fuse
 %define _configure_lua --disable-lua
@@ -70,12 +44,7 @@ Release:        0
 %define _configure_python --disable-python
 %define _configure_ruby --disable-ruby
 
-# /lib/udev is a symlink in 12.3+, package the full directory
-%if %suse_version > 1220
 %define udevrulesdir /usr/lib/udev/rules.d
-%else
-%define udevrulesdir /lib/udev/rules.d
-%endif
 #
 # use 'env LIBGUESTFS_HV=/path/to/kvm libguestfs-test-tool' to verify
 %define kvm_binary /bin/false
@@ -122,18 +91,13 @@ BuildRequires:  gcc-c++
 BuildRequires:  gperf
 BuildRequires:  libacl-devel
 BuildRequires:  libcap-devel
-%if %suse_version >= 1220
 BuildRequires:  libconfig-devel
-%endif
 BuildRequires:  libtool
 BuildRequires:  libvirt-devel >= 0.10.2
 BuildRequires:  libxml2-devel
 BuildRequires:  ncurses-devel
 %if %{with perl_bindings}
 BuildRequires:  perl(Module::Build)
-%if %suse_version < 1140
-BuildRequires:  perl-macros
-%endif
 %endif
 BuildRequires:  createrepo
 BuildRequires:  db48-utils
@@ -143,13 +107,15 @@ BuildRequires:  pkg-config
 BuildRequires:  qemu-tools
 BuildRequires:  readline-devel
 BuildRequires:  supermin >= 5.1.6
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(yajl) >= 2.0.4
 # Required to build tools, its independent from bindings
 BuildRequires:  glib2-devel
 BuildRequires:  ocaml
 BuildRequires:  ocaml-findlib
 
 #
-BuildRequires:  ocaml-rpm-macros >= 4.02.1
+BuildRequires:  ocaml-rpm-macros >= 4.03
 %if %{with ocaml_bindings}
 %define _configure_ocaml --enable-ocaml
 %endif
@@ -278,9 +244,9 @@ This package is only required for building the appliance.
 %if %{with ocaml_bindings}
 %package -n ocaml-libguestfs
 Summary:        Provides OCaml support for libguestfs
+#
 License:        GPL-2.0
 Group:          System/Filesystems
-#
 
 %description -n ocaml-libguestfs
 Allows OCaml scripts to directly use libguestfs.
@@ -393,10 +359,8 @@ BuildRequires:  findutils
 BuildRequires:  gawk
 BuildRequires:  genisoimage
 BuildRequires:  glibc
-BuildRequires:  grep
-%if %suse_version > 1210
 BuildRequires:  gptfdisk
-%endif
+BuildRequires:  grep
 BuildRequires:  gzip
 BuildRequires:  initviocons
 BuildRequires:  iproute2
@@ -420,12 +384,8 @@ BuildRequires:  strace
 %ifarch %ix86 x86_64
 BuildRequires:  syslinux
 %endif
-%if %suse_version >= 1210
 BuildRequires:  systemd
 BuildRequires:  systemd-sysvinit
-%else
-BuildRequires:  sysvinit
-%endif
 BuildRequires:  tar
 BuildRequires:  terminfo-base
 BuildRequires:  tunctl
@@ -624,14 +584,10 @@ make \
 	%{?_smp_mflags}
 
 %install
-%if !%opt
-# get rid of /usr/lib/rpm/brp-strip-debug 
-# strip kills the bytecode part of ELF binaries
-export NO_BRP_STRIP_DEBUG=true
-%endif
 %makeinstall \
 	INSTALLDIRS=vendor \
 	udevrulesdir=%{udevrulesdir}
+find     $RPM_BUILD_ROOT -ls
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/guestfs
 cp -avLt $RPM_BUILD_ROOT%{_datadir}/guestfs \
 	%{S:10005} \
@@ -702,7 +658,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n guestfs-data
 %defattr(-,root,root)
 %{_libdir}/guestfs
-%exclude %{_libdir}/guestfs/supermin.d/zz-packages-*
 
 %if %{with ocaml_bindings}
 %files -n ocaml-libguestfs
@@ -719,7 +674,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/guestfs
 %{_libdir}/ocaml/guestfs/*.a
-%if %opt
+%if %{ocaml_native_compiler}
 %{_libdir}/ocaml/guestfs/*.cmx
 %{_libdir}/ocaml/guestfs/*.cmxa
 %endif
@@ -804,9 +759,8 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with p2v}
 %files -n virt-p2v
 %defattr(-,root,root)
-%{_prefix}/lib/virt-p2v
+%{_libdir}/virt-p2v
 %{_datadir}/virt-p2v
-%attr(0555,-,-) %{_datadir}/virt-p2v/launch-virt-p2v
 %{_bindir}/virt-p2v-make-kiwi
 %{_bindir}/virt-p2v-make-disk
 %{_mandir}/man1/virt-p2v-make-kiwi*