X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bridge-utils.spec;h=2b0d3bd6860879ba9f2f9d6ded013756fc6934a8;hb=7c3287c97822e3ee93d3b8312cd2ded32536131d;hp=90f41ec9d080a0b17339c32878df31c492da05f8;hpb=85637292dafba64c9f402e3fbf58917c4f570c7c;p=packages%2Fbridge-utils.git

diff --git a/bridge-utils.spec b/bridge-utils.spec
index 90f41ec..2b0d3bd 100644
--- a/bridge-utils.spec
+++ b/bridge-utils.spec
@@ -1,17 +1,19 @@
 Summary:	Utilities for configuring the linux ethernet bridge
 Summary(pl):	U¿ytki przeznaczone do konfiguracji linux ethernet bridge
 Name:		bridge-utils
-Version:	0.9.5
+Version:	1.0.4
 Release:	1
 License:	GPL
 Group:		Networking/Admin
-Source0:	http://bridge.sourceforge.net/bridge-utils/%{name}-%{version}.tar.gz
-Patch0:		%{name}-opt.patch
-Patch1:		%{name}-rootonly.patch
+Source0:	http://dl.sourceforge.net/bridge/%{name}-%{version}.tar.gz
+# Source0-md5:	2cab42847c4654e58c4d0ba114bfe2c2
 URL:		http://bridge.sourceforge.net/
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	sysfsutils-devel
 BuildRequires:	kernel-headers(bridging)
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	brcfg
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir	/sbin
 
@@ -24,15 +26,15 @@ ethernet devices directly.
 
 %description -l pl
 Ten pakiet zawiera narzêdzia przeznaczone do konfigurowania
-linuksowego ethernet bridge (inteligentny switch). Linux ethernet
+linuksowego ethernet bridge (inteligentnego switcha). Linux ethernet
 bridge mo¿e byæ u¿yty do ³±czenia kilku ethernetowych interfejsów
 sieciowych w jeden. Po³±czenie jest w pe³ni prze¼roczyste; hosty
 przy³±czone po jednej stronie widz± hosty z drugiej strony
 bezpo¶rednio.
 
 %package devel
-Summary:	Libraries for the linux ethernet bridge programs.
-Summary(pl):	Biblioteki u¿ywane do sterowania linuksowym bridge.
+Summary:	Libraries for the linux ethernet bridge programs
+Summary(pl):	Biblioteki u¿ywane do sterowania linuksowym bridge
 Group:		Development/Libraries
 
 %description devel
@@ -42,27 +44,33 @@ kernel ethernet bridge.
 
 %description devel -l pl
 Ten pakiet zawiera pliki nag³ówkowe i bibliotekê konieczn± do rozwoju
-programów u¿ywaj±cych 'libbridge' - interfejs do linuksowego ethernet
+programów u¿ywaj±cych libbridge - interfejsu do linuksowego ethernet
 bridge.
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 %build
-%{__make} all OPT="%{rpmcflags}" CC="%{__cc}"
+rm -f missing
+cp -f /usr/share/automake/config.sub .
+%{__aclocal}
+%{__autoconf}
+%configure
+chmod u+w brctl/brctl.h libbridge/libbridge_private.h
+echo "#include <linux/errno.h>" >> brctl/brctl.h
+echo "#include <linux/errno.h>" >> libbridge/config.h
+sed -i -e 's#sysfs/libsysfs.h#libsysfs.h#g' libbridge/libbridge_private.h
+sed -i -e 's#KERNEL_HEADERS=.*#KERNEL_HEADERS=#g' */Makefile*
+%{__make} \
+	KERNEL_HEADERS=""
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_libdir},%{_includedir}} \
 	$RPM_BUILD_ROOT%{_mandir}/man8
 
-install brctl/brctl		$RPM_BUILD_ROOT%{_sbindir}
-#install brctl/brctld		$RPM_BUILD_ROOT%{_sbindir}
-install doc/*.8			$RPM_BUILD_ROOT%{_mandir}/man8
-install libbridge/libbridge.a	$RPM_BUILD_ROOT%{_libdir}
-install libbridge/libbridge.h	$RPM_BUILD_ROOT%{_includedir}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT