From 6a4cfb2eb54fb4a8ba82f4b0cdc86f14a22218d8 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: May 08 2012 16:44:52 +0000
Subject: Disable hfsplus-tools on RHEL 7.

(cherry picked from commit b175e4182f7935b9aedc4e005553e900b99fff51)

---

diff --git a/libguestfs.spec b/libguestfs.spec
index a40e46c..d8f7fa2 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,7 +22,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.17.39
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -96,10 +96,11 @@ BuildRequires: grep
 #BuildRequires: grub
 #%endif
 BuildRequires: gzip
-# hfsplus-tools has issues on ARM due to issues with clang
 %ifnarch %{arm}
+%if !0%{?rhel}
 BuildRequires: hfsplus-tools
 %endif
+%endif
 BuildRequires: iproute
 BuildRequires: iputils
 %if !0%{?rhel}
@@ -164,10 +165,11 @@ Requires:      grep
 #Requires:      grub
 #%endif
 Requires:      gzip
-# hfsplus-tools has issues on ARM due to issues with clang
 %ifnarch %{arm}
+%if !0%{?rhel}
 Requires:      hfsplus-tools
 %endif
+%endif
 Requires:      iproute
 Requires:      iputils
 %if !0%{?rhel}
@@ -1069,6 +1071,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May  8 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.39-3
+- Disable hfsplus-tools on RHEL 7.
+
 * Thu May 03 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.17.39-2
 - BR perl-XML-XPath to run the new XML test.