From cb337cf03ee819fa8f3b44ffbdcf97e2bb3f765c Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Jul 21 2015 12:19:23 +0000
Subject: Use system CFLAGS to build libbridge so properly hardened etc (fix FTBFS), Use %%license, spec cleanups


---

diff --git a/bridge-utils-libbridge-cflags.patch b/bridge-utils-libbridge-cflags.patch
new file mode 100644
index 0000000..50bb27a
--- /dev/null
+++ b/bridge-utils-libbridge-cflags.patch
@@ -0,0 +1,11 @@
+--- bridge-utils-1.5/libbridge/Makefile.in.orig	2015-07-21 13:09:20.270079468 +0100
++++ bridge-utils-1.5/libbridge/Makefile.in	2015-07-21 13:09:39.382036853 +0100
+@@ -5,7 +5,7 @@
+ RANLIB=@RANLIB@
+ 
+ CC=@CC@
+-CFLAGS = -Wall -g $(KERNEL_HEADERS)
++CFLAGS = @CFLAGS@ -g $(KERNEL_HEADERS)
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
diff --git a/bridge-utils.spec b/bridge-utils.spec
index 3b71117..6064f07 100644
--- a/bridge-utils.spec
+++ b/bridge-utils.spec
@@ -1,17 +1,21 @@
 Summary:        Utilities for configuring the linux ethernet bridge
 Name:           bridge-utils
 Version:        1.5
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        GPLv2+
 URL:            http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge
 Group:          System Environment/Base
+
 Source:         http://downloads.sourceforge.net/bridge/%{name}-%{version}.tar.gz
 Patch0:         bridge-utils-1.5-fix-incorrect-command-in-manual.patch
 Patch1:         bridge-utils-1.5-fix-error-message-for-incorrect-command.patch
 Patch2:         bridge-utils-1.5-check-error-returns-from-write-to-sysfs.patch
 Patch10:        bridge-utils-1.0.4-inc.patch
 Patch11:        bridge-utils-1.5-linux_3.8.x.patch
-BuildRequires:  libsysfs-devel autoconf
+Patch12:        bridge-utils-libbridge-cflags.patch
+
+BuildRequires:  libsysfs-devel
+BuildRequires:  autoconf automake libtool
 BuildRequires:  kernel-headers >= 2.6.16
 
 %description
@@ -30,21 +34,28 @@ Install bridge-utils if you want to use the linux ethernet bridge.
 %patch2 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1 -b libbridge
 
 %build
 autoconf
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} SUBDIRS="brctl doc" install
 
 %files
-%doc AUTHORS COPYING doc/FAQ doc/HOWTO
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc AUTHORS doc/FAQ doc/HOWTO
 %{_sbindir}/brctl
 %{_mandir}/man8/brctl.8*
 
 %changelog
+* Tue Jul 21 2015 Peter Robinson <pbrobinson@fedoraproject.org> 1.5-12
+- Use system CFLAGS to build libbridge so properly hardened etc (fix FTBFS)
+- Use %%license, spec cleanups
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild