SHA256
1
0
forked from pool/bridge-utils

Accepting request 102526 from network:utilities

usrMerge project - binary in /usr

OBS-URL: https://build.opensuse.org/request/show/102526
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bridge-utils?expand=0&rev=19
This commit is contained in:
Stephan Kulow 2012-02-06 14:54:26 +00:00 committed by Git OBS Bridge
commit 2a8180ce89
2 changed files with 30 additions and 5 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Feb 2 11:10:30 UTC 2012 - rschweikert@suse.com
- Create -devel package to fix rpmlint errors
- Keep the binary in /usr/sbin, create link to /sbin (UsrMerge project)
This does not effect resolution of #707837 as /sbin/brctl can still be
found. systemd properly supports separate /usr
-------------------------------------------------------------------
Fri Dec 2 07:30:35 UTC 2011 - coolo@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package bridge-utils
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,15 +15,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: bridge-utils
BuildRequires: automake
BuildRequires: libsysfs
Version: 1.5
Release: 0
Group: Productivity/Networking/Routing
License: GPL-2.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
Source: %{name}-%{version}.tar.gz
Patch: %{name}-%{version}-hz.diff
Patch1: %{name}-%{version}-optflags.patch
@ -36,6 +37,14 @@ ethernet devices together. The connection is fully transparent: hosts
connected to one ethernet device see hosts connected to the other
ethernet devices directly.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries/Other
Requires: %{name} = %{version}
%description devel
The %{name} devel package contains files needed for development.
%prep
%setup -q
%patch
@ -49,7 +58,9 @@ make %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install
install -d -m 755 $RPM_BUILD_ROOT/sbin
mv $RPM_BUILD_ROOT%{_sbindir}/brctl $RPM_BUILD_ROOT/sbin
#UsrMerge
ln -sf %{_sbindir}/brctl $RPM_BUILD_ROOT/sbin
#EndUsrMerge
install -D -m 644 libbridge/libbridge.h %{buildroot}%{_includedir}/libbridge.h
install -D -m 644 libbridge/libbridge.a %{buildroot}%{_libdir}/libbridge.a
@ -57,8 +68,14 @@ install -D -m 644 libbridge/libbridge.a %{buildroot}%{_libdir}/libbridge.a
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README THANKS TODO doc/[FHPRSW]*
%doc %{_mandir}/man?/*
%{_sbindir}/*
#UsrMerge
/sbin/*
#EndUsrMerge
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/lib*
/sbin/*
%changelog