Merge pull request #127 from yast/security_schema

Removed 'lsm' section and added 'lsm_select' to security
yast · Jan 28, 2022 · d0fd3de · d0fd3de
2 parents 35aab48 + 14af4b3
commit d0fd3de
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/package/yast2-schema-default.changes b/package/yast2-schema-default.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 26 14:38:52 UTC 2022 - Knut Anderssen <kanderssen@suse.com>
+
+- Removed 'lsm' section adding just the 'lsm_select' element to the
+  security section (related to jsc#SLE-22069).
+- 4.4.10
+
 -------------------------------------------------------------------
 Tue Jan 25 14:21:41 UTC 2022 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-schema-default.spec b/package/yast2-schema-default.spec
@@ -18,7 +18,7 @@
 
 Name:           yast2-schema-default
 # Keep versions in sync with yast2-schema-micro
-Version:        4.4.9
+Version:        4.4.10
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -29,9 +29,9 @@ License:        GPL-2.0-or-later
 
 Url:            https://github.com/yast/yast-schema
 
-Provides:       yast2-schema
+Provides:       yast2-schema = %{version}
 # others cannot be used as it contains same files
-Conflicts:      otherproviders(yast2-schema)
+Conflicts:      yast2-schema
 Obsoletes:      yast2-schema < 4.4.9
 
 # Dependencies needed to build the package
@@ -89,8 +89,8 @@ BuildRequires: yast2-s390
 %endif
 BuildRequires: yast2-samba-client
 BuildRequires: yast2-samba-server
-# Added lsm 'none' section to security.rnc
-BuildRequires: yast2-security >= 4.4.7
+# Removed 'lsm' section and added 'lsm_select' to security.rnc
+BuildRequires: yast2-security >= 4.4.10
 BuildRequires: yast2-services-manager
 BuildRequires: yast2-sound
 BuildRequires: yast2-squid

diff --git a/package/yast2-schema-micro.changes b/package/yast2-schema-micro.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jan 26 22:58:53 UTC 2022 - Knut Anderssen <kanderssen@suse.com>
+
+- Synced version with default schema (related to jsc#SLE-22069).
+- 4.4.10
+
 -------------------------------------------------------------------
 Fri Jan 21 12:04:34 UTC 2022 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-schema-micro.spec b/package/yast2-schema-micro.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-schema-micro
-Version:        4.4.9
+Version:        4.4.10
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -28,9 +28,9 @@ Source0:        yast2-schema-default-%{version}.tar.bz2
 URL:            https://github.com/yast/yast-schema
 
 # provide schema, so it is full replacement
-Provides:       yast2-schema
+Provides:       yast2-schema = %{version}
 # others cannot be used as it contains same files
-Conflicts:      otherproviders(yast2-schema)
+Conflicts:      yast2-schema
 Obsoletes:      yast2-schema < 4.4.9
 
 # Dependencies needed to build the package