From 2aea547e577f5a89065d2dc53e19320f2deb7e885447194a0e6f978711669697 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 23 Oct 2009 13:04:46 +0000
Subject: [PATCH] Accepting request 22867 from Base:System

Copy from Base:System/multipath-tools based on submit request 22867 from user hreinecke

OBS-URL: https://build.opensuse.org/request/show/22867
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/multipath-tools?expand=0&rev=28
---
 multipath-fix.patch                          | 13 -------------
 multipath-tools-0.4.8-opensuse-11.2.diff.bz2 |  4 ++--
 multipath-tools.changes                      |  6 ++++++
 multipath-tools.spec                         |  8 +++-----
 4 files changed, 11 insertions(+), 20 deletions(-)
 delete mode 100644 multipath-fix.patch

diff --git a/multipath-fix.patch b/multipath-fix.patch
deleted file mode 100644
index 1b441ef..0000000
--- a/multipath-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kpartx/kpartx.c
-===================================================================
---- kpartx/kpartx.c.orig
-+++ kpartx/kpartx.c
-@@ -578,7 +578,7 @@ main(int argc, char **argv){
- 					continue;
- 
- 				if (!dm_simplecmd(DM_DEVICE_REMOVE,
--							partname)) {
-+							partname, 1)) {
- 					r++;
- 					continue;
- 				}
diff --git a/multipath-tools-0.4.8-opensuse-11.2.diff.bz2 b/multipath-tools-0.4.8-opensuse-11.2.diff.bz2
index e55f7ec..b2535b6 100644
--- a/multipath-tools-0.4.8-opensuse-11.2.diff.bz2
+++ b/multipath-tools-0.4.8-opensuse-11.2.diff.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:507361270bd9d1c703a265834334ba5d39f3d2d4677dd531ab23611c845fb381
-size 131381
+oid sha256:6ee2872ba8dd45be1f365c3e1cc76fc1e4294eca617e6830cf9a51b60173403b
+size 131574
diff --git a/multipath-tools.changes b/multipath-tools.changes
index 1d98954..c305613 100644
--- a/multipath-tools.changes
+++ b/multipath-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 22 16:29:35 CEST 2009 - hare@suse.de
+
+- Make 'param' local (bnc#548708)
+- Include multipath-fix.patch in git tree.
+
 -------------------------------------------------------------------
 Tue Sep  8 20:56:53 UTC 2009 - aj@suse.de
 
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 231aef5..5bfdb16 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -21,18 +21,17 @@
 Name:           multipath-tools
 BuildRequires:  device-mapper-devel libaio-devel readline-devel
 Url:            http://christophe.varoqui.free.fr/
-License:        BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later ;    Public Domain, Freeware   ; MIT License (or similar)
+License:        BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later ;   Public Domain, Freeware  ; MIT License (or similar)
 Group:          System/Base
 Requires:       device-mapper kpartx
 PreReq:         %insserv_prereq %fillup_prereq coreutils grep
 AutoReqProv:    on
 Version:        0.4.8
-Release:        43
+Release:        44
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
 Source:         multipath-tools-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Patch0:         %{name}-%{version}-opensuse-11.2.diff.bz2
-Patch1:         multipath-fix.patch
 
 %description
 This package provides the tools to manage multipathed devices by
@@ -56,7 +55,7 @@ Authors:
     Christophe Varoqui <christophe.varoqui@free.fr>
 
 %package -n kpartx
-License:        BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later ;    Public Domain, Freeware   ; MIT License (or similar)
+License:        BSD 3-clause (or similar) ; GPL v2 or later ; LGPL v2.1 or later ;   Public Domain, Freeware  ; MIT License (or similar)
 Summary:        Manages partition tables on device-mapper devices
 Group:          System/Base
 Requires:       device-mapper
@@ -74,7 +73,6 @@ Authors:
 %prep
 %setup -q -n multipath-tools-%{version}
 %patch0 -p1
-%patch1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.