From 7eb2f8b27c6fb9790e734d1bd4e3c1d254a76e61f1d27a780bdc099ce98be400 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <null@suse.de>
Date: Mon, 1 Aug 2011 08:15:37 +0000
Subject: [PATCH] Accepting request 77497 from network:utilities

%make_install won't build with SLE10 SLE11 and SLE11-SP1
+ %make_install
/var/tmp/rpm-tmp.71410: line 23: fg: no job control
error: Bad exit status from /var/tmp/rpm-tmp.71410 (%install)
and now the spec is the same as it was 1.4.
I updated it to 1.5 and changed the spec using the spec template provided by bridge-utils source tarball.
Now due to bug 707837, I reverted the spec file.
as for the header file and lib, it's always been packaged into the bridge-utils at lease back in the 1.4 time, and we never had a package called bridge-utils-devel, so I'm packaging them also in 1.5, Thanks (forwarded request 77393 from CFM56)

OBS-URL: https://build.opensuse.org/request/show/77497
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bridge-utils?expand=0&rev=12
---
 bridge-utils-1.4.tar.bz2                           |  3 ---
 ...e-utils-1.4-hz.diff => bridge-utils-1.5-hz.diff |  0
 ...tflags.patch => bridge-utils-1.5-optflags.patch |  0
 bridge-utils-1.5.tar.gz                            |  3 +++
 bridge-utils.changes                               | 11 +++++++++++
 bridge-utils.spec                                  | 14 ++++++++------
 6 files changed, 22 insertions(+), 9 deletions(-)
 delete mode 100644 bridge-utils-1.4.tar.bz2
 rename bridge-utils-1.4-hz.diff => bridge-utils-1.5-hz.diff (100%)
 rename bridge-utils-1.4-optflags.patch => bridge-utils-1.5-optflags.patch (100%)
 create mode 100644 bridge-utils-1.5.tar.gz

diff --git a/bridge-utils-1.4.tar.bz2 b/bridge-utils-1.4.tar.bz2
deleted file mode 100644
index 73a5166..0000000
--- a/bridge-utils-1.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a2dbe49a540b31435f930def884c1b02920fb1091e1fb92913c8a9fdf3dea50
-size 30127
diff --git a/bridge-utils-1.4-hz.diff b/bridge-utils-1.5-hz.diff
similarity index 100%
rename from bridge-utils-1.4-hz.diff
rename to bridge-utils-1.5-hz.diff
diff --git a/bridge-utils-1.4-optflags.patch b/bridge-utils-1.5-optflags.patch
similarity index 100%
rename from bridge-utils-1.4-optflags.patch
rename to bridge-utils-1.5-optflags.patch
diff --git a/bridge-utils-1.5.tar.gz b/bridge-utils-1.5.tar.gz
new file mode 100644
index 0000000..75116fa
--- /dev/null
+++ b/bridge-utils-1.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688
+size 33243
diff --git a/bridge-utils.changes b/bridge-utils.changes
index b905c16..463ed88 100644
--- a/bridge-utils.changes
+++ b/bridge-utils.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Jul 25 14:16:57 CST 2011 - lidongyang@novell.com
+- bnc#707837 - network:utilities/bridge-utils: Bug in Factory 12.1
+  brctl has changed from /sbin to /usr/sbin
+  revert the changes made to %install section of the spec file
+
+-------------------------------------------------------------------
+Wed Jun  8 14:22:43 CST 2011 - lidongyang@novell.com
+
+- update to 1.5
+
 -------------------------------------------------------------------
 Sun Dec 20 14:06:42 CET 2009 - jengelh@medozas.de
 
diff --git a/bridge-utils.spec b/bridge-utils.spec
index 77bff99..81d3ca4 100644
--- a/bridge-utils.spec
+++ b/bridge-utils.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package bridge-utils (Version 1.4)
+# spec file for package bridge-utils (Version 1.5)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -20,16 +20,16 @@
 
 Name:           bridge-utils
 BuildRequires:  libsysfs
-Version:        1.4
-Release:        55
+Version:        1.5
+Release:        1
 AutoReqProv:    on
 Group:          Productivity/Networking/Routing
 License:        GPLv2+
 Url:            http://www.linux-foundation.org/en/Net:Bridge
 Summary:        Utilities for Configuring the Linux Ethernet Bridge
-Source:         %{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.gz
 Patch:          %{name}-%{version}-hz.diff
-Patch1:         bridge-utils-1.4-optflags.patch
+Patch1:         %{name}-%{version}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -59,8 +59,10 @@ make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-install -d -m755 $RPM_BUILD_ROOT/sbin
+install -d -m 755 $RPM_BUILD_ROOT/sbin
 mv $RPM_BUILD_ROOT%{_sbindir}/brctl $RPM_BUILD_ROOT/sbin
+install -D -m 644 libbridge/libbridge.h %{buildroot}%{_includedir}/libbridge.h
+install -D -m 644 libbridge/libbridge.a %{buildroot}%{_libdir}/libbridge.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT