From ae33b331feff1963b8993d071fe4057a9fe19b274d846655f66b5afb42d50c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Mon, 31 Jul 2017 08:31:57 +0000 Subject: [PATCH] Accepting request 513144 from home:cbosdonnat:branches:Virtualization - Add missing dependency on guestfs-data (bsc#1048848) - Add conflict with old virt-v2v (bsc#1050069) OBS-URL: https://build.opensuse.org/request/show/513144 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=398 --- 0000-hotfix.patch | 0 libguestfs.changes | 4 ++-- libguestfs.spec | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 0000-hotfix.patch diff --git a/0000-hotfix.patch b/0000-hotfix.patch new file mode 100644 index 0000000..473a0f4 diff --git a/libguestfs.changes b/libguestfs.changes index 16c9a4b..a93679f 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Tue Jul 18 14:07:54 UTC 2017 - cbosdonnat@suse.com -- add missing dependency on guestfs-data (bsc#1048848) +- Add missing dependency on guestfs-data (bsc#1048848) +- Add conflict with old virt-v2v (bsc#1050069) ------------------------------------------------------------------- Mon Jul 17 07:05:10 UTC 2017 - dmueller@suse.com @@ -23,7 +24,6 @@ Sun Jul 16 09:07:22 UTC 2017 - dmueller@suse.com * mllib: Export which in "stdlib mode". * mllib: Export prog, quiet, trace, verbose in "stdlib mode". * btrfs_replace: fix position of subcommand options -- drop 0000-hotfix.patch - add download location for source verification purposes ------------------------------------------------------------------- diff --git a/libguestfs.spec b/libguestfs.spec index c6258d2..18ad20e 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -139,6 +139,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Compatibility package for guestfs-tools License: GPL-2.0 Group: System/Filesystems +Patch0: 0000-hotfix.patch Patch100: appliance.patch Source0: http://download.libguestfs.org/1.36-stable/libguestfs-%{version}.tar.gz @@ -154,7 +155,7 @@ Source10005: libguestfs.test.simple.create-sles12-guest-crypt-on-lvm.sh # Requires: guestfs-tools -Requires: virt-v2v +Requires: virt-v2v = %{version} %description libguestfs is a set of tools for accessing and modifying virtual machine (VM) @@ -507,6 +508,8 @@ License: GPL-2.0 Group: System/Management Requires: libguestfs0 = %{version} Requires: qemu-block-ssh +# Conflicts with the old perl version +Conflicts: virt-v2v <= 0.9.1 %description -n virt-v2v virt-v2v is a tool for converting and importing virtual machines to @@ -529,6 +532,7 @@ It can import a variety of guest operating systems from libvirt-managed hosts. %prep : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' %setup -q -a 789653 +%patch0 -p1 %patch100 -p1 %build