From b10082bf9fdb003e31a0ec1080da1c119024b3783ea69321a61653cb63bcd6f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= Date: Wed, 19 Jul 2017 10:33:56 +0000 Subject: [PATCH] Accepting request 511369 from home:cbosdonnat:branches:Virtualization - add missing dependency on guestfs-data (bsc#1048848) OBS-URL: https://build.opensuse.org/request/show/511369 OBS-URL: https://build.opensuse.org/package/show/Virtualization/libguestfs?expand=0&rev=397 --- appliance.patch | 25 +++++++++++++++++++++++-- libguestfs.changes | 5 +++++ libguestfs.spec | 1 + 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/appliance.patch b/appliance.patch index d0267c5..e7f4aad 100644 --- a/appliance.patch +++ b/appliance.patch @@ -1,5 +1,7 @@ ---- a/appliance/init -+++ b/appliance/init +Index: libguestfs-1.36.5/appliance/init +=================================================================== +--- libguestfs-1.36.5.orig/appliance/init ++++ libguestfs-1.36.5/appliance/init @@ -206,7 +206,9 @@ else echo echo "Note: The contents of / are the rescue appliance." @@ -11,3 +13,22 @@ echo run_bash_with_ctty echo +Index: libguestfs-1.36.5/m4/guestfs_appliance.m4 +=================================================================== +--- libguestfs-1.36.5.orig/m4/guestfs_appliance.m4 ++++ libguestfs-1.36.5/m4/guestfs_appliance.m4 +@@ -97,9 +97,13 @@ AC_MSG_CHECKING([which Linux distro for + if test -f /etc/os-release; then + ( . /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' ) >&AS_MESSAGE_LOG_FD + DISTRO="`. /etc/os-release && echo $ID | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@'`" ++ if test -z "$DISTRO"; then ++ ( . /etc/os-release && echo $ID_LIKE | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@' ) >&AS_MESSAGE_LOG_FD ++ DISTRO="`. /etc/os-release && echo $ID_LIKE | tr '@<:@:lower:@:>@' '@<:@:upper:@:>@'`" ++ fi + AS_CASE([$DISTRO], + [FEDORA | RHEL | CENTOS],[DISTRO=REDHAT], +- [OPENSUSE | SLED | SLES],[DISTRO=SUSE], ++ [OPENSUSE | SLED | SLES | SUSE],[DISTRO=SUSE], + [ARCH],[DISTRO=ARCHLINUX]) + elif test -f /etc/debian_version; then + DISTRO=DEBIAN diff --git a/libguestfs.changes b/libguestfs.changes index 2aa209e..16c9a4b 100644 --- a/libguestfs.changes +++ b/libguestfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 18 14:07:54 UTC 2017 - cbosdonnat@suse.com + +- add missing dependency on guestfs-data (bsc#1048848) + ------------------------------------------------------------------- Mon Jul 17 07:05:10 UTC 2017 - dmueller@suse.com diff --git a/libguestfs.spec b/libguestfs.spec index 01f2032..c6258d2 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -277,6 +277,7 @@ BuildRequires: perl(Win::Hivex::Regedit) # Provides: libguestfs-perl = %{version} Obsoletes: libguestfs-perl < %{version} +Requires: guestfs-data >= %{version} Requires: perl(File::Temp) Requires: perl(Locale::TextDomain) %perl_requires