Hello community, here is the log from the commit of package bridge-utils for openSUSE:Factory checked in at 2012-02-06 15:54:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bridge-utils (Old) and /work/SRC/openSUSE:Factory/.bridge-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bridge-utils", Maintainer is "lidongyang@novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/bridge-utils/bridge-utils.changes 2011-12-08 11:27:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bridge-utils.new/bridge-utils.changes 2012-02-06 15:54:30.000000000 +0100 @@ -1,0 +2,8 @@ +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 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bridge-utils.spec ++++++ --- /var/tmp/diff_new_pack.1GwZXZ/_old 2012-02-06 15:54:31.000000000 +0100 +++ /var/tmp/diff_new_pack.1GwZXZ/_new 2012-02-06 15:54:31.000000000 +0100 @@ -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 @@ 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 @@ %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 @@ %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 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org