From 29a30b56da40f5e0d77f94c6d28a3b3801ce2f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 23 Nov 2017 18:07:52 +0100 Subject: [PATCH 1/3] Added nil check --- language/src/modules/Language.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/src/modules/Language.rb b/language/src/modules/Language.rb index aeb15084..d6bbb0b0 100644 --- a/language/src/modules/Language.rb +++ b/language/src/modules/Language.rb @@ -553,7 +553,7 @@ def ReadLocaleConfLanguage @localed_conf = Y2Country.read_locale_conf return nil if @localed_conf.nil? local_lang = @localed_conf["LANG"] - local_lang.sub!(/[.@].*$/, "") + local_lang.sub!(/[.@].*$/, "") if local_lang log.info("language from sysconfig: %{local_lang}") local_lang end From 880729cdf59e8dfd95e614656ae9dd8383230f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Thu, 23 Nov 2017 18:11:17 +0100 Subject: [PATCH 2/3] Move y2country/language_dbus.rb to the *-data subpackage --- package/yast2-country.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/yast2-country.spec b/package/yast2-country.spec index f3afe507..61a4a057 100644 --- a/package/yast2-country.spec +++ b/package/yast2-country.spec @@ -100,7 +100,8 @@ install -m 0644 %SOURCE2 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ %{yast_moduledir}/YaPI/TIME.pm %{yast_moduledir}/YaPI/LANGUAGE.pm %{yast_clientdir}/*.rb -%{yast_libdir}/y2country +%dir %{yast_libdir}/y2country +%{yast_libdir}/y2country/widgets %{yast_ydatadir}/*.ycp %{yast_yncludedir}/keyboard/ %{yast_yncludedir}/timezone/ @@ -130,5 +131,7 @@ functions (Language module) %dir %{yast_ydatadir}/languages %{yast_ydatadir}/languages/*.ycp %{yast_moduledir}/Language.rb +%dir %{yast_libdir}/y2country +%{yast_libdir}/y2country/language_dbus.rb %changelog From c8370a356a85524327a8b18645e315ff622c02f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 24 Nov 2017 09:03:54 +0100 Subject: [PATCH 3/3] Changes --- package/yast2-country.changes | 8 ++++++++ package/yast2-country.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/package/yast2-country.changes b/package/yast2-country.changes index fcf813c3..dd736a55 100644 --- a/package/yast2-country.changes +++ b/package/yast2-country.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 24 08:01:20 UTC 2017 - lslezak@suse.cz + +- Move the y2country/language_dbus.rb file to the + yast2-country-data subpackage where it is needed by Language.rb + (bsc#1069119) +- 4.0.10 + ------------------------------------------------------------------- Fri Nov 17 14:40:52 CET 2017 - schubi@suse.de diff --git a/package/yast2-country.spec b/package/yast2-country.spec index 61a4a057..3cc04988 100644 --- a/package/yast2-country.spec +++ b/package/yast2-country.spec @@ -17,7 +17,7 @@ Name: yast2-country -Version: 4.0.9 +Version: 4.0.10 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build