[glusterfs] Fix building on EL5
Niels de Vos
devos at fedoraproject.org
Wed May 29 08:49:22 UTC 2013
commit 7c2f27e62dff2cf966d8c3ca3c91e03f40fd2405
Author: Niels de Vos <devos at fedoraproject.org>
Date: Wed May 29 10:48:44 2013 +0200
Fix building on EL5
glusterfs.spec | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index 5713104..010f6c1 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -90,6 +90,10 @@ Source11: glusterfsd.service
Source12: glusterd.init
Source13: glusterfsd.init
+%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) )
+# we don't build swift/ufo on rhel5
+# not including the sources is ugly, but we state our intentions clearly
+
%if ( 0%{_for_fedora_koji_builds} )
Source15: http://download.gluster.org/pub/gluster/glusterfs/qa-releases/%{version}%{?prereltag}/UFO/gluster-swift-ufo-%{UFOVER}%{?prereltag}.tar.gz
%else
@@ -142,6 +146,8 @@ Source73: proxy-server.conf
Source74: swift.conf
Source75: object-expirer.conf
+%endif
+
Patch20: 0001-Use-updated-parallel-install-versions-of-epel-packag.patch
Patch21: 0002-Add-fixes-for-building-the-doc-package.patch
Patch22: glusterfs-3.3.1.swift.constraints.backport-1.7.4.patch
@@ -344,7 +350,10 @@ This package provides the glusterfs libgfapi library
%package resource-agents
Summary: OCF Resource Agents for GlusterFS
License: GPLv3+
+%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) )
+# EL5 does not support noarch sub-packages
BuildArch: noarch
+%endif
# this Group handling comes from the Fedora resource-agents package
%if ( 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} )
Group: System Environment/Base
@@ -1430,6 +1439,7 @@ fi
* Wed May 29 2013 Niels de Vos <devos at fedoraproject.org>
- automatically load the fuse module on EL5
- there is no need to require the unused /usr/bin/fusermount
+- fix building on EL5
* Mon May 27 2013 Niels de Vos <devos at fedoraproject.org>
- include glusterfs-api.pc in the -devel subpackage
More information about the scm-commits
mailing list