1
0

Accepting request 538663 from 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) (forwarded request 538656 from mwilck)

OBS-URL: https://build.opensuse.org/request/show/538663
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/multipath-tools?expand=0&rev=93
This commit is contained in:
Dominique Leuenberger 2017-11-03 15:32:43 +00:00 committed by Git OBS Bridge
commit 56bb3c5199
5 changed files with 42 additions and 10 deletions

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/multipath-tools.git</param>
<param name="changesrevision">4de08d9620fbd927e81c5b6253890f832bc28a6b</param></service></servicedata>
<param name="changesrevision">db431514080f1479dcdf038a27214fd4a989c3d8</param></service></servicedata>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:597d624a7ff6d425c6a9e12b323f53b63602202b322696e3fbf5fcddfd2923d5
size 264108

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d041e29353b97e886e15c0b5f8f8db1c325a11f5c173f93e7ef75c96b96f8032
size 264100

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
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
- Update to version 0.7.3+13+suse.db431514080f:
* kpartx: create symlinks for dmraid devices (bsc#1064212)
* limbultipath: prefer RDAC checker with detect_checker
(bsc#1055949)
-------------------------------------------------------------------
Tue Oct 17 08:54:25 UTC 2017 - hare@suse.com

View File

@ -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
@ -89,7 +97,7 @@
Name: multipath-tools
Url: http://christophe.varoqui.free.fr/
Version: 0.7.3+11+suse.4de08d96
Version: 0.7.3+13+suse.db431514
Release: 0
Summary: Tools to Manage Multipathed Devices with the device-mapper
License: GPL-2.0
@ -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