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