[libguestfs/f17] Disable some packages not available in RHEL 7. (cherry picked from commit 796453a2aa5080c54830347c69

Richard W.M. Jones rjones at fedoraproject.org
Tue Feb 14 08:42:57 UTC 2012


commit d84ca6aa1feecd78a3bd01f3e432ecff45b91ecb
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Feb 10 15:04:15 2012 +0000

    Disable some packages not available in RHEL 7.
    (cherry picked from commit 796453a2aa5080c54830347c69fee2214449a18c)

 libguestfs.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index e585328..9f3fcea 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -96,7 +96,9 @@ BuildRequires: gzip
 BuildRequires: hfsplus-tools
 BuildRequires: iproute
 BuildRequires: iputils
+%if !0%{?rhel}
 BuildRequires: jfsutils
+%endif
 BuildRequires: kernel
 BuildRequires: libselinux
 BuildRequires: libxml2
@@ -106,10 +108,12 @@ BuildRequires: lzop
 BuildRequires: mdadm
 BuildRequires: module-init-tools
 BuildRequires: nilfs-utils
+%if !0%{?rhel}
 BuildRequires: ntfs-3g
 %ifarch %{ix86} x86_64
 BuildRequires: ntfsprogs
 %endif
+%endif
 BuildRequires: parted
 BuildRequires: procps
 BuildRequires: psmisc
@@ -152,7 +156,9 @@ Requires:      gzip
 Requires:      hfsplus-tools
 Requires:      iproute
 Requires:      iputils
+%if !0%{?rhel}
 Requires:      jfsutils
+%endif
 Requires:      kernel
 Requires:      libselinux
 Requires:      libxml2
@@ -162,10 +168,12 @@ Requires:      lzop
 Requires:      mdadm
 Requires:      module-init-tools
 Requires:      nilfs-utils
+%if !0%{?rhel}
 Requires:      ntfs-3g
 %ifarch %{ix86} x86_64
 Requires:      ntfsprogs
 %endif
+%endif
 Requires:      parted
 Requires:      procps
 Requires:      psmisc
@@ -201,8 +209,10 @@ BuildRequires: java >= 1.5.0
 BuildRequires: jpackage-utils
 BuildRequires: java-devel
 BuildRequires: php-devel
+%if !0%{?rhel}
 BuildRequires: erlang-erts
 BuildRequires: erlang-erl_interface
+%endif
 BuildRequires: glib2-devel
 BuildRequires: gobject-introspection-devel
 BuildRequires: gjs
@@ -572,6 +582,7 @@ Requires:      php
 php-%{name} contains PHP bindings for %{name}.
 
 
+%if !0%{?rhel}
 %package -n erlang-%{name}
 Summary:       Erlang bindings for %{name}
 Group:         Development/Libraries
@@ -580,6 +591,7 @@ Requires:      erlang-erts
 
 %description -n erlang-%{name}
 erlang-%{name} contains Erlang bindings for %{name}.
+%endif
 
 
 %package gobject
@@ -1020,10 +1032,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Feb 10 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.17.5-5
+* Fri Feb 10 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.17.5-6
 - +BR ruby-irb.
 - Make virtio unconditional.  It's been a very long time since disabling
   virtio was a good idea.
+- Disable some packages not available in RHEL 7.
 
 * Wed Feb  8 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.17.5-1
 - New upstream version 1.17.5.


More information about the scm-commits mailing list