Accepting request 538656 from home:mwilck:branches:Base:System

- multipath-tools.spec: package *.so symlinks in -devel pkgs
  (bsc#1066376)
- multipath-tools.spec: SLE15: add RADOS support for s390x
  (bsc#1066380)
- Fix build error for targets SLE_12, SLE_12_SP1
  (bsc#1066392)

OBS-URL: https://build.opensuse.org/request/show/538656
OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=139

multipath-tools.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Nov  3 09:57:57 UTC 2017 - mwilck@suse.com
+
+- multipath-tools.spec: package *.so symlinks in -devel pkgs
+  (bsc#1066376)
+- multipath-tools.spec: SLE15: add RADOS support for s390x
+  (bsc#1066380)
+- Fix build error for targets SLE_12, SLE_12_SP1
+  (bsc#1066392)
+
 -------------------------------------------------------------------
 Thu Oct 26 17:19:39 UTC 2017 - mwilck@suse.com
 

multipath-tools.spec

@@ -56,16 +56,24 @@
 %endif # 0%{?is_opensuse} == 1
 %else  # 0%{?suse_version} == 1315
 %if 0%{?suse_version} >= 1330
+%if 0%{?is_opensuse} == 1
 #### Factory / Tumbleweed
 #### (see ExclusiveArch in ceph spec file)
 %ifarch x86_64 aarch64 ppc64 ppc64le
 %bcond_without rados
 %endif # arch
+%else  # 0%{?is_opensuse} == 1
+#### SLE15
+#### (see ExclusiveArch in ceph spec file)
+%ifarch x86_64 aarch64 ppc64le s390x
+%bcond_without rados
+%endif # arch
+%endif # 0%{?is_opensuse} == 1
 %endif # 0%{?suse_version} >= 1330
 %endif # 0%{?suse_version} == 1315
 
 # Whether to build libdmmp
-# Default YES on openSUSE factory and leap
+# Default YES on openSUSE factory, SLE15, and leap
 # Default NO on SLES 12
 # Always NO on other distros
 %if 0%{?suse_version} == 1315
@@ -201,10 +209,7 @@ make CC="%__cc" OPTFLAGS="%{optflags}" %{dirflags} %{makeflags}
 %install
 make DESTDIR=%{buildroot} %{dirflags} %{makeflags} install
 mkdir -p %{buildroot}/var/cache/multipath/
-rm %{buildroot}/%_lib/*.so
-%if 0%{?with_libdmmp} == 1
-rm %{buildroot}/%_libdir/*.so
-%endif
+rm %{buildroot}/%_lib/libmultipath.so
 mkdir -p %{buildroot}/usr/sbin
 ln -sf /usr/sbin/service %{buildroot}/usr/sbin/rcmultipathd
 mkdir -p %{buildroot}/usr/lib/modules-load.d
@@ -270,6 +275,8 @@ exit 0
 
 %files devel
 %defattr(-,root,root)
+/%{_lib}/libmpathcmd.so
+/%{_lib}/libmpathpersist.so
 /usr/include/mpath_cmd.h
 /usr/include/mpath_persist.h
 %{_mandir}/man3/mpath_persistent_*
@@ -282,6 +289,12 @@ exit 0
 %{_udevrulesdir}/66-kpartx.rules
 %{_udevrulesdir}/68-del-part-nodes.rules
 /%{_sysdir}/udev/kpartx_id
+# SLE12-SP1 and earlier: dracut does not own /usr/lib/dracut/dracut.conf.d
+%if 0%{?sle_version}
+%if 0%{?sle_version} <= 120100
+%dir /%{_sysdir}/dracut/dracut.conf.d
+%endif # 0%{?sle_version} <= 120100
+%endif # 0%{?sle_version}
 /%{_sysdir}/dracut/dracut.conf.d/dm-parts.conf
 %{_mandir}/man8/kpartx.8*
 
@@ -308,6 +321,7 @@ exit 0
 
 %files -n libdmmp-devel
 %defattr(-,root,root)
+/%{_libdir}/libdmmp.so
 %{_mandir}/man3/libdmmp.h*
 %{_mandir}/man3/dmmp_*
 %{_includedir}/libdmmp