From d49daea31614142651318ea001ed41ab31e37f353f1eb89637ba6db8ed30ecab Mon Sep 17 00:00:00 2001
From: YaST  Team Bot <yast-internal@suse.de>
Date: Tue, 4 Nov 2014 08:55:06 +0000
Subject: [PATCH] - Improve dialog asking if system should be cloned
 (bnc#900028) - 3.1.120

- AutoYaST Second Stage: Fixed a crash in package management when
  running in Qt UI with libproxy1-config-kde4 package installed.
  (bnc#866692)
- 3.1.119

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-installation?expand=0&rev=657
---
 YaST2-Second-Stage.service         |  7 ++++++-
 yast2-installation-3.1.118.tar.bz2 |  3 ---
 yast2-installation-3.1.120.tar.bz2 |  3 +++
 yast2-installation.changes         | 14 ++++++++++++++
 yast2-installation.spec            |  4 ++--
 5 files changed, 25 insertions(+), 6 deletions(-)
 delete mode 100644 yast2-installation-3.1.118.tar.bz2
 create mode 100644 yast2-installation-3.1.120.tar.bz2

diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service
index f0ca11d..dd7f549 100644
--- a/YaST2-Second-Stage.service
+++ b/YaST2-Second-Stage.service
@@ -6,7 +6,12 @@ ConditionPathExists=/var/lib/YaST2/runme_at_boot
 
 [Service]
 Type=oneshot
-Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux
+# PX_MODULE_PATH=""  ==>
+# Do not load libproxy modules (config_kde4 module crashes because of Qt4/Qt5
+# clash), empty path causes that the installed modules are not found. Sysconfig
+# and envvar extensions are still loaded, /etc/sysconfig/proxy values are still
+# used correctly (see bnc#866692 and bnc#866692 for details).
+Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux PX_MODULE_PATH=""
 # Workaround of bug in plymouth --> using deactivate option
 # in second boot stage in order to start ncurses yast correctly
 # (bnc#886488)
diff --git a/yast2-installation-3.1.118.tar.bz2 b/yast2-installation-3.1.118.tar.bz2
deleted file mode 100644
index 3bfde4f..0000000
--- a/yast2-installation-3.1.118.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c1ee267a86daa2a9ba195590caced500fd3d72ed16273aa24730585bab24f396
-size 1212533
diff --git a/yast2-installation-3.1.120.tar.bz2 b/yast2-installation-3.1.120.tar.bz2
new file mode 100644
index 0000000..81c9372
--- /dev/null
+++ b/yast2-installation-3.1.120.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce3854537d60d9f285fd4973c743bc02c2a454b409402f3f5d085197ff3c022f
+size 1212561
diff --git a/yast2-installation.changes b/yast2-installation.changes
index c0f196c..d876d9b 100644
--- a/yast2-installation.changes
+++ b/yast2-installation.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Tue Nov  4 08:32:27 UTC 2014 - jreidinger@suse.com
+
+- Improve dialog asking if system should be cloned (bnc#900028)
+- 3.1.120
+
+-------------------------------------------------------------------
+Mon Nov  3 16:19:30 CET 2014 - schubi@suse.de
+
+- AutoYaST Second Stage: Fixed a crash in package management when
+  running in Qt UI with libproxy1-config-kde4 package installed.
+  (bnc#866692)
+- 3.1.119
+
 -------------------------------------------------------------------
 Fri Oct 31 07:41:09 UTC 2014 - jreidinger@suse.com
 
diff --git a/yast2-installation.spec b/yast2-installation.spec
index 01fd499..0742739 100644
--- a/yast2-installation.spec
+++ b/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.1.118
+Version:        3.1.120
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -56,7 +56,7 @@ Requires:       yast2 >= 3.1.43
 # Language::Set (handles downloading the translation extensions)
 Requires:       yast2-country-data >= 2.16.11
 
-# Pkg::SourceProvideDigestedFile() 
+# Pkg::SourceProvideDigestedFile()
 Conflicts:      yast2-pkg-bindings < 2.17.25
 
 # Pkg::Add/RemoveUpgradeRepo()