diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2013-04-23 12:57:40 -0400 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2013-04-26 02:38:07 -0700 |
| commit | 5e0116109e3c444b11adb9809c75b4da72e85457 (patch) | |
| tree | 78b0cd05905a33f042fb67468197b9b530a2c2f6 /glusterfs.spec.in | |
| parent | 915385553e46d65e0b91ce62066a5575b07ee44d (diff) | |
build: sync glusterfs.spec.in with Fedora glusterfs.spec
BUG: 950083
Change-Id: I96aeb8fbe8b79bbc058ff9a45167d822abb576ed
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/4876
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 1923b0f2715..4637b978f4b 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -261,6 +261,9 @@ This package provides the glusterfs server daemon. %package resource-agents Summary: OCF Resource Agents for GlusterFS License: GPLv3+ +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) +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 @@ -364,6 +367,7 @@ Patch20: 0001-Use-updated-parallel-install-versions-of-epel-packag.patc Patch21: 0002-Add-fixes-for-building-the-doc-package.patch Patch22: glusterfs-3.3.1.swift.constraints.backport-1.7.4.patch Patch23: glusterfs-3.4.0.swift.egginfo-grizzly.patch +Patch24: 0002-Add-fixes-for-building-the-doc-package.patch.180 #BuildRoot: %(mktemp -ud %{_tmppath}/swift-%{SWIFTVER}-%{release}-XXXXXX) %if 0%{?_with_systemd:1} @@ -545,11 +549,15 @@ storage costs. %patch1 -p0 %endif cd swift-%{SWIFTVER} -%if "%{SWIFTVER}" == "1.7.4" %if ( 0%{?rhel} && 0%{?rhel} < 7 ) %patch20 -p1 +%if "%{SWIFTVER}" == "1.7.4" %patch21 -p1 +%else +%patch24 -p1 %endif +%endif +%if "%{SWIFTVER}" == "1.7.4" %patch22 -p1 %else %patch23 -p1 |