From ff2d0b01c4be1e8ca6db50a05a7651edf2e6fb96df130d3b96295674fae2f399 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Tue, 10 Apr 2018 21:55:43 +0000
Subject: [PATCH] Accepting request 595374 from
 home:mwilck:branches:Base:System

- No functional changes
- Fixed rpmlint warnings (bsc#1088946)
  * multipath-tools-devel: moved .so files to /usr/lib[64]
  * added version dependencies for -devel packages

- No functional changes
  * fixed SPDX syntax (and -> AND)
  * added /usr/share/licenses

OBS-URL: https://build.opensuse.org/request/show/595374
OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=160
---
 multipath-tools.changes | 15 +++++++++++++++
 multipath-tools.spec    | 20 ++++++++++++++------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/multipath-tools.changes b/multipath-tools.changes
index 17259c6..f56b1de 100644
--- a/multipath-tools.changes
+++ b/multipath-tools.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Apr 10 21:42:56 UTC 2018 - mwilck@suse.com
+
+- No functional changes
+- Fixed rpmlint warnings (bsc#1088946)
+  * multipath-tools-devel: moved .so files to /usr/lib[64]
+  * added version dependencies for -devel packages
+
+-------------------------------------------------------------------
+Tue Apr 10 21:26:30 UTC 2018 - mwilck@suse.com
+
+- No functional changes
+  * fixed SPDX syntax (and -> AND)
+  * added /usr/share/licenses 
+
 -------------------------------------------------------------------
 Tue Apr 10 08:04:40 UTC 2018 - mwilck@suse.com
 
diff --git a/multipath-tools.spec b/multipath-tools.spec
index e286f0c..f7e8f80 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -100,7 +100,7 @@ Url:            http://christophe.varoqui.free.fr/
 Version:        0.7.3+66+suse.dc5fe2d
 Release:        0
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
-License:        GPL-2.0-only and LGPL-2.0-or-later
+License:        GPL-2.0-only AND LGPL-2.0-or-later
 Group:          System/Base
 Source:         multipath-tools-%{version}.tar.xz
 Source1:        multipath.conf
@@ -160,9 +160,10 @@ makes multipath maps partionable.
 
 %package devel
 Summary:        Development libraries for multipath-tools
-License:        GPL-2.0-only and LGPL-2.0-or-later
+License:        GPL-2.0-only AND LGPL-2.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       device-mapper
+Requires:       multipath-tools = %{version}
 
 %description devel
 This package contains the development libraries for multipath-tools
@@ -195,7 +196,7 @@ This library enables the use of libmultipath commands from C code.
 Summary:        Header files for multipath-tools C API
 License:        GPL-3.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       libdmmp%{libdmmp_version}
+Requires:       libdmmp%{libdmmp_version} = %{version}
 
 %description -n libdmmp-devel
 This package provides development files and documentation for libdmmp.
@@ -216,7 +217,13 @@ make CC="%__cc" OPTFLAGS="%{optflags}" %{dirflags} %{makeflags}
 %install
 make DESTDIR=%{buildroot} %{dirflags} %{makeflags} install
 mkdir -p %{buildroot}/var/cache/multipath/
+mkdir -p %{buildroot}%{_defaultlicensedir}
 mkdir -p %{buildroot}/usr/sbin
+mkdir -p %{buildroot}/usr/%{_lib}
+for x in multipath mpathpersist mpathcmd; do
+    rm -f %{buildroot}/%{_lib}/lib$x.so
+    ln -sf /%{_lib}/lib$x.so.0  %{buildroot}/usr/%{_lib}/lib$x.so
+done
 ln -sf /usr/sbin/service %{buildroot}/usr/sbin/rcmultipathd
 mkdir -p %{buildroot}/usr/lib/modules-load.d
 install -m 644 -D %{SOURCE1} "%{buildroot}/usr/lib/modules-load.d/multipath.conf"
@@ -257,6 +264,7 @@ exit 0
 %files
 %defattr(-,root,root)
 %doc README
+%dir %{_defaultlicensedir}
 %license LICENSES/LGPL-2.0
 %license LICENSES/LGPL-2.1
 %license LICENSES/GPL-2.0
@@ -287,9 +295,9 @@ exit 0
 
 %files devel
 %defattr(-,root,root)
-/%{_lib}/libmultipath.so
-/%{_lib}/libmpathcmd.so
-/%{_lib}/libmpathpersist.so
+/usr/%{_lib}/libmultipath.so
+/usr/%{_lib}/libmpathcmd.so
+/usr/%{_lib}/libmpathpersist.so
 /usr/include/mpath_cmd.h
 /usr/include/mpath_persist.h
 %{_mandir}/man3/mpath_persistent_*