Browse Source

* bridge-utils: new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5948 ec354946-7b23-47d6-9f5a-488ba84defc7
shaolin 12 years ago
parent
commit
9d08bd7963
1 changed files with 44 additions and 35 deletions
  1. 44 35
      b/bridge-utils/bridge-utils-vl.spec

+ 44 - 35
b/bridge-utils/bridge-utils-vl.spec

@@ -1,16 +1,18 @@
-Summary: Utilities for configuring the linux ethernet bridge.
-Summary(ja): イーサネットブリッジ設定ユーティリティ
-Name: bridge-utils
-Version: 1.0.6
-Release: 2%{?_dist_release}
-License: GPL
-URL: http://bridge.sourceforge.net/
-Group: Applications/System
-Source0: http://bridge.sourceforge.net/bridge-utils/bridge-utils-%{version}.tar.gz
-Patch0: bridge-utils-1.0.4-inc.patch
-Patch1: bridge-utils-1.0.4-kernheaders.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-#BuildRequires: sysfsutils-devel
+Summary:	Utilities for configuring the linux ethernet bridge.
+Summary(ja):	イーサネットブリッジ設定ユーティリティ
+Name:		bridge-utils
+Version:	1.5
+Release:	1%{?_dist_release}
+License:	GPLv2+
+URL:		http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge
+Group:		Applications/System
+Source0:	http://dl.sf.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
+BuildRequires:	autoconf
+BuildRequires:	kernel-headers >= 2.6.16
 
 %description
 This package contains utilities for configuring the linux ethernet
@@ -21,37 +23,39 @@ ethernet devices directly.
 
 Install bridge-utils if you want to use the linux ethernet bridge.
 
-%package -n bridge-utils-devel
-Summary: Header and object files for using bridge-utils
-Group: Development/Libraries
-
-%description -n bridge-utils-devel
-The bridge-utils-devel package contains the header and object files
-necessary for developing programs which use 'libbridge.a', the
-interface to the linux kernel ethernet bridge. If you are developing
-programs which need to configure the linux ethernet bridge, your
-system needs to have these standard header and object files available
-in order to create the executables.
-
-Install bridge-utils-devel if you are going to develop programs which
-will use the linux ethernet bridge interface library.
+#%package -n bridge-utils-devel
+#Summary: Header and object files for using bridge-utils
+#Group: Development/Libraries
+
+#%description -n bridge-utils-devel
+#The bridge-utils-devel package contains the header and object files
+#necessary for developing programs which use 'libbridge.a', the
+#interface to the linux kernel ethernet bridge. If you are developing
+#programs which need to configure the linux ethernet bridge, your
+#system needs to have these standard header and object files available
+#in order to create the executables.
+#
+#Install bridge-utils-devel if you are going to develop programs which
+#will use the linux ethernet bridge interface library.
 
 %prep
 %setup -q
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch10 -p1
 
 %build
-%configure --with-linux-headers=`pwd`
+autoconf
+%configure
 make
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} install
-#gzip ${RPM_BUILD_ROOT}/%{_mandir}/man8/brctl.8
+make DESTDIR=%{buildroot} install
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
 %files
 %defattr (-,root,root)
@@ -59,12 +63,17 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 %{_sbindir}/brctl
 %{_mandir}/man8/*
 
-%files -n bridge-utils-devel
-%defattr (-,root,root)
-%{_includedir}/libbridge.h
-%{_libdir}/libbridge.a
+#%files -n bridge-utils-devel
+#%defattr (-,root,root)
+#%{_includedir}/libbridge.h
+#%{_libdir}/libbridge.a
 
 %changelog
+* Thu Mar 22 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.5-1
+- new upstream release
+- import bugfix patches from Fedora
+- drop -devel subpackage (use sane kernel headers)
+
 * Mon Jun 22 2009 Shu KONNO <owa@bg.wakwak.com> 1.0.6-2
 - spec in utf-8