From 37931ba301f9d456e36e0da77ce5aa9b3b5e64329ecd8ebc0a76e240d21bb6d8 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Tue, 21 Mar 2017 12:21:19 +0000
Subject: [PATCH] Accepting request 481759 from
 home:mwilck:branches:Base:System

- Spec file: disable librados for architectures for which ceph
  is not built
- Spec file: enable librados by default for SLES12 SP3, disable
  it on Leap <= 42.1
- Update to version 0.6.4+104+suse.ac0df678:
  * multipathd: fix SIGUSR2 handling

OBS-URL: https://build.opensuse.org/request/show/481759
OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=115
---
 _service                                      |  2 +-
 _servicedata                                  |  2 +-
 ...ipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz |  3 --
 ...ipath-tools-0.6.4+104+suse.ac0df678.tar.xz |  3 ++
 multipath-tools.changes                       | 10 +++++
 multipath-tools.spec                          | 39 ++++++++++++-------
 6 files changed, 41 insertions(+), 18 deletions(-)
 delete mode 100644 multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz
 create mode 100644 multipath-tools-0.6.4+104+suse.ac0df678.tar.xz

diff --git a/_service b/_service
index d13c1d6..333df44 100644
--- a/_service
+++ b/_service
@@ -5,7 +5,7 @@
     <param name="subdir"></param>
     <param name="filename">multipath-tools</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@+suse.%h</param>
-    <param name="revision">bcb5d0f4</param>
+    <param name="revision">ac0df678</param>
     <param name="changesgenerate">enable</param>
   </service>
   <service name="recompress" mode="localonly">
diff --git a/_servicedata b/_servicedata
index f967c57..fecd761 100644
--- a/_servicedata
+++ b/_servicedata
@@ -3,4 +3,4 @@
                 <param name="url">https://github.com/mwilck/multipath-tools.git</param>
               <param name="changesrevision">0119472d847eaa24cae7a0f3b523af82f50dd4df</param></service><service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/multipath-tools.git</param>
-              <param name="changesrevision">0119472d847eaa24cae7a0f3b523af82f50dd4df</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">ac0df6786a94cb1178ba263299146a8369f15291</param></service></servicedata>
\ No newline at end of file
diff --git a/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz b/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz
deleted file mode 100644
index 7d0ac1e..0000000
--- a/multipath-tools-0.6.4+103+suse.bcb5d0f4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:47e07a9570347301595fbcd5a58a9cece9d08b56eebb1572efaee4fbb7a44174
-size 250004
diff --git a/multipath-tools-0.6.4+104+suse.ac0df678.tar.xz b/multipath-tools-0.6.4+104+suse.ac0df678.tar.xz
new file mode 100644
index 0000000..7d564d0
--- /dev/null
+++ b/multipath-tools-0.6.4+104+suse.ac0df678.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d62b785208db0008243565345ebab065da34dbaea51ed8aa23e475577f80d5c2
+size 250568
diff --git a/multipath-tools.changes b/multipath-tools.changes
index 62a9e34..2c55ca5 100644
--- a/multipath-tools.changes
+++ b/multipath-tools.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Mar 21 11:49:06 UTC 2017 - mwilck@suse.com
+
+- Spec file: disable librados for architectures for which ceph
+  is not built
+- Spec file: enable librados by default for SLES12 SP3, disable
+  it on Leap <= 42.1
+- Update to version 0.6.4+104+suse.ac0df678:
+  * multipathd: fix SIGUSR2 handling
+
 -------------------------------------------------------------------
 Fri Mar 10 13:04:05 UTC 2017 - mwilck@suse.com
 
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 9473c4b..c345792 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -26,22 +26,35 @@
 %endif
 
 # Whether to build with RADOS support
-# Default YES on openSUSE factory and leap
+# Default YES on openSUSE factory and leap >= 42.2 and SLES12 >= SP3
+# (but only on architectures for which ceph is enabled).
 # Default NO on SLES 12 >= SP2
 # Always NO on other distros
 %if 0%{?suse_version} == 1315
 %if 0%{?is_opensuse} == 1
+%if 0%{?sle_version} >= 120200
 %bcond_without rados
-%else
+%endif # 0%{?sle_version} >= 120200
+%else  # 0%{?is_opensuse} == 1
+# Only architectures for which ceph is built, see ceph spec file
+%ifarch x86_64 aarch64 ppc64le s390x
+%if 0%{?sle_version} >= 120300
+%bcond_without rados
+%else  # 0%{?sle_version} >= 120300
 %if 0%{?sle_version} >= 120200
 %bcond_with rados
-%endif
-%endif
-%else
+%endif # 0%{?sle_version} >= 120200
+%endif # 0%{?sle_version} >= 120300
+%endif # arch
+%endif # 0%{?is_opensuse} == 1
+%else  # 0%{?suse_version} == 1315
 %if 0%{?suse_version} >= 1330
+# Only architectures for which ceph is built, see ceph spec file
+%ifarch x86_64 aarch64 ppc64 ppc64le
 %bcond_without rados
-%endif
-%endif
+%endif # arch
+%endif # 0%{?suse_version} >= 1330
+%endif # 0%{?suse_version} == 1315
 
 # Whether to build libdmmp
 # Default YES on openSUSE factory and leap
@@ -50,14 +63,14 @@
 %if 0%{?suse_version} == 1315
 %if 0%{?is_opensuse} == 1
 %bcond_without libdmmp
-%else
+%else  # 0%{?is_opensuse} == 1
 %bcond_with libdmmp
-%endif
-%else
+%endif # 0%{?is_opensuse} == 1
+%else  # 0%{?is_opensuse} == 1
 %if 0%{?suse_version} >= 1330
 %bcond_without libdmmp
-%endif
-%endif
+%endif # 0%{?suse_version} >= 1330
+%endif # 0%{?suse_version} == 1315
 
 # This should match the version in libdmmp/Makefile
 %define _libdmmp_version 0.1.0
@@ -83,7 +96,7 @@ Requires:       device-mapper >= 1.2.78
 Requires:       kpartx
 Requires:       sg3_utils
 PreReq:         coreutils grep
-Version:        0.6.4+103+suse.bcb5d0f4
+Version:        0.6.4+104+suse.ac0df678
 Release:        0
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
 License:        GPL-2.0