From b8c63b0b6437c3afff2e5893224cf04c8e0112f71e22794e720b1fb6004d4d26 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 10 Sep 2009 07:59:39 +0000 Subject: [PATCH 1/3] Accepting request 20150 from home:a_jaeger:branches:openSUSE:Factory Copy from home:a_jaeger:branches:openSUSE:Factory/multipath-tools via accept of submit request 20150 revision 2. Request was accepted with message: reviewed ok, accepted OBS-URL: https://build.opensuse.org/request/show/20150 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=4 --- multipath-fix.patch | 13 +++++++++++++ multipath-tools.changes | 6 ++++++ multipath-tools.spec | 4 +++- 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 multipath-fix.patch diff --git a/multipath-fix.patch b/multipath-fix.patch new file mode 100644 index 0000000..1b441ef --- /dev/null +++ b/multipath-fix.patch @@ -0,0 +1,13 @@ +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.changes b/multipath-tools.changes index 94972eb..1d98954 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 8 20:56:53 UTC 2009 - aj@suse.de + +- Fix last patch, one caller of dm_simplecmd was not updated + (multipath-fix.patch). + ------------------------------------------------------------------- Fri Aug 21 15:49:47 CEST 2009 - hare@suse.de diff --git a/multipath-tools.spec b/multipath-tools.spec index c0657a5..4afc6c3 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -32,6 +32,7 @@ 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 @@ -71,8 +72,9 @@ Authors: Christophe Varoqui %prep -%setup -n multipath-tools-%{version} +%setup -q -n multipath-tools-%{version} %patch0 -p1 +%patch1 %build # This package failed when testing with -Wl,-as-needed being default. From 9af01a3b11e218966152db6796ec18980803e52495491c63c2842acdc519c887 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 10 Sep 2009 10:57:07 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=5 --- multipath-fix.patch | 13 ------------- multipath-tools.changes | 6 ------ multipath-tools.spec | 4 +--- 3 files changed, 1 insertion(+), 22 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.changes b/multipath-tools.changes index 1d98954..94972eb 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 8 20:56:53 UTC 2009 - aj@suse.de - -- Fix last patch, one caller of dm_simplecmd was not updated - (multipath-fix.patch). - ------------------------------------------------------------------- Fri Aug 21 15:49:47 CEST 2009 - hare@suse.de diff --git a/multipath-tools.spec b/multipath-tools.spec index 4afc6c3..c0657a5 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -32,7 +32,6 @@ 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 @@ -72,9 +71,8 @@ Authors: Christophe Varoqui %prep -%setup -q -n multipath-tools-%{version} +%setup -n multipath-tools-%{version} %patch0 -p1 -%patch1 %build # This package failed when testing with -Wl,-as-needed being default. From dafdfb8404b6341d32de6a75375fa794f5e28d3cf074b93f090e601f5efc87c3 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 10 Sep 2009 10:57:08 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/multipath-tools revision 26.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=0a0b71bd14cf0e481a64596f90f92f44 --- multipath-fix.patch | 13 +++++++++++++ multipath-tools.changes | 6 ++++++ multipath-tools.spec | 10 ++++++---- 3 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 multipath-fix.patch diff --git a/multipath-fix.patch b/multipath-fix.patch new file mode 100644 index 0000000..1b441ef --- /dev/null +++ b/multipath-fix.patch @@ -0,0 +1,13 @@ +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.changes b/multipath-tools.changes index 94972eb..1d98954 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 8 20:56:53 UTC 2009 - aj@suse.de + +- Fix last patch, one caller of dm_simplecmd was not updated + (multipath-fix.patch). + ------------------------------------------------------------------- Fri Aug 21 15:49:47 CEST 2009 - hare@suse.de diff --git a/multipath-tools.spec b/multipath-tools.spec index c0657a5..231aef5 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -21,17 +21,18 @@ 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: 42 +Release: 43 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 @@ -55,7 +56,7 @@ Authors: Christophe Varoqui %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 @@ -71,8 +72,9 @@ Authors: Christophe Varoqui %prep -%setup -n multipath-tools-%{version} +%setup -q -n multipath-tools-%{version} %patch0 -p1 +%patch1 %build # This package failed when testing with -Wl,-as-needed being default.