Merge branch 'SLE-15-SP2' into drop-suse-btrfs-element-master

yast · Sep 29, 2020 · 1a24a3a · 1a24a3a
2 parents 89ef1fc + 95b4f95
commit 1a24a3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/package/yast2-schema.changes b/package/yast2-schema.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 29 13:24:26 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Drop the 'suse_btrfs' element from the schema (bsc#1176970).
+- 4.3.10
+
 -------------------------------------------------------------------
 Tue Sep 29 10:34:30 UTC 2020 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/package/yast2-schema.spec b/package/yast2-schema.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-schema
-Version:        4.3.9
+Version:        4.3.10
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -44,8 +44,8 @@ BuildRequires: yast2-add-on >= 4.3.3
 BuildRequires: yast2-audit-laf >= 4.3.0
 BuildRequires: yast2-auth-client >= 4.3.0
 BuildRequires: yast2-auth-server
-# tag update_nvram
-BuildRequires: yast2-bootloader >= 4.3.10
+# drop 'suse_btrfs' element
+BuildRequires: yast2-bootloader >= 4.3.11
 BuildRequires: yast2-country >= 4.3.0
 BuildRequires: yast2-configuration-management >= 4.3.0
 BuildRequires: yast2-dhcp-server >= 4.3.0