rpms/glusterfs
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix building on EL5

Browse Source
This commit is contained in:
Niels de Vos 2013-05-29 10:48:44 +02:00
parent 4b7832bf10
commit 7c2f27e62d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glusterfs.spec
View File

@ -90,6 +90,10 @@ Source11: glusterfsd.service
Source12: glusterd.init Source12: glusterd.init
Source13: glusterfsd.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} ) %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 Source15: http://download.gluster.org/pub/gluster/glusterfs/qa-releases/%{version}%{?prereltag}/UFO/gluster-swift-ufo-%{UFOVER}%{?prereltag}.tar.gz
%else %else
@ -142,6 +146,8 @@ Source73: proxy-server.conf
Source74: swift.conf Source74: swift.conf
Source75: object-expirer.conf Source75: object-expirer.conf
%endif
Patch20: 0001-Use-updated-parallel-install-versions-of-epel-packag.patch Patch20: 0001-Use-updated-parallel-install-versions-of-epel-packag.patch
Patch21: 0002-Add-fixes-for-building-the-doc-package.patch Patch21: 0002-Add-fixes-for-building-the-doc-package.patch
Patch22: glusterfs-3.3.1.swift.constraints.backport-1.7.4.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 %package resource-agents
Summary: OCF Resource Agents for GlusterFS Summary: OCF Resource Agents for GlusterFS
License: GPLv3+ License: GPLv3+
%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) )
# EL5 does not support noarch sub-packages
BuildArch: noarch BuildArch: noarch
%endif
# this Group handling comes from the Fedora resource-agents package # this Group handling comes from the Fedora resource-agents package
%if ( 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} ) %if ( 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} )
Group: System Environment/Base Group: System Environment/Base
@ -1430,6 +1439,7 @@ fi
* Wed May 29 2013 Niels de Vos <devos@fedoraproject.org> * Wed May 29 2013 Niels de Vos <devos@fedoraproject.org>
- automatically load the fuse module on EL5 - automatically load the fuse module on EL5
- there is no need to require the unused /usr/bin/fusermount - there is no need to require the unused /usr/bin/fusermount
- fix building on EL5
* Mon May 27 2013 Niels de Vos <devos@fedoraproject.org> * Mon May 27 2013 Niels de Vos <devos@fedoraproject.org>
- include glusterfs-api.pc in the -devel subpackage - include glusterfs-api.pc in the -devel subpackage