[libguestfs/f17] Enable ruby 1.9 patch in RHEL 7 (RHBZ#812139). (cherry picked from commit 1135d20c546d9d32209afde5c9

Richard W.M. Jones rjones at fedoraproject.org
Tue Apr 17 21:34:17 UTC 2012


commit ad871b7d59c90cf0c8661cf13e9714631df0484d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Apr 12 22:16:18 2012 +0100

    Enable ruby 1.9 patch in RHEL 7 (RHBZ#812139).
    (cherry picked from commit 1135d20c546d9d32209afde5c91964ca96af22d1)

 libguestfs.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index b160aee..cdda1a8 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,14 +22,14 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.17.28
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
 Source0:       http://libguestfs.org/download/1.17-development/%{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 
-%if 0%{?fedora} >= 17
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
 Patch1:        ruby-1.9-vendor-not-site.patch
 BuildRequires: autoconf, automake, libtool, gettext-devel
 %endif
@@ -654,7 +654,7 @@ for %{name}.
 %prep
 %setup -q
 
-%if 0%{?fedora} >= 17
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
 %patch1 -p1
 autoreconf -i
 %endif
@@ -1062,6 +1062,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Apr 12 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.17.28-2
+- Enable ruby 1.9 patch in RHEL 7 (RHBZ#812139).
+
 * Thu Apr 12 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.17.28-1
 - New upstream version 1.17.28.
 


More information about the scm-commits mailing list