Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Packaging fix - move language_dbus.rb file (bsc#1069119) #152

Merged
merged 3 commits into from
Nov 24, 2017
Merged

Packaging fix - move language_dbus.rb file (bsc#1069119) #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29a30b5
Added nil check
lslezak Nov 23, 2017
880729c
Move y2country/language_dbus.rb to the *-data subpackage
lslezak Nov 23, 2017
c8370a3
Changes
lslezak Nov 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion language/src/modules/Language.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions package/yast2-country.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
7 changes: 5 additions & 2 deletions package/yast2-country.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-country
Version: 4.0.9
Version: 4.0.10
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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