[dnsmasq/f16] Compile DHCP lease management utils with RPM_OPT_FLAGS

Pádraig Brady pbrady at fedoraproject.org
Sat Feb 11 15:22:56 UTC 2012


commit 38f5fa82b0ba91ad75bd5e4bc4f0036feda7a266
Author: Pádraig Brady <P at draigBrady.com>
Date:   Sat Feb 11 15:09:45 2012 +0000

    Compile DHCP lease management utils with RPM_OPT_FLAGS
    
    Conflicts:
    
    	dnsmasq.spec

 dnsmasq.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/dnsmasq.spec b/dnsmasq.spec
index 64cfee8..8d744f0 100644
--- a/dnsmasq.spec
+++ b/dnsmasq.spec
@@ -11,7 +11,7 @@
 
 Name:           dnsmasq
 Version:        2.59
-Release:        3%{?extraversion}%{?dist}
+Release:        4%{?extraversion}%{?dist}
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -65,8 +65,10 @@ 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}
-make -C contrib/wrt %{?_smp_mflags}
+CFLAGS="$RPM_OPT_FLAGS" make -C contrib/wrt %{?_smp_mflags}
 
 
 %install
@@ -137,6 +139,9 @@ fi
 %{_mandir}/man1/dhcp_*
 
 %changelog
+* Sat Feb 11 2012 Pádraig Brady <P at draigBrady.com> - 2.59-4
+- Compile DHCP lease management utils with RPM_OPT_FLAGS
+
 * Thu Feb  9 2012 Pádraig Brady <P at draigBrady.com> - 2.59-3
 - Include DHCP lease management utils in a subpackage
 


More information about the scm-commits mailing list