From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 7 Oct 2015 15:32:27 +0000 (+0200)
Subject: ceph.spec.in: drop MY_CONF_OPTS
X-Git-Tag: v9.1.0~5^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6190%2Fhead;p=ceph.git

ceph.spec.in: drop MY_CONF_OPTS

http://tracker.ceph.com/issues/13402 Fixes: #13402

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 5dd20ade380f..cbd527b1085d 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -542,9 +542,6 @@ done
 %endif
 
 ./autogen.sh
-MY_CONF_OPT="$CEPH_EXTRA_CONFIGURE_ARGS"
-
-MY_CONF_OPT="$MY_CONF_OPT --with-radosgw"
 
 %if %{with lowmem_builder}
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS --param ggc-min-expand=20 --param ggc-min-heapsize=32768"
@@ -581,7 +578,8 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
 		--with-rgw-user=wwwrun \
 		--with-rgw-group=www \
 %endif
-		$MY_CONF_OPT \
+		--with-radosgw \
+		$CEPH_EXTRA_CONFIGURE_ARGS \
 		%{?_with_ocf} \
 		%{?_with_tcmalloc} \
 		CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"