From 0e4526fa8f381e2275d05be03de81802bc0dcabc Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Mon, 14 Apr 2008 19:14:10 +0000
Subject: =?UTF-8?q?https://bugzilla.redhat.com/show=5Fbug.cgi=3Fid=3D44108?=
 =?UTF-8?q?0=20from=20Ville=20Skytt=C3=A4=20(ville.skytta@iki.fi)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

qpidc's build does not use $RPM_OPT_FLAGS so it misses some compiler security
features, and strips installed executables thus preventing rpmbuild from doing
its job and creating a useful debuginfo package.  Candidate fix for both
attached, build tested only.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@647937 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/qpidc.spec.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'cpp')

diff --git a/cpp/qpidc.spec.in b/cpp/qpidc.spec.in
index 2819f02c45..966e293931 100644
--- a/cpp/qpidc.spec.in
+++ b/cpp/qpidc.spec.in
@@ -80,14 +80,15 @@ exit 0
 %setup -q
 
 %build
-%configure --disable-static --without-cpg CXXFLAGS="-g -O3 -DNDEBUG"
+CXXFLAGS="%{optflags} -DNDEBUG -O3" \
+%configure --disable-static --without-cpg
 make %{?_smp_mflags}
 # Remove this generated perl file, we don't need it and it upsets rpmlint.
 rm docs/api/html/installdox
 
 %install
 rm -rf %{buildroot}
-make install-strip DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
 install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/qpidd
 rm -f %{buildroot}%_libdir/*.a
-- 
cgit v1.2.1