|
 |
3604df |
From ab93e6087a3b23fd8697d47cc2d6df9afaedfaf5 Mon Sep 17 00:00:00 2001
|
|
|
12a457 |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
12a457 |
Date: Mon, 21 Mar 2016 17:07:00 +0530
|
|
|
3604df |
Subject: [PATCH 05/86] glusterd/spec: fixing autogen issue
|
|
|
12a457 |
|
|
|
12a457 |
Backport of https://code.engineering.redhat.com/gerrit/#/c/59463/
|
|
|
12a457 |
|
|
|
12a457 |
Because of the incorrect build section, autogen.sh wasn't re-run during the rpm
|
|
|
12a457 |
build process. The `extras/Makefile.in` was not regenerated with the changes
|
|
|
12a457 |
made to `extras/Makefile.am` in the firewalld patch. This meant that
|
|
|
12a457 |
`extras/Makefile` was generated without the firewalld changes. So the firewalld
|
|
|
12a457 |
config wasn't installed during `make install` and rpmbuild later failed when it
|
|
|
12a457 |
failed to find `/usr/lib/firewalld/glusterfs.xml`
|
|
|
12a457 |
|
|
|
12a457 |
Label: DOWNSTREAM ONLY
|
|
|
12a457 |
|
|
|
12a457 |
>Reviewed-on: https://code.engineering.redhat.com/gerrit/59463
|
|
|
12a457 |
|
|
|
12a457 |
Change-Id: I498bcceeacbd839640282eb6467c9f1464505697
|
|
|
12a457 |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
12a457 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/70343
|
|
|
12a457 |
Reviewed-by: Milind Changire <mchangir@redhat.com>
|
|
|
12a457 |
---
|
|
|
3604df |
glusterfs.spec.in | 7 +------
|
|
|
3604df |
1 files changed, 1 insertions(+), 6 deletions(-)
|
|
|
12a457 |
|
|
|
12a457 |
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
|
|
|
3604df |
index ca2ddb7..1d61fd7 100644
|
|
|
12a457 |
--- a/glusterfs.spec.in
|
|
|
12a457 |
+++ b/glusterfs.spec.in
|
|
|
3604df |
@@ -579,12 +579,7 @@ CFLAGS=-DUSE_INSECURE_OPENSSL
|
|
|
12a457 |
export CFLAGS
|
|
|
12a457 |
%endif
|
|
|
3604df |
|
|
|
3604df |
-# RHEL6 and earlier need to manually replace config.guess and config.sub
|
|
|
3604df |
-%if ( 0%{?rhel} && 0%{?rhel} <= 6 )
|
|
|
3604df |
-./autogen.sh
|
|
|
3604df |
-%endif
|
|
|
3604df |
-
|
|
|
12a457 |
-%configure \
|
|
|
3604df |
+./autogen.sh && %configure \
|
|
|
12a457 |
%{?_with_cmocka} \
|
|
|
3604df |
%{?_with_debug} \
|
|
|
12a457 |
%{?_with_tmpfilesdir} \
|
|
|
12a457 |
--
|
|
|
12a457 |
1.7.1
|
|
|
12a457 |
|