From 6cc6152ab8971639ddbb1de448bfd106824a0db4a73d66afd92628d6e07bcfb5 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Thu, 5 Apr 2018 10:06:45 +0000
Subject: [PATCH] Accepting request 593747 from
 home:mwilck:branches:Base:System

Pushing per bsc#1085212, comment 152.

- Fixed license tags in spec file
  * multipath tools / libmultipath is GPL-2.0-only
  * libmpathcmd is LGPL-2.0-or-later
  * kpartx is GPL-2.0-or-later
  * libdmmp is GPL-3.0-or-later
  * adopt SPDX format.

- Update to version 0.7.3+60+suse.46ac839:
  * libmultipath/hwtable: don't hard-code ALUA for IBM IPR
  (bsc#1085212, bsc#1075129)

OBS-URL: https://build.opensuse.org/request/show/593747
OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=157
---
 _servicedata                                    |  2 +-
 ...path-tools-0.7.3+59+suse.1b6191c26774.tar.xz |  3 ---
 multipath-tools-0.7.3+60+suse.46ac839.tar.xz    |  3 +++
 multipath-tools.changes                         | 17 +++++++++++++++++
 multipath-tools.spec                            |  9 +++++++--
 5 files changed, 28 insertions(+), 6 deletions(-)
 delete mode 100644 multipath-tools-0.7.3+59+suse.1b6191c26774.tar.xz
 create mode 100644 multipath-tools-0.7.3+60+suse.46ac839.tar.xz

diff --git a/_servicedata b/_servicedata
index 79e6896..007080a 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/multipath-tools.git</param>
-              <param name="changesrevision">1b6191c267746c9baa756623078b3bd84dc2b13c</param></service><service name="tar_scm">
+              <param name="changesrevision">46ac83933811f1334907a5ddc6fcc732df2c1f17</param></service><service name="tar_scm">
                 <param name="url">https://github.com/mwilck/multipath-tools.git</param>
               <param name="changesrevision">08a969b7fce0db769b63bdbfead2a452dc417d58</param></service></servicedata>
\ No newline at end of file
diff --git a/multipath-tools-0.7.3+59+suse.1b6191c26774.tar.xz b/multipath-tools-0.7.3+59+suse.1b6191c26774.tar.xz
deleted file mode 100644
index e888ff5..0000000
--- a/multipath-tools-0.7.3+59+suse.1b6191c26774.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8cd40deca217b75c670f18dbbeb518854bcf03d9529f211d7816ceeb7a6469e0
-size 274188
diff --git a/multipath-tools-0.7.3+60+suse.46ac839.tar.xz b/multipath-tools-0.7.3+60+suse.46ac839.tar.xz
new file mode 100644
index 0000000..594e84c
--- /dev/null
+++ b/multipath-tools-0.7.3+60+suse.46ac839.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8322958077cbf506b9ef7ba3691c874372c167ebe1f52ae22102effa740825a0
+size 274156
diff --git a/multipath-tools.changes b/multipath-tools.changes
index 74df2f7..23cbe77 100644
--- a/multipath-tools.changes
+++ b/multipath-tools.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Mar 28 20:31:51 UTC 2018 - mwilck@suse.com
+
+- Fixed license tags in spec file
+  * multipath tools / libmultipath is GPL-2.0-only
+  * libmpathcmd is LGPL-2.0-or-later
+  * kpartx is GPL-2.0-or-later
+  * libdmmp is GPL-3.0-or-later
+  * adopt SPDX format.
+
+-------------------------------------------------------------------
+Wed Mar 28 20:01:01 UTC 2018 - mwilck@suse.com
+
+- Update to version 0.7.3+60+suse.46ac839:
+  * libmultipath/hwtable: don't hard-code ALUA for IBM IPR
+  (bsc#1085212, bsc#1075129)
+  
 -------------------------------------------------------------------
 Wed Mar 21 08:32:13 UTC 2018 - mwilck@suse.com
 
diff --git a/multipath-tools.spec b/multipath-tools.spec
index a0843c5..8f46428 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -97,10 +97,10 @@
 
 Name:           multipath-tools
 Url:            http://christophe.varoqui.free.fr/
-Version:        0.7.3+59+suse.1b6191c26774
+Version:        0.7.3+60+suse.46ac839
 Release:        0
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
-License:        GPL-2.0
+License:        GPL-2.0-only and LGPL-2.0-or-later
 Group:          System/Base
 Source:         multipath-tools-%{version}.tar.xz
 Source1:        multipath.conf
@@ -150,6 +150,7 @@ multipath maps partionable
 
 %package -n kpartx
 Summary:        Manages partition tables on device-mapper devices
+License:        GPL-2.0-or-later
 Group:          System/Base
 Requires:       device-mapper
 
@@ -159,6 +160,7 @@ makes multipath maps partionable.
 
 %package devel
 Summary:        Development libraries for multipath-tools
+License:        GPL-2.0-only and LGPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       device-mapper
 
@@ -169,6 +171,7 @@ and libmpath_persist.
 %if 0%{?with_rados} == 1
 %package rbd
 Summary:        RADOS support for multipath-tools
+License:        LGPL-2.0-only
 Group:          System/Libraries
 Requires:       multipath-tools = %{version}
 
@@ -181,6 +184,7 @@ This package contains the path checker for RADOS block devices
 %if 0%{?with_libdmmp} == 1
 %package -n libdmmp%{libdmmp_version}
 Summary:        C API for multipath-tools
+License:        GPL-3.0-or-later
 Group:          System/Libraries
 Requires:       multipath-tools
 
@@ -189,6 +193,7 @@ This library enables the use of libmultipath commands from C code.
 
 %package -n libdmmp-devel
 Summary:        Header files for multipath-tools C API
+License:        GPL-3.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       libdmmp%{libdmmp_version}