[ebtables] use standard optflags and ldflags

Tom Callaway spot at fedoraproject.org
Mon Mar 31 13:56:49 UTC 2014


commit 81261f9c305d9e34b38c522d105fd7edd0bc2249
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Mar 31 09:56:57 2014 -0400

    use standard optflags and ldflags

 ebtables.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/ebtables.spec b/ebtables.spec
index a79e658..5b0d876 100644
--- a/ebtables.spec
+++ b/ebtables.spec
@@ -2,7 +2,7 @@
 
 Name:			ebtables
 Version:		2.0.10
-Release:		12%{?dist}
+Release:		13%{?dist}
 Summary:		Ethernet Bridge frame table administration tool
 License:		GPLv2+
 Group:			System Environment/Base
@@ -46,8 +46,7 @@ like iptables. There are no known incompatibility issues.
 f=THANKS; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
 
 %build
-MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector-strong//g' | sed -e 's/-fstack-protector//g'`
-make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" LIBDIR="/%{_lib}/ebtables" BINDIR="/sbin" MANDIR="%{_mandir}"
+make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" LIBDIR="/%{_lib}/ebtables" BINDIR="/sbin" MANDIR="%{_mandir}" LDFLAGS="${RPM_LD_FLAGS} -Wl,-z,now"
 
 %install
 mkdir -p %{buildroot}%{_initrddir}
@@ -99,6 +98,9 @@ mv %{buildroot}/%{_lib}/ebtables/libebtc.so %{buildroot}/%{_lib}/
 %ghost %{_sysconfdir}/sysconfig/ebtables.broute
 
 %changelog
+* Mon Mar 31 2014 Tom Callaway <spot at fedoraproject.org> - 2.0.10-13
+- use standard optflags and ldflags (bz 1071993)
+
 * Wed Feb 19 2014 Tom Callaway <spot at fedoraproject.org> - 2.0.10-12
 - remove executable bit from systemd service file
 - add RARP type to ethertypes (bz 1060537)


More information about the scm-commits mailing list