From 27bb40f3fd35ab5be1b952a8aa52acd1e2585a4428e33758f5c2a7ea37c007d5 Mon Sep 17 00:00:00 2001
From: Mark Post <mpost@suse.com>
Date: Thu, 28 Jan 2021 22:00:24 +0000
Subject: [PATCH] Accepting request 867582 from
 home:markkp:branches:Base:System

- Moved %dir %{_libdir}/zkey and %{_libdir}/zkey/zkey-ekmfweb.so
  from the libekfmweb1 package to the main package since it is a
  plugin for the zkey command, and not a shared library.
  (bsc#1180534)

OBS-URL: https://build.opensuse.org/request/show/867582
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=104
---
 s390-tools.changes | 8 ++++++++
 s390-tools.spec    | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/s390-tools.changes b/s390-tools.changes
index eae36b3..c598e43 100644
--- a/s390-tools.changes
+++ b/s390-tools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jan 28 21:23:35 UTC 2021 - Mark Post <mpost@suse.com>
+
+- Moved %dir %{_libdir}/zkey and %{_libdir}/zkey/zkey-ekmfweb.so
+  from the libekfmweb1 package to the main package since it is a
+  plugin for the zkey command, and not a shared library.
+  (bsc#1180534)
+
 -------------------------------------------------------------------
 Mon Dec  7 17:53:46 UTC 2020 - Mark Post <mpost@suse.com>
 
diff --git a/s390-tools.spec b/s390-tools.spec
index 4605d83..df96452 100644
--- a/s390-tools.spec
+++ b/s390-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package s390-tools
 #
-# Copyright (c) 2001-2020 SUSE LLC
+# Copyright (c) 2001-2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -522,6 +522,8 @@ fi
 %dir %{_datadir}/s390-tools/genprotimg
 %dir %{_prefix}/lib/dracut/modules.d/95zdev
 %dir /boot/zipl
+%dir %{_libdir}/zkey
+%{_libdir}/zkey/zkey-ekmfweb.so
 %dir /lib/s390-tools/
 /lib/s390-tools/zipl.conf
 %{_prefix}/lib/modules-load.d/pkey.conf
@@ -553,8 +555,6 @@ fi
 %files -n libekmfweb1
 %defattr(-,root,root)
 %{_libdir}/libekmfweb.so.*
-%dir %{_libdir}/zkey
-%{_libdir}/zkey/zkey-ekmfweb.so
 
 %files -n libekmfweb1-devel
 %{_libdir}/libekmfweb.so