Hello community,
here is the log from the commit of package yast2-ntp-client
checked in at Wed Feb 20 16:36:14 CET 2008.
--------
--- yast2-ntp-client/yast2-ntp-client.changes 2008-01-25 11:41:50.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-ntp-client/yast2-ntp-client.changes 2008-02-19 17:58:40.504573000 +0100
@@ -1,0 +2,10 @@
+Tue Feb 19 17:51:21 CET 2008 - kmachalkova@suse.cz
+
+- Improved NTP service start wording (now & on boot vs. manually)
+ (bnc#345340)
+- Improved NTP installation proposal layout (bnc#359209)
+- Depend on lightweight yast2-country-data instead of yast2-country
+- ntp-client_proposal made smarter (FaTE#302917)
+- 2.16.4
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-2.16.3.tar.bz2
New:
----
yast2-ntp-client-2.16.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.q11136/_old 2008-02-20 16:29:34.000000000 +0100
+++ /var/tmp/diff_new_pack.q11136/_new 2008-02-20 16:29:34.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ntp-client (Version 2.16.3)
+# spec file for package yast2-ntp-client (Version 2.16.4)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,19 +10,20 @@
# norootforbuild
+
Name: yast2-ntp-client
-Version: 2.16.3
+Version: 2.16.4
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ntp-client-2.16.3.tar.bz2
+Source0: yast2-ntp-client-2.16.4.tar.bz2
Prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
#SLPAPI.pm
# yast2/NetworkDevices -> yast2/NetworkInterfaces
Requires: yast2 >= 2.16.23
-Requires: yast2-country
+Requires: yast2-country-data
BuildArch: noarch
Summary: YaST2 - NTP Client Configuration
@@ -37,7 +38,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-ntp-client-2.16.3
+%setup -n yast2-ntp-client-2.16.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +75,13 @@
%doc %{prefix}/share/doc/packages/yast2-ntp-client
/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
%changelog
+* Tue Feb 19 2008 kmachalkova@suse.cz
+- Improved NTP service start wording (now & on boot vs. manually)
+ (bnc#345340)
+- Improved NTP installation proposal layout (bnc#359209)
+- Depend on lightweight yast2-country-data instead of yast2-country
+- ntp-client_proposal made smarter (FaTE#302917)
+- 2.16.4
* Thu Jan 24 2008 mzugec@suse.cz
- replace deprecated NetworkDevices by NetworkInterfaces (from yast2)
- 2.16.3
++++++ yast2-ntp-client-2.16.3.tar.bz2 -> yast2-ntp-client-2.16.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.16.3/src/helps.ycp new/yast2-ntp-client-2.16.4/src/helps.ycp
--- old/yast2-ntp-client-2.16.3/src/helps.ycp 2008-01-07 12:04:06.000000000 +0100
+++ new/yast2-ntp-client-2.16.4/src/helps.ycp 2008-02-19 14:35:18.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Jiri Srain
*
- * $Id: helps.ycp 43298 2008-01-07 11:04:06Z kmachalkova $
+ * $Id: helps.ycp 44639 2008-02-19 13:35:17Z kmachalkova $
*/
{
@@ -34,9 +34,9 @@
An additional dialog will inform you whether it is safe to do so.</p>"),
// help text 1/5
- "start" : _("<p><b><big>Automatically Start NTP Daemon</big></b><br>
-Select whether to start the NTP daemon when booting the system. The
-NTP daemon resolves host names when initializing. Your
+ "start" : _("<p><b><big>Start NTP Daemon</big></b><br>
+Select whether to start the NTP daemon now and on each boot of the system.
+The NTP daemon resolves host names when initializing. Your
network connection must be started before the NTP daemon starts.</p>"),
// help text 2/5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.16.3/src/ntp-client_proposal.ycp new/yast2-ntp-client-2.16.4/src/ntp-client_proposal.ycp
--- old/yast2-ntp-client-2.16.3/src/ntp-client_proposal.ycp 2007-11-20 15:33:28.000000000 +0100
+++ new/yast2-ntp-client-2.16.4/src/ntp-client_proposal.ycp 2008-02-19 17:47:09.000000000 +0100
@@ -91,11 +91,9 @@
`VSpacing (0.5),
`HBox (
`HSpacing (3),
- `MinWidth (38,
- `ComboBox (`id (`ntp_address), `opt (`editable),
+ `ComboBox (`id (`ntp_address), `opt (`editable),
// combo box label
_("NTP Server Address")
- )
),
`VBox (
`Label (""),
@@ -149,6 +147,9 @@
else if (func == "Write")
{
string ntp_server = (string) UI::QueryWidget(`id(`ntp_address), `Value);
+ boolean write_settings = param["write_settings"]:false;
+ boolean ntpdate_only = param["ntpdate_only"]:false;
+
if ( !ValidateSingleServer( ntp_server ) )
ret = `invalid_hostname;
else
@@ -156,7 +157,9 @@
string required_package = "xntp";
//In 1st stage, schedule packages for installation
- if (Stage::initial())
+ //but not in case user wants to set the time only (F#302917)
+ //(ntpdate is in inst-sys so we don't need the package)
+ if (Stage::initial() && !ntpdate_only)
{
if (Package::Available(required_package))
{
@@ -205,8 +208,23 @@
if (r == 0)
{
ret = `success;
- NtpClient::modified = true;
- AddSingleServer(ntp_server);
+
+ //User wants more than running ntpdate
+ //(I hate this, it's overly complicated, but some
+ //things are just not explainable)
+ if (!ntpdate_only)
+ {
+ NtpClient::modified = true;
+ AddSingleServer(ntp_server);
+
+ //OK, so we stored the server address
+ //In inst-sys we don't need to care further
+ //ntp-client_finish will do the job
+ //In installed system we must write the settings
+
+ if ( !Stage::initial() && write_settings)
+ NtpClient::Write();
+ }
}
else
ret = `ntpdate_failed;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.16.3/src/NtpClient.ycp new/yast2-ntp-client-2.16.4/src/NtpClient.ycp
--- old/yast2-ntp-client-2.16.3/src/NtpClient.ycp 2008-01-25 11:23:55.000000000 +0100
+++ new/yast2-ntp-client-2.16.4/src/NtpClient.ycp 2008-02-19 16:12:14.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of ntp-client, input and output functions.
* Authors: Jiri Srain
*
- * $Id: NtpClient.ycp 43891 2008-01-24 14:49:57Z mzugec $
+ * $Id: NtpClient.ycp 44648 2008-02-19 15:12:13Z kmachalkova $
*
* Representation of the configuration of ntp-client.
* Input and output routines.
@@ -17,6 +17,7 @@
import "Directory";
import "FileUtils";
+import "Language";
import "Message";
import "Mode";
import "NetworkInterfaces";
@@ -153,6 +154,7 @@
* ]
*/
global define map GetAllKnownCountries () {
+ //first point of dependence on yast2-country-data
if (!countries_already_read) {
known_countries = (map ) eval (SCR::Read (.target.ycp, Directory::datadir + "/country.ycp"));
countries_already_read = true;
@@ -161,7 +163,7 @@
//workaround bug #241054: servers in United Kingdom are in domain .uk
// domain .gb does not exist - add UK to the list of known countries
- if (haskey(known_countries, "GB")){
+ if (haskey(known_countries, "GB")){
known_countries["UK"] = known_countries["GB"]:"";
known_countries = remove(known_countries,"GB");
}
@@ -175,16 +177,9 @@
*/
global define string GetCurrentLanguageCode ( ) {
string lang = (string)SCR::Read (.sysconfig.language.RC_LANG);
- if (lang != nil)
- {
- // remove the .UTF-8 first
- list<string> l = splitstring (lang, ".");
- lang = l[0]:"";
- // remove leading language (keep country only)
- l = splitstring (lang, "_");
- lang = l[size (l) - 1]:lang;
- }
- return lang;
+
+ //second point of dependence on yast2-country-data
+ return Language::GetGivenLanguageCountry( lang );
}
/**
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.16.3/src/widgets.ycp new/yast2-ntp-client-2.16.4/src/widgets.ycp
--- old/yast2-ntp-client-2.16.3/src/widgets.ycp 2008-01-25 11:23:55.000000000 +0100
+++ new/yast2-ntp-client-2.16.4/src/widgets.ycp 2008-02-19 14:35:18.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Widgets definitions
* Authors: Jiri Srain
*
- * $Id: widgets.ycp 43891 2008-01-24 14:49:57Z mzugec $
+ * $Id: widgets.ycp 44639 2008-02-19 13:35:17Z kmachalkova $
*/
{
@@ -1186,12 +1186,12 @@
"start" : $[
"widget" : `radio_buttons,
// frame
- "label" : _("Automatically Start NTP Daemon"),
+ "label" : _("Start NTP Daemon"),
"items" : [
// radio button
- [ "never", _("N&ever") ],
+ [ "never", _("Only &Manually") ],
// radio button
- [ "boot", _("During &Boot") ],
+ [ "boot", _("Now and On &Boot") ],
],
"help" : HELPS["start"]:"",
"init" : startInit,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.16.3/VERSION new/yast2-ntp-client-2.16.4/VERSION
--- old/yast2-ntp-client-2.16.3/VERSION 2008-01-25 11:23:55.000000000 +0100
+++ new/yast2-ntp-client-2.16.4/VERSION 2008-02-19 17:56:43.000000000 +0100
@@ -1 +1 @@
-2.16.3
+2.16.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org