[thrift] Fix EPEL build

Lubomir Rintel lkundrak at fedoraproject.org
Mon May 5 09:39:39 UTC 2014


commit c4ec814e7156c433fb988ff1714754588f1be9c2
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Mon May 5 11:39:14 2014 +0200

    Fix EPEL build

 thrift.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/thrift.spec b/thrift.spec
index bb82fd5..a1dbc0a 100644
--- a/thrift.spec
+++ b/thrift.spec
@@ -1,6 +1,6 @@
 %global pkg_version 0.9.1
 %global fb303_version 1.0.0_dev
-%global pkg_rel 11
+%global pkg_rel 12
 
 %global py_version 2.7
 
@@ -54,6 +54,16 @@
 %global php_configure --with-php
 %endif
 
+%if 0%{?rhel}
+%global want_mono 0
+%else
+%ifarch %{mono_arches}
+%global want_mono 1
+%else
+%global want_mono 0
+%endif
+%endif
+
 # Thrift's GO support doesn't build under Fedora
 %global want_golang 0
 %global golang_configure --without-go
@@ -109,7 +119,7 @@ BuildRequires:	openssl-devel
 BuildRequires:	zlib-devel
 BuildRequires:	bison-devel
 BuildRequires:	flex-devel
-%ifarch %{mono_arches}
+%if %{want_mono}
 BuildRequires:	mono-devel
 %endif
 BuildRequires:	glib2-devel
@@ -127,7 +137,7 @@ BuildRequires:	flex-devel
 
 BuildRequires:	ant
 
-%ifarch %{mono_arches}
+%if %{want_mono}
 Requires:	mono-core
 %endif
 
@@ -537,6 +547,8 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r
 
 
 %changelog
+* Mon May 05 2014 Lubomir Rintel <lkundrak at v3.sk> - 0.9.1-12
+- Fix EPEL build
 
 * Fri Feb 21 2014 willb <willb at redhat> - 0.9.1-11
 - fix BZ 1068561


More information about the scm-commits mailing list