[dnsmasq/f17] Build dnsmasq with $RPM_OPT_FLAGS, $RPM_LD_FLAGS explicitly

Tomas Hozza thozza at fedoraproject.org
Thu Jan 24 08:41:25 UTC 2013


commit f85c1d664501c6dfc78d97b948fbc16465234c1a
Author: Tomas Hozza <thozza at redhat.com>
Date:   Thu Jan 24 09:39:54 2013 +0100

    Build dnsmasq with $RPM_OPT_FLAGS, $RPM_LD_FLAGS explicitly
    
    Resolves: rhbz#903362
    Signed-off-by: Tomas Hozza <thozza at redhat.com>

 dnsmasq.spec |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/dnsmasq.spec b/dnsmasq.spec
index e224ae2..e3b45d9 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -11,7 +11,7 @@
 
 Name:           dnsmasq
 Version:        2.65
-Release:        2%{?extraversion}%{?dist}
+Release:        3%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -71,10 +71,8 @@ sed -i 's|#conf-dir=/etc/dnsmasq.d|conf-dir=/etc/dnsmasq.d|g' dnsmasq.conf.examp
 
 
 %build
-# Note the main Makefile handles RPM_OPT_FLAGS internally,
-# while we need to explicitly set it for the contrib Makefile
-make %{?_smp_mflags}
-CFLAGS="$RPM_OPT_FLAGS" make -C contrib/wrt %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
+make -C contrib/wrt %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
 
 %install
@@ -145,6 +143,9 @@ fi
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Thu Jan 24 2013 Tomas Hozza <thozza at redhat.com> - 2.65-3
+- build dnsmasq with $RPM_OPT_FLAGS, $RPM_LD_FLAGS explicitly (#903362) 
+
 * Tue Jan 22 2013 Tomas Hozza <thozza at redhat.com> - 2.65-2
 - Fix for CVE-2013-0198 (checking of TCP connection interfaces) (#901555)
 


More information about the scm-commits mailing list