From 405d2402242ec4111c68eb5fdbde2f506c8ebd60960647cbd56cd5f42e53bf46 Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <snwint@suse.com>
Date: Fri, 18 May 2018 10:23:19 +0000
Subject: [PATCH] - release 3.3.287

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/libstorage-ng?expand=0&rev=315
---
 libstorage-ng-3.3.286.tar.xz | 3 ---
 libstorage-ng-3.3.287.tar.xz | 3 +++
 libstorage-ng.changes        | 7 +++++++
 libstorage-ng.spec           | 6 +++++-
 4 files changed, 15 insertions(+), 4 deletions(-)
 delete mode 100644 libstorage-ng-3.3.286.tar.xz
 create mode 100644 libstorage-ng-3.3.287.tar.xz

diff --git a/libstorage-ng-3.3.286.tar.xz b/libstorage-ng-3.3.286.tar.xz
deleted file mode 100644
index 91c7b60..0000000
--- a/libstorage-ng-3.3.286.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:589ca52b05736411719a247593d4420210ca5263d714bde0f51fe0b98773a425
-size 612452
diff --git a/libstorage-ng-3.3.287.tar.xz b/libstorage-ng-3.3.287.tar.xz
new file mode 100644
index 0000000..619ce6f
--- /dev/null
+++ b/libstorage-ng-3.3.287.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ee8bdea915bf25415bdfd875eac42a45ee1c97338802513e5e593f3c63fc0c8
+size 612488
diff --git a/libstorage-ng.changes b/libstorage-ng.changes
index 8fce838..fa3a9e0 100644
--- a/libstorage-ng.changes
+++ b/libstorage-ng.changes
@@ -1,3 +1,10 @@
+--------------------------------------------------------------------
+Fri May 18 10:17:26 UTC 2018 - jlopez@suse.com
+
+- merge gh#openSUSE/libstorage-ng#530
+- Add conflict with old libdmraid (bsc#1088570)
+- 3.3.287
+
 --------------------------------------------------------------------
 Fri May 18 07:19:01 UTC 2018 - aschnell@suse.de
 
diff --git a/libstorage-ng.spec b/libstorage-ng.spec
index 254b50f..eb3c103 100644
--- a/libstorage-ng.spec
+++ b/libstorage-ng.spec
@@ -18,7 +18,7 @@
 
 %define libname %{name}1
 Name:           libstorage-ng
-Version:        3.3.286
+Version:        3.3.287
 Release:        0
 Summary:        Library for storage management
 License:        GPL-2.0
@@ -89,6 +89,10 @@ Obsoletes:      libstorage %(echo `seq -s " " -f "libstorage%.f" 9`)
 %ifarch s390 s390x
 Requires:       s390-tools
 %endif
+# Old version of libdmraid cannot be used. Upgrading from SLE11 to SLE15
+# does not remove old version, so it needs to be marked as conflict.
+# For more info, see https://bugzilla.suse.com/show_bug.cgi?id=1088570#c35
+Conflicts:      libdmraid.so.1.0.0.rc16(libdmraid.so.1.0.0.rc16)(64bit)
 
 %description -n %{libname}
 This package contains libstorage-ng, a library for storage management.