pool/libguestfs
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 511369 from home:cbosdonnat:branches:Virtualization

Browse Source 
- 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
This commit is contained in:
Cédric Bosdonnat 2017-07-19 10:33:56 +00:00 committed by Git OBS Bridge
parent 2426376ef6
commit b10082bf9f
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
appliance.patch
View File

@ -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

5
libguestfs.changes
View File

@ -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

1
libguestfs.spec
View File

@ -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