- removed outdated build_fix patch

[packages/bridge-utils.git] / bridge-utils.spec

diff --git a/bridge-utils.spec b/bridge-utils.spec
index ddbee9b1140a73352034dd77f391718c64adf742..69c9f1e7bdaec8c614cb03c0ab1622c652cb688d 100644 (file)
--- a/bridge-utils.spec
+++ b/bridge-utils.spec
@@ -1,17 +1,21 @@
 Summary:       Utilities for configuring the Linux ethernet bridge
 Summary(pl.UTF-8):     Narzędzia przeznaczone do konfiguracji linuksowego ethernet bridge
 Name:          bridge-utils
-Version:       1.4
+Version:       1.7.1
 Release:       1
-License:       GPL
+License:       GPL v2+
 Group:         Networking/Admin
-Source0:       http://dl.sourceforge.net/bridge/%{name}-%{version}.tar.gz
-# Source0-md5: 0182fcac3a2b307113bbec34e5f1c673
-URL:           http://linux-net.osdl.org/index.php/Bridge
-BuildRequires: autoconf
+Source0:       https://www.kernel.org/pub/linux/utils/net/bridge-utils/%{name}-%{version}.tar.xz
+# Source0-md5: 3e1fee4dc22cac5457c2f6ffb990a518
+Patch0:                debian.patch
+Patch1:                man.patch
+URL:           http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge
+BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: linux-libc-headers >= 7:2.6.7
 BuildRequires: sed >= 4.0
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Obsoletes:     brcfg
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -49,18 +53,18 @@ bridge.
 
 %prep
 %setup -q
-
-rm -rf autom4te.cache
+%patch0 -p1
+%patch1 -p1
 
 %build
 cp -f /usr/share/automake/{config.*,missing} .
 %{__aclocal}
 %{__autoconf}
-%configure
-sed -i -e 's#KERNEL_HEADERS=.*#KERNEL_HEADERS=#g' */Makefile*
+%configure \
+       --with-linux-headers=%{_includedir}
+
 %{__make} \
-       CFLAGS="%{rpmcflags} -Wall" \
-       KERNEL_HEADERS=""
+       CFLAGS="%{rpmcflags} %{rpmcppflags} -Wall"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,16 +74,19 @@ install -d $RPM_BUILD_ROOT{%{_sbindir},%{_libdir},%{_includedir}} \
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+install libbridge/libbridge.h $RPM_BUILD_ROOT%{_includedir}
+install libbridge/libbridge.a $RPM_BUILD_ROOT%{_libdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog THANKS TODO doc/{FAQ,FIREWALL,HOWTO,SMPNOTES,WISHLIST}
-%attr(755,root,root) %{_sbindir}/*
-%{_mandir}/man8/*
+%doc AUTHORS ChangeLog THANKS doc/{FAQ,FIREWALL,HOWTO,SMPNOTES,WISHLIST}
+%attr(755,root,root) %{_sbindir}/brctl
+%{_mandir}/man8/brctl.8*
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/*.a
-%{_includedir}/*.h
+%{_libdir}/libbridge.a
+%{_includedir}/libbridge.h