Merge pull request #1058 from yast/drop_any_xml

Drop any xml
yast · Jun 4, 2020 · 0b4b5ac · 0b4b5ac
2 parents 738b2b8 + 5fdd8bf
commit 0b4b5ac
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 212 deletions.
diff --git a/library/general/src/scrconf/anyxml.scr b/library/general/src/scrconf/anyxml.scr
diff --git a/library/general/src/servers_non_y2/ag_anyxml b/library/general/src/servers_non_y2/ag_anyxml
diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun  4 13:16:21 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- Drop anyxml agent to unify used xml parsers. All usage replaced
+  by rubygem-nokogiri
+  (related to bsc#1170886)
+- 4.3.4
+
 -------------------------------------------------------------------
 Mon Jun  1 08:45:51 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.3.3
+Version:        4.3.4
 Release:        0
 Summary:        YaST2 Main Package
 License:        GPL-2.0-only
@@ -69,8 +69,6 @@ BuildRequires:  rpm
 Requires:       coreutils
 # for GPG.ycp
 Requires:       gpg2
-# for ag_anyxml
-Requires:       perl-XML-Simple
 # for defining abstract methods in libraries
 Requires:       rubygem(%{rb_default_ruby_abi}:abstract_method)
 # for file access using augeas
@@ -119,8 +117,10 @@ Conflicts:      yast2-dns-server < 3.1.17
 Conflicts:      yast2-installation < 4.2.9
 # moved cfg_mail.scr
 Conflicts:      yast2-mail < 3.1.7
-# y2packager/repository.rb has been moved here
-Conflicts:      yast2-packager < 4.2.46
+# anyxml droppped
+Conflicts:      yast2-packager < 4.3.2
+# anyxml droppped
+Conflicts:      yast2-update < 4.3.0
 # Older snapper does not provide machine-readable output
 Conflicts:	snapper < 0.8.6