[libguestfs] RHEL 7: Do not depend on libldm (not yet in RHEL 7: RHBZ#887812).

Richard W.M. Jones rjones at fedoraproject.org
Mon Dec 17 15:27:01 UTC 2012


commit 87b5aa153d4a222e96c6d7e6ad1e91f12ed7bbd0
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Dec 17 15:26:35 2012 +0000

    RHEL 7: Do not depend on libldm (not yet in RHEL 7: RHBZ#887812).

 libguestfs.spec |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index 6a379a6..9949c09 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -86,7 +86,9 @@ BuildRequires: lua
 BuildRequires: lua-devel
 BuildRequires: libacl-devel
 BuildRequires: libcap-devel
+%if !0%{?rhel}
 BuildRequires: libldm-devel
+%endif
 
 # This is only needed for RHEL 5 because readline-devel doesn't
 # properly depend on it, but doesn't do any harm on other platforms:
@@ -129,7 +131,9 @@ BuildRequires: jfsutils
 %endif
 BuildRequires: kernel
 BuildRequires: kmod
+%if !0%{?rhel}
 BuildRequires: libldm
+%endif
 BuildRequires: libselinux
 BuildRequires: libxml2
 BuildRequires: lsof
@@ -208,7 +212,9 @@ Requires:      jfsutils
 %endif
 Requires:      kernel
 Requires:      kmod
+%if !0%{?rhel}
 Requires:      libldm
+%endif
 Requires:      libselinux
 Requires:      libxml2
 Requires:      lsof
@@ -1083,6 +1089,7 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
     package name (but not the binary) is different in RHEL 7.
   * Add workaround for libvirt/KVM bug RHBZ#878406.
   * Do not depend on libvirt-daemon-qemu.
+  * Do not depend on libldm (not yet in RHEL 7: RHBZ#887812).
 
 * Thu Dec 13 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.20.0-1
 - New upstream version 1.20.0.


More information about the scm-commits mailing list