Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory
checked in at 2014-01-22 14:11:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
and /work/SRC/openSUSE:Factory/.yast2-country.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes
2013-10-06 19:37:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes
2014-01-23 15:59:01.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Jan 21 09:16:47 UTC 2014 - jsr...@suse.cz
+
+- adjusted timezone dialog layout (fate#314695)
+- 3.1.1
+
+-------------------------------------------------------------------
Old:
----
yast2-country-3.1.0.tar.bz2
New:
----
yast2-country-3.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.jDj6x1/_old 2014-01-23 15:59:02.000000000 +0100
+++ /var/tmp/diff_new_pack.jDj6x1/_new 2014-01-23 15:59:02.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-country
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.1.0
+Version: 3.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -30,7 +30,7 @@
BuildRequires: polkit-devel
BuildRequires: update-desktop-files
BuildRequires: yast2
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: yast2-perl-bindings
BuildRequires: yast2-testsuite
Requires: timezone
++++++ yast2-country-3.1.0.tar.bz2 -> yast2-country-3.1.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-3.1.0/CONTRIBUTING.md
new/yast2-country-3.1.1/CONTRIBUTING.md
--- old/yast2-country-3.1.0/CONTRIBUTING.md 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-country-3.1.1/CONTRIBUTING.md 2014-01-22 09:49:53.000000000
+0100
@@ -0,0 +1,87 @@
+YaST Contribution Guidelines
+============================
+
+YaST is an open source project and as such it welcomes all kinds of
+contributions. If you decide to contribute, please follow these guidelines to
+ensure the process is effective and pleasant both for you and YaST maintainers.
+
+There are two main forms of contribution: reporting bugs and performing code
+changes.
+
+Bug Reports
+-----------
+
+If you find a problem, please report it either using
+[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
+or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
+registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
+if you don't have an account yet.)
+
+If you find a problem, please report it either using
+[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee
+that every bug will be fixed, but we'll try.
+
+When creating a bug report, please follow our [bug reporting
+guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
+
+Code Changes
+------------
+
+We welcome all kinds of code contributions, from simple bug fixes to
significant
+refactorings and implementation of new features. However, before making any
+non-trivial contribution, get in touch with us first — this can prevent wasted
+effort on both sides. Also, have a look at our [development
+documentation](http://en.opensuse.org/openSUSE:YaST_development).
+
+To send us your code change, use GitHub pull requests. The workflow is as
+follows:
+
+ 1. Fork the project.
+
+ 2. Create a topic branch based on `master`.
+
+ 3. Implement your change, including tests (if possible). Make sure you adhere
+ to the [Ruby style
+ guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
+
+ 4. Make sure your change didn't break anything by building the RPM package
+ (`rake osc:build`). The build process includes running the full testsuite.
+
+ 5. Publish the branch and create a pull request.
+
+ 6. YaST developers will review your change and possibly point out issues.
+ Adapt the code under their guidance until they are all resolved.
+
+ 7. Finally, the pull request will get merged or rejected.
+
+See also [GitHub's guide on
+contributing](https://help.github.com/articles/fork-a-repo).
+
+If you want to do multiple unrelated changes, use separate branches and pull
+requests.
+
+Do not change the `VERSION` and `*.changes` files as this could lead to
+conflicts.
+
+### Commits
+
+Each commit in the pull request should do only one thing, which is clearly
+described by its commit message. Especially avoid mixing formatting changes and
+functional changes into one commit. When writing commit messages, adhere to
+[widely used
+conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
+
+If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure
+you mention it in the commit message for cross-reference. Use format like
+bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
+autolinking](https://help.github.com/articles/github-flavored-markdown#references)
+and [openSUSE abbreviation
+reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations).
+
+Additional Information
+----------------------
+
+If you have any question, feel free to ask at the [development mailing
+list](http://lists.opensuse.org/yast-devel/) or at the
+[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
+We'll do our best to provide a timely and accurate answer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-3.1.0/Rakefile
new/yast2-country-3.1.1/Rakefile
--- old/yast2-country-3.1.0/Rakefile 2013-10-03 15:34:15.000000000 +0200
+++ new/yast2-country-3.1.1/Rakefile 2014-01-22 09:49:54.000000000 +0100
@@ -1,6 +1,6 @@
require "yast/rake"
-Packaging.configuration do |conf|
+Yast::Tasks.configuration do |conf|
#lets ignore license check for now
conf.skip_license_check << /.*/
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-3.1.0/VERSION
new/yast2-country-3.1.1/VERSION
--- old/yast2-country-3.1.0/VERSION 2013-10-03 15:34:15.000000000 +0200
+++ new/yast2-country-3.1.1/VERSION 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-3.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-3.1.0/package/yast2-country.changes
new/yast2-country-3.1.1/package/yast2-country.changes
--- old/yast2-country-3.1.0/package/yast2-country.changes 2013-10-03
15:34:15.000000000 +0200
+++ new/yast2-country-3.1.1/package/yast2-country.changes 2014-01-22
09:49:54.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jan 21 09:16:47 UTC 2014 - jsr...@suse.cz
+
+- adjusted timezone dialog layout (fate#314695)
+- 3.1.1
+
+-------------------------------------------------------------------
Wed Oct 2 14:46:53 UTC 2013 - lsle...@suse.cz
- do not use *.spec.in template, use *.spec file with RPM macros
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-country-3.1.0/package/yast2-country.spec
new/yast2-country-3.1.1/package/yast2-country.spec
--- old/yast2-country-3.1.0/package/yast2-country.spec 2013-10-03
15:34:15.000000000 +0200
+++ new/yast2-country-3.1.1/package/yast2-country.spec 2014-01-22
09:49:54.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.1.0
+Version: 3.1.1
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -29,7 +29,7 @@
Source1: org.opensuse.yast.modules.yapi.time.policy
Source2: org.opensuse.yast.modules.yapi.language.policy
BuildRequires: perl-XML-Writer update-desktop-files yast2-testsuite yast2
yast2-perl-bindings
-BuildRequires: yast2-devtools >= 3.0.6
+BuildRequires: yast2-devtools >= 3.1.10
BuildRequires: polkit-devel
Requires: yast2-trans-stats yast2-perl-bindings timezone
# XVersion.ycp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-country-3.1.0/timezone/src/include/timezone/dialogs.rb
new/yast2-country-3.1.1/timezone/src/include/timezone/dialogs.rb
--- old/yast2-country-3.1.0/timezone/src/include/timezone/dialogs.rb
2013-10-03 15:34:15.000000000 +0200
+++ new/yast2-country-3.1.1/timezone/src/include/timezone/dialogs.rb
2014-01-22 09:49:54.000000000 +0100
@@ -53,7 +53,7 @@
Yast.import "Timezone"
Yast.import "Wizard"
- @hwclock_s_initial = :none
+ @hwclock_s = @hwclock_s_initial = :none
# if system clock is configured to sync with NTP
@ntp_used = false
@@ -135,6 +135,10 @@
# @return true if user changed the time (dialog accepted)
def SetTimeDialog
ntp_help_text = Convert.to_string(ntp_call("ui_help_text", {}))
+
+ utc_only = Timezone.utc_only
+ textmode = Language.GetTextMode
+
# help text for set time dialog
htext = Ops.add(
_(
@@ -145,6 +149,32 @@
ntp_help_text
)
+ if !utc_only
+ # help for time calculation basis:
+ # hardware clock references local time or UTC?
+ htext = htext + _(
+ "<p>\n" +
+ "Specify whether your machine is set to local time or UTC in
<b>Hardware Clock Set To</b>.\n" +
+ "Most PCs that also have other operating systems installed (such
as Microsoft\n" +
+ "Windows) use local time.\n" +
+ "Machines that have only Linux installed are usually\n" +
+ "set to Universal Time Coordinated (UTC).\n" +
+ "If the hardware clock is set to UTC, your system can switch
from standard time\n" +
+ "to daylight saving time and back automatically.\n" +
+ "</p>\n"
+ )
+
+ # help text: extra note about localtim
+ htext = htext + _(
+ "<p>\n" +
+ "Note: The internal system clock as used by the Linux kernel
must\n" +
+ "always be in UTC, because this is the reference for the correct
localtime\n" +
+ "in user space. If you are choosing localtime for CMOS clock,\n"
+
+ "check the user manual for background information about side
effects.\n" +
+ "</p>"
+ )
+ end
+
dt_widgets = false
hour = ""
@@ -252,55 +282,71 @@
dt_widgets = true
end
+ hwclock_term = VBox(
+ CheckBox(
+ Id(:hwclock),
+ Opt(:hstretch, :notify),
+ # check box label
+ _("&Hardware Clock Set to UTC"),
+ @hwclock_s == :hwclock_utc
+ ),
+ textmode ? Label("") : Empty()
+ )
-
-
- cont = HBox(
- HWeight(1, VBox()),
- HWeight(
- 6,
- RadioButtonGroup(
- Id(:rb),
- VBox(
- # radio button label (= how to setup time)
- Left(RadioButton(Id(:manual), Opt(:notify), _("Manually"))),
- VSpacing(0.5),
- HBox(
- HSpacing(3),
- VBox(
- Left(timeterm),
- VSpacing(),
- Left(dateterm),
- VSpacing(),
- HBox(
- HSpacing(0.5),
- Left(
- # check box label
- CheckBox(
- Id(:change_now),
- Opt(:notify),
- _("Change the Time Now"),
- true
+ cont = VBox(
+ HBox(
+ HWeight(1, VBox()),
+ HWeight(
+ 6,
+ RadioButtonGroup(
+ Id(:rb),
+ VBox(
+ # radio button label (= how to setup time)
+ Left(RadioButton(Id(:manual), Opt(:notify), _("Manually"))),
+ VSpacing(0.5),
+ HBox(
+ HSpacing(3),
+ VBox(
+ Left(timeterm),
+ VSpacing(),
+ Left(dateterm),
+ VSpacing(),
+ HBox(
+ HSpacing(0.5),
+ Left(
+ # check box label
+ CheckBox(
+ Id(:change_now),
+ Opt(:notify),
+ _("Change the Time Now"),
+ true
+ )
)
)
)
- )
- ),
- VSpacing(1),
- Left(
- RadioButton(
- Id(:ntp),
- Opt(:notify),
- # radio button label
- _("Synchronize with NTP Server"),
- false
- )
- ),
- ReplacePoint(Id(:rp), Empty())
+ ),
+ VSpacing(1),
+ Left(
+ RadioButton(
+ Id(:ntp),
+ Opt(:notify),
+ # radio button label
+ _("Synchronize with NTP Server"),
+ false
+ )
+ ),
+ ReplacePoint(Id(:rp), Empty())
+ )
)
- )
+ ),
+ HWeight(1, VBox())
),
- HWeight(1, VBox())
+ VSpacing(2),
+ HBox(
+ HWeight(1, VBox()),
+ HWeight(6, utc_only ? Empty() : hwclock_term),
+ HWeight(1, VBox())
+ )
)
Wizard.OpenAcceptDialog
@@ -367,6 +413,38 @@
end
end
+ if ret == :accept
+ # Get current settings.
+ # UTC vs. localtime, only if needed
+ #
+ @hwclock_s = :hwclock_utc
+ if !utc_only
+ @hwclock_s = UI.QueryWidget(Id(:hwclock), :Value) ? :hwclock_utc :
:hwclock_localtime
+
+ if !Timezone.windows_partition && @hwclock_s == :hwclock_localtime
+ # warning popup, in case local time is selected (bnc#732769)
+ if !Popup.ContinueCancel(
+ _(
+ "\n" +
+ "You selected local time, but only Linux seems to be
installed on your system.\n" +
+ "In such case, it is strongly recommended to use UTC,
and to click Cancel.\n" +
+ "\n" +
+ "If you want to keep local time, you must adjust the
CMOS clock twice the year\n" +
+ "because of Day Light Saving switches. If you miss to
adjust the clock, backups may fail,\n" +
+ "your mail system may drop mail messages, etc.\n" +
+ "\n" +
+ "If you use UTC, Linux will adjust the time
automatically.\n" +
+ "\n" +
+ "Do you want to continue with your selection (local
time)?"
+ )
+ )
+ ret = :not_next
+ next
+ end
+ end
+ end
+ end
+
if ret == :accept && ntp_rb
# before the sync, save the time zone (bnc#467318)
Timezone.Set(
@@ -490,7 +568,7 @@
# So you can only specify the timezone." (ihno)
if !Arch.s390 && !Mode.config
# button text
- settime = PushButton(Id(:settime), _("Cha&nge..."))
+ settime = PushButton(Id(:settime), _("Other &Settings..."))
end
textmode = Language.GetTextMode
@@ -595,72 +673,58 @@
# title for combo box 'timezone'
ComboBox(Id(:timezone), Opt(:notify), _("Time &Zone"))
)
+ ),
+ HSpacing(),
+ HWeight(1, VBox(
+ Left(Label(_("Date and Time"))),
+ Left(Label(Id(:date), date)))
+ ),
+ HSpacing(),
+ VBox(
+ Label(" "),
+ settime
)
)
)
else
- timezoneterm = HBox(
- SelectionBox(
- Id(:region),
- Opt(:notify, :immediate),
- # label text
- _("&Region"),
- Timezone.Region
+ timezoneterm = VBox(
+ HBox(
+ SelectionBox(
+ Id(:region),
+ Opt(:notify, :immediate),
+ # label text
+ _("&Region"),
+ Timezone.Region
+ ),
+ HSpacing(),
+ ReplacePoint(
+ Id(:tzsel),
+ # title for selection box 'timezone'
+ SelectionBox(Id(:timezone), Opt(:notify), _("Time &Zone"))
+ )
),
- HSpacing(),
- ReplacePoint(
- Id(:tzsel),
- # title for selection box 'timezone'
- SelectionBox(Id(:timezone), Opt(:notify), _("Time &Zone"))
+ HBox(
+ HSpacing(),
+ VBox(
+ Left(Label(_("Date and Time"))),
+ Left(Label(Id(:date), date))
+ ),
+ HSpacing(),
+ VBox(
+ Label(" "),
+ settime
+ ),
+ HSpacing()
)
)
end
- hwclock_term = VBox(
- CheckBox(
- Id(:hwclock),
- Opt(:hstretch, :notify),
- # check box label
- _("&Hardware Clock Set to UTC"),
- hwclock == "-u"
- ),
- textmode ? Label("") : Empty()
- )
contents = MarginBox(
term(:leftMargin, 2),
term(:rightMargin, 2),
term(:topMargin, 0),
term(:bottomMargin, 0.2),
- VBox(
- timezoneterm,
- VSpacing(0.2),
- VSquash(
- HBox(
- HWeight(1, utc_only ? Empty() : hwclock_term),
- HSpacing(1),
- # frame label
- HWeight(
- 1,
- Frame(
- Id(:time_fr),
- time_frame_label,
- MarginBox(
- term(:leftMargin, 1.2),
- term(:rightMargin, 1),
- term(:topMargin, 0),
- term(:bottomMargin, 0),
- textmode ?
- VBox(
- Label(Id(:date), Opt(:outputField, :hstretch), date),
- Right(settime)
- ) :
- HBox(Label(Id(:date), date), HStretch(), Right(settime))
- )
- )
- )
- )
- )
- )
+ timezoneterm
)
# cache for lists with timezone items
timezones_for_region = {}
@@ -763,37 +827,6 @@
"</p>\n"
)
- if !utc_only
- # help for time calculation basis:
- # hardware clock references local time or UTC?
- help_text = Ops.add(
- help_text,
- _(
- "<p>\n" +
- "Specify whether your machine is set to local time or UTC in
<b>Hardware Clock Set To</b>.\n" +
- "Most PCs that also have other operating systems installed (such
as Microsoft\n" +
- "Windows) use local time.\n" +
- "Machines that have only Linux installed are usually\n" +
- "set to Universal Time Coordinated (UTC).\n" +
- "If the hardware clock is set to UTC, your system can switch
from standard time\n" +
- "to daylight saving time and back automatically.\n" +
- "</p>\n"
- )
- )
-
- # help text: extra note about localtim
- help_text = Ops.add(
- help_text,
- _(
- "<p>\n" +
- "Note: The internal system clock as used by the Linux kernel
must\n" +
- "always be in UTC, because this is the reference for the correct
localtime\n" +
- "in user space. If you are choosing localtime for CMOS clock,\n"
+
- "check the user manual for background information about side
effects.\n" +
- "</p>"
- )
- )
- end
if !Arch.s390 && !Mode.config
@@ -823,9 +856,9 @@
Wizard.SetDesktopTitleAndIcon("timezone")
end
- hwclock_s = hwclock == "-u" ? :hwclock_utc : :hwclock_localtime
- hwclock_s_old = hwclock_s
- @hwclock_s_initial = hwclock_s
+ @hwclock_s = hwclock == "-u" ? :hwclock_utc : :hwclock_localtime
+ hwclock_s_old = @hwclock_s
+ @hwclock_s_initial = @hwclock_s
show_selected_region.call(sel, timezone)
if timezone_selector
@@ -856,7 +889,7 @@
timezone = tz
changed_time = true if timezone != timezone_old
timezone_old = timezone
- SetTimezone(hwclock_s, timezone, false, changed_time)
+ SetTimezone(@hwclock_s, timezone, false, changed_time)
end
if timezone_selector
UI.ChangeWidget(Id(:timezonemap), :CurrentItem, timezone)
@@ -870,7 +903,7 @@
timezone = tz
changed_time = true if timezone != timezone_old
timezone_old = timezone
- SetTimezone(hwclock_s, timezone, false, changed_time)
+ SetTimezone(@hwclock_s, timezone, false, changed_time)
end
end
if SetTimeDialog()
@@ -892,38 +925,6 @@
end
elsif ret == :next || ret == :timezone || ret == :timezonemap ||
ret == :hwclock
- # Get current settings.
- # UTC vs. localtime, only if needed
- #
- hwclock_s = :hwclock_utc
- if !utc_only
- hwclock_s = Convert.to_boolean(UI.QueryWidget(Id(:hwclock),
:Value)) ?
- :hwclock_utc :
- :hwclock_localtime
-
- if ret == :next && !Timezone.windows_partition &&
- hwclock_s == :hwclock_localtime
- # warning popup, in case local time is selected (bnc#732769)
- if !Popup.ContinueCancel(
- _(
- "\n" +
- "You selected local time, but only Linux seems to be
installed on your system.\n" +
- "In such case, it is strongly recommended to use UTC,
and to click Cancel.\n" +
- "\n" +
- "If you want to keep local time, you must adjust the
CMOS clock twice the year\n" +
- "because of Day Light Saving switches. If you miss to
adjust the clock, backups may fail,\n" +
- "your mail system may drop mail messages, etc.\n" +
- "\n" +
- "If you use UTC, Linux will adjust the time
automatically.\n" +
- "\n" +
- "Do you want to continue with your selection (local
time)?"
- )
- )
- ret = :not_next
- next
- end
- end
- end
if ret == :timezonemap
timezone = Convert.to_string(
UI.QueryWidget(Id(:timezonemap), :Value)
@@ -958,12 +959,12 @@
end
Builtins.y2milestone("timezone %1 ret %2", timezone, ret)
- if timezone != timezone_old || hwclock_s != hwclock_s_old ||
+ if timezone != timezone_old || @hwclock_s != hwclock_s_old ||
ret == :next
changed_time = true if timezone != timezone_old
timezone_old = timezone
- hwclock_s_old = hwclock_s
- SetTimezone(hwclock_s, timezone, ret == :next, changed_time)
+ hwclock_s_old = @hwclock_s
+ SetTimezone(@hwclock_s, timezone, ret == :next, changed_time)
end
if ret == :next
@@ -975,8 +976,8 @@
Timezone.ntp_used = @ntp_used
# See bnc#638185c5: refresh_initrd should be called if HWCLOCK is
changed (--localtime <-> --utc) and/or
# if --localtime is set and TIMEZONE will be changed.
- if hwclock_s != @hwclock_s_initial ||
- hwclock_s == :hwclock_localtime && timezone != timezone_initial
+ if @hwclock_s != @hwclock_s_initial ||
+ @hwclock_s == :hwclock_localtime && timezone !=
timezone_initial
Timezone.call_mkinitrd = true
end
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
