diff --git a/bridge-utils.changes b/bridge-utils.changes index 75dba10..f2e9c4f 100644 --- a/bridge-utils.changes +++ b/bridge-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 3 10:09:17 UTC 2015 - tchvatal@suse.com + +- Cleanup with spec-cleaner +- Remove the /sbin/ link, it should not be needed. + Lets see what breaks, people should migrate to bridge anwyay + ------------------------------------------------------------------- Mon May 27 10:37:08 CEST 2013 - mhrusecky@suse.cz diff --git a/bridge-utils.spec b/bridge-utils.spec index 3cbb0c1..ac0a6d3 100644 --- a/bridge-utils.spec +++ b/bridge-utils.spec @@ -1,7 +1,7 @@ # # spec file for package bridge-utils # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,18 @@ Name: bridge-utils -BuildRequires: automake -BuildRequires: libsysfs Version: 1.5 Release: 0 -Url: http://www.linux-foundation.org/en/Net:Bridge Summary: Utilities for Configuring the Linux Ethernet Bridge License: GPL-2.0+ Group: Productivity/Networking/Routing +Url: http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge Source: http://downloads.sourceforge.net/project/bridge/bridge/%{name}-%{version}.tar.gz -Patch: %{name}-%{version}-hz.diff +Patch0: %{name}-%{version}-hz.diff Patch1: %{name}-%{version}-optflags.patch Patch2: bridge-utils-1.5-ip6.patch +BuildRequires: automake +BuildRequires: libsysfs BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -48,7 +48,7 @@ The %{name} devel package contains files needed for development. %prep %setup -q -%patch +%patch0 %patch1 %patch2 @@ -58,22 +58,16 @@ autoreconf -fiv make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -install -d -m 755 $RPM_BUILD_ROOT/sbin -#UsrMerge -ln -sf %{_sbindir}/brctl $RPM_BUILD_ROOT/sbin -#EndUsrMerge +make DESTDIR=%{buildroot} install %{?_smp_mflags} +install -d -m 755 %{buildroot}/sbin install -D -m 644 libbridge/libbridge.h %{buildroot}%{_includedir}/libbridge.h install -D -m 644 libbridge/libbridge.a %{buildroot}%{_libdir}/libbridge.a %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog README THANKS TODO doc/[FHPRSW]* -%doc %{_mandir}/man?/* +%{_mandir}/man?/* %{_sbindir}/* -#UsrMerge -/sbin/* -#EndUsrMerge %files devel %defattr(-,root,root)