Hello community, here is the log from the commit of package libguestfs for openSUSE:Factory checked in at 2016-07-05 09:52:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libguestfs (Old) and /work/SRC/openSUSE:Factory/.libguestfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libguestfs" Changes: -------- --- /work/SRC/openSUSE:Factory/libguestfs/libguestfs.changes 2016-06-07 23:46:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libguestfs.new/libguestfs.changes 2016-07-05 09:52:59.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Jul 4 10:11:11 UTC 2016 - [email protected] + +- Fix guestfs-tools dependencies. bsc#986866 + +------------------------------------------------------------------- +Wed Jun 8 13:02:30 UTC 2016 - [email protected] + +- Fix virt-filesystem -l for btrfs. bsc#980092 +- Add p2v support (fate#316274) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libguestfs.spec ++++++ --- /var/tmp/diff_new_pack.zXNj2j/_old 2016-07-05 09:53:00.000000000 +0200 +++ /var/tmp/diff_new_pack.zXNj2j/_new 2016-07-05 09:53:00.000000000 +0200 @@ -48,7 +48,6 @@ %bcond_without zerofree %bcond_with ext4_writeable %endif -%define with_p2v 0 %bcond_without fuse @@ -58,6 +57,8 @@ %bcond_with ruby_bindings %endif +%bcond_without p2v + %if %suse_version >= 1230 %bcond_without bash_completion %else @@ -188,7 +189,7 @@ BuildRequires: hivex-devel %endif # -%if %{with_p2v} +%if %{with p2v} BuildRequires: gtk2-devel %endif # @@ -235,6 +236,7 @@ Group: System/Filesystems Provides: %{name} = %{version} Obsoletes: %{name} < %{version} +Requires: libguestfs0 = %{version} Requires: python-evtx %if %{with bash_completion} Recommends: bash-completion >= 2.0 @@ -537,8 +539,20 @@ %description -n virt-v2v virt-v2v is a tool for converting and importing virtual machines to -libvirt-managed KVM, or Red Hat Enterprise Virtualization. It can import a -variety of guest operating systems from libvirt-managed hosts and VMware ESX. +libvirt-managed KVM. It can import a variety of guest operating systems +from libvirt-managed hosts. + +%if %{with p2v} +%package -n virt-p2v +Summary: Convert a virtual machine to run on KVM +License: GPL-2.0 +Group: System/Management +Requires: virt-v2v = %{version} + +%description -n virt-p2v +virt-p2v is a tool for converting physical machines into libvirt-managed KVM machines. +It can import a variety of guest operating systems from libvirt-managed hosts. +%endif %prep : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' @@ -570,15 +584,8 @@ CFLAGS="$CFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK" CXXFLAGS="$CXXFLAGS -DGUESTFS_QEMU_NO_VIRTIO_BLK" fi -am_version="`automake --version | awk '/^automake \(GNU automake\) / { print $4 }'`" -if test -n "${am_version}" -then - case "${am_version}" in - 1.10) ;; - 1.10.*) ;; - *) autoreconf -fi ;; - esac -fi +autoreconf -fi + # %configure \ --help || : @@ -674,6 +681,11 @@ %endif %endif +%if %{with p2v} +# Remove the kickstart files from p2v package +rm $RPM_BUILD_ROOT/%{_datadir}/virt-p2v/p2v.ks.in +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -765,6 +777,7 @@ %{_sbindir}/libguestfs-make-fixed-appliance %{_bindir}/* %exclude %{_bindir}/virt-v2v +%exclude %{_bindir}/virt-p2v-* %config(noreplace) /etc/libguestfs-tools.conf /etc/virt-builder %dir /etc/xdg/virt-builder @@ -776,6 +789,7 @@ %endif %{_mandir}/man1/* %exclude %{_mandir}/man1/virt-v2v.* +%exclude %{_mandir}/man1/virt-p2v* %{_mandir}/man5/* %files -n virt-v2v @@ -783,9 +797,17 @@ %{_bindir}/virt-v2v %{_datadir}/bash-completion/*/virt-v2v %{_mandir}/man1/virt-v2v.* -%if %{with_p2v} + +%if %{with p2v} +%files -n virt-p2v +%defattr(-,root,root) %{_prefix}/lib/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* +%{_mandir}/man1/virt-p2v-make-disk* %endif %changelog ++++++ 0000-hotfix.patch ++++++ ++++ 902 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/libguestfs/0000-hotfix.patch ++++ and /work/SRC/openSUSE:Factory/.libguestfs.new/0000-hotfix.patch
