Hello community, here is the log from the commit of package libguestfs for openSUSE:Factory checked in at 2017-05-31 12:20:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libguestfs (Old) and /work/SRC/openSUSE:Factory/.libguestfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libguestfs" Wed May 31 12:20:48 2017 rev:50 rq:499765 version:1.36.4 Changes: -------- --- /work/SRC/openSUSE:Factory/libguestfs/libguestfs.changes 2017-05-16 14:46:56.128121358 +0200 +++ /work/SRC/openSUSE:Factory/.libguestfs.new/libguestfs.changes 2017-05-31 12:20:50.199130438 +0200 @@ -1,0 +2,6 @@ +Tue May 30 09:42:47 UTC 2017 - oher...@suse.de + +- Update to version 1.36.4 + ... to fix build with gperf 3.1 + +------------------------------------------------------------------- Old: ---- libguestfs-1.32.4.tar.xz New: ---- libguestfs-1.36.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libguestfs.spec ++++++ --- /var/tmp/diff_new_pack.SriyUA/_old 2017-05-31 12:20:51.674922107 +0200 +++ /var/tmp/diff_new_pack.SriyUA/_new 2017-05-31 12:20:51.678921542 +0200 @@ -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 <mhruse...@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 @@ %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: 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: 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 @@ %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: 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 @@ %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 @@ %{?_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 @@ %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 @@ %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 @@ %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* ++++++ 0000-hotfix.patch ++++++ ++++ 2304 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libguestfs/0000-hotfix.patch ++++ and /work/SRC/openSUSE:Factory/.libguestfs.new/0000-hotfix.patch ++++++ appliance.patch ++++++ --- /var/tmp/diff_new_pack.SriyUA/_old 2017-05-31 12:20:51.730914203 +0200 +++ /var/tmp/diff_new_pack.SriyUA/_new 2017-05-31 12:20:51.730914203 +0200 @@ -1,8 +1,6 @@ -Index: libguestfs-1.32.4/appliance/init -=================================================================== ---- libguestfs-1.32.4.orig/appliance/init -+++ libguestfs-1.32.4/appliance/init -@@ -182,7 +182,9 @@ else +--- a/appliance/init ++++ b/appliance/init +@@ -206,7 +206,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 @@ + echo "mount-rootfs-and-chroot.sh /dev/sda2" + echo - bash -i + run_bash_with_ctty echo ++++++ libguestfs-1.32.4.tar.xz -> libguestfs-1.36.4.tar.xz ++++++ /work/SRC/openSUSE:Factory/libguestfs/libguestfs-1.32.4.tar.xz /work/SRC/openSUSE:Factory/.libguestfs.new/libguestfs-1.36.4.tar.xz differ: char 13, line 1