Merge pull request #134 from yast/merge-SLE-15-SP3

Merge SLE-15-SP3 in SLE-15-SP4
yast · May 5, 2022 · 5367304 · 5367304
2 parents b1e7dce + 895499c
commit 5367304
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/package/yast2-schema-default.changes b/package/yast2-schema-default.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May  4 05:46:40 UTC 2022 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Fix rules validation when using a dialog (bsc#1199165).
+- 4.4.12
+
 -------------------------------------------------------------------
 Fri Feb 18 14:35:23 UTC 2022 - Knut Anderssen <kanderssen@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.11
+Version:        4.4.12
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -42,8 +42,8 @@ BuildRequires:	trang yast2-devtools
 # All packages providing RNG files for AutoYaST
 # in /usr/share/YaST2/schema/autoyast/rng/*.rng
 
-# add 'efi' element to the rules schema
-BuildRequires: autoyast2 >= 4.4.21
+# fix 'rules' validation ('conflicts' and 'dialog')
+BuildRequires: autoyast2 >= 4.4.37
 BuildRequires: yast2
 # add_on_products and add_on_others types
 BuildRequires: yast2-add-on >= 4.3.3