SHA256
1
0
forked from pool/libguestfs

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
This commit is contained in:
Cédric Bosdonnat 2017-07-31 08:31:57 +00:00 committed by Git OBS Bridge
parent b10082bf9f
commit ae33b331fe
3 changed files with 7 additions and 3 deletions

0
0000-hotfix.patch Normal file
View File

View File

@ -1,7 +1,8 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 18 14:07:54 UTC 2017 - cbosdonnat@suse.com 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 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 which in "stdlib mode".
* mllib: Export prog, quiet, trace, verbose in "stdlib mode". * mllib: Export prog, quiet, trace, verbose in "stdlib mode".
* btrfs_replace: fix position of subcommand options * btrfs_replace: fix position of subcommand options
- drop 0000-hotfix.patch
- add download location for source verification purposes - add download location for source verification purposes
------------------------------------------------------------------- -------------------------------------------------------------------

View File

@ -139,6 +139,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Compatibility package for guestfs-tools Summary: Compatibility package for guestfs-tools
License: GPL-2.0 License: GPL-2.0
Group: System/Filesystems Group: System/Filesystems
Patch0: 0000-hotfix.patch
Patch100: appliance.patch Patch100: appliance.patch
Source0: http://download.libguestfs.org/1.36-stable/libguestfs-%{version}.tar.gz 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: guestfs-tools
Requires: virt-v2v Requires: virt-v2v = %{version}
%description %description
libguestfs is a set of tools for accessing and modifying virtual machine (VM) libguestfs is a set of tools for accessing and modifying virtual machine (VM)
@ -507,6 +508,8 @@ License: GPL-2.0
Group: System/Management Group: System/Management
Requires: libguestfs0 = %{version} Requires: libguestfs0 = %{version}
Requires: qemu-block-ssh Requires: qemu-block-ssh
# Conflicts with the old perl version
Conflicts: virt-v2v <= 0.9.1
%description -n virt-v2v %description -n virt-v2v
virt-v2v is a tool for converting and importing virtual machines to 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 %prep
: _ignore_exclusive_arch '%{?_ignore_exclusive_arch}' : _ignore_exclusive_arch '%{?_ignore_exclusive_arch}'
%setup -q -a 789653 %setup -q -a 789653
%patch0 -p1
%patch100 -p1 %patch100 -p1
%build %build