Hello community,
here is the log from the commit of package yast2-ntp-client
checked in at Mon Oct 30 17:53:49 CET 2006.
--------
--- yast2-ntp-client/yast2-ntp-client.changes 2006-07-18 15:08:01.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-ntp-client/yast2-ntp-client.changes 2006-10-30 09:59:38.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Oct 30 09:45:30 CET 2006 - kmachalkova@suse.cz
+
+- Improved Autoyast profile validation (ntpclient.rnc moved from
+ autoyast package (#215248)
+- Always set NTP_INITIAL_NTPDATE to AUTO if ntp.conf is modified
+ via DHCP
+- 2.14.0
+
+-------------------------------------------------------------------
+Wed Aug 2 17:15:43 CEST 2006 - locilka@suse.cz
+
+- Complex configuration renamed to Advanced configuration (#179476)
+
+-------------------------------------------------------------------
Old:
----
yast2-ntp-client-2.13.12.tar.bz2
New:
----
yast2-ntp-client-2.14.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.naPaoO/_old 2006-10-30 17:53:15.000000000 +0100
+++ /var/tmp/diff_new_pack.naPaoO/_new 2006-10-30 17:53:15.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ntp-client (Version 2.13.12)
+# spec file for package yast2-ntp-client (Version 2.14.0)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ntp-client
-Version: 2.13.12
+Version: 2.14.0
Release: 1
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ntp-client-2.13.12.tar.bz2
+Source0: yast2-ntp-client-2.14.0.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite
Requires: yast2 yast2-slp yast2-country
@@ -31,9 +31,10 @@
Authors:
--------
Jiri Srain
+ Lukas Ocilka
%prep
-%setup -n yast2-ntp-client-2.13.12
+%setup -n yast2-ntp-client-2.14.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -68,8 +69,17 @@
%{prefix}/share/applications/YaST2/ntp-client.desktop
/usr/share/YaST2/data/ntp_servers.ycp
%doc %{prefix}/share/doc/packages/yast2-ntp-client
+/usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
%changelog -n yast2-ntp-client
+* Mon Oct 30 2006 - kmachalkova@suse.cz
+- Improved Autoyast profile validation (ntpclient.rnc moved from
+ autoyast package (#215248)
+- Always set NTP_INITIAL_NTPDATE to AUTO if ntp.conf is modified
+ via DHCP
+- 2.14.0
+* Wed Aug 02 2006 - locilka@suse.cz
+- Complex configuration renamed to Advanced configuration (#179476)
* Tue Jul 18 2006 - locilka@suse.cz
- NTP Client renamed to NTP Configuration because one can also
configure an NTP Server here (#173411).
++++++ yast2-ntp-client-2.13.12.tar.bz2 -> yast2-ntp-client-2.14.0.tar.bz2 ++++++
++++ 5446 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/Makefile.am new/yast2-ntp-client-2.14.0/Makefile.am
--- old/yast2-ntp-client-2.13.12/Makefile.am 2006-07-18 15:09:35.000000000 +0200
+++ new/yast2-ntp-client-2.14.0/Makefile.am 2006-10-30 09:56:21.000000000 +0100
@@ -7,8 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
@@ -34,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -67,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/Makefile.am.common new/yast2-ntp-client-2.14.0/Makefile.am.common
--- old/yast2-ntp-client-2.13.12/Makefile.am.common 2006-07-18 15:09:35.000000000 +0200
+++ new/yast2-ntp-client-2.14.0/Makefile.am.common 2006-10-30 09:56:21.000000000 +0100
@@ -29,7 +29,19 @@
dist-hook: check-syntax
+CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi
+ @if test "$(client_DATA)"; then \
+ if $(CHECK_SYNTAX); then \
+ TO_CHECK="$(filter %.ycp,$^)"; \
+ echo "Checking syntax of $${TO_CHECK}"; \
+ if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
+ echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
+ exit 1; \
+ fi; \
+ else \
+ echo "Syntax check disabled"; \
+ fi; \
+ fi
-include .dep
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/VERSION new/yast2-ntp-client-2.14.0/VERSION
--- old/yast2-ntp-client-2.13.12/VERSION 2006-07-18 15:05:16.000000000 +0200
+++ new/yast2-ntp-client-2.14.0/VERSION 2006-10-30 09:45:22.000000000 +0100
@@ -1 +1 @@
-2.13.12
+2.14.0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/configure.in new/yast2-ntp-client-2.14.0/configure.in
--- old/yast2-ntp-client-2.13.12/configure.in 2006-07-18 15:09:35.000000000 +0200
+++ new/yast2-ntp-client-2.14.0/configure.in 2006-10-30 09:56:21.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ntp-client
dnl
-dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ntp-client, 2.13.12, http://bugs.opensuse.org/, yast2-ntp-client)
+AC_INIT(yast2-ntp-client, 2.14.0, http://bugs.opensuse.org/, yast2-ntp-client)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.12"
+VERSION="2.14.0"
RPMNAME="yast2-ntp-client"
MAINTAINER="Lukas Ocilka "
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/src/Makefile.am new/yast2-ntp-client-2.14.0/src/Makefile.am
--- old/yast2-ntp-client-2.13.12/src/Makefile.am 2006-06-26 09:08:26.000000000 +0200
+++ new/yast2-ntp-client-2.14.0/src/Makefile.am 2006-10-27 12:55:24.000000000 +0200
@@ -25,7 +25,11 @@
module_DATA = \
NtpClient.ycp
-EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA)
+rncdir= $(schemadir)/autoyast/rnc/
+rnc_DATA = \
+ ntpclient.rnc
+
+EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) $(rnc_DATA)
ntp-client:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/src/NtpClient.ycp new/yast2-ntp-client-2.14.0/src/NtpClient.ycp
--- old/yast2-ntp-client-2.13.12/src/NtpClient.ycp 2006-06-26 09:08:26.000000000 +0200
+++ new/yast2-ntp-client-2.14.0/src/NtpClient.ycp 2006-10-30 09:50:38.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Data for configuration of ntp-client, input and output functions.
* Authors: Jiri Srain
*
- * $Id: NtpClient.ycp 31104 2006-05-23 07:08:27Z locilka $
+ * $Id: NtpClient.ycp 33820 2006-10-30 08:50:35Z kmachalkova $
*
* Representation of the configuration of ntp-client.
* Input and output routines.
@@ -620,13 +620,14 @@
init = filter (any i, init, ``(i != nil));
string init_str = mergestring ((list<string>)init, " ");
+ // if DHCLIENT_MODIFY_NTP_CONF, NTPD_INITIAL = AUTO
+ if (config_dhcp) {
+ init_str = "AUTO";
// Don't remove the AUTO key, something should be present for initialization
// if there is no NTP server set explicitly
- if (size (init) == 0)
- {
+ } else if (size (init) == 0) {
string orig_init = (string)SCR::Read (.sysconfig.ntp.NTPD_INITIAL_NTPDATE);
- if (orig_init == "AUTO" || substring (orig_init, 0, 5) == "AUTO-")
- {
+ if (orig_init == "AUTO" || substring (orig_init, 0, 5) == "AUTO-") {
init_str = orig_init;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/src/dialogs.ycp new/yast2-ntp-client-2.14.0/src/dialogs.ycp
--- old/yast2-ntp-client-2.13.12/src/dialogs.ycp 2006-07-18 15:09:27.000000000 +0200
+++ new/yast2-ntp-client-2.14.0/src/dialogs.ycp 2006-10-27 12:24:34.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Srain
*
- * $Id: dialogs.ycp 31931 2006-07-18 13:10:56Z locilka $
+ * $Id: dialogs.ycp 33772 2006-10-27 10:24:31Z kmachalkova $
*/
{
@@ -158,7 +158,7 @@
), `HSpacing (1));
// dialog caption
- string caption = _("Complex NTP Configuration");
+ string caption = _("Advanced NTP Configuration");
string help = CWM::MergeHelps (w);
contents = CWM::PrepareDialog (contents, w);
Wizard::SetContentsButtons (caption, contents, help,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/src/helps.ycp new/yast2-ntp-client-2.14.0/src/helps.ycp
--- old/yast2-ntp-client-2.13.12/src/helps.ycp 2006-06-26 09:08:26.000000000 +0200
+++ new/yast2-ntp-client-2.14.0/src/helps.ycp 2006-10-27 12:24:34.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Jiri Srain
*
- * $Id: helps.ycp 28806 2006-03-10 09:58:19Z locilka $
+ * $Id: helps.ycp 33772 2006-10-27 10:24:31Z kmachalkova $
*/
{
@@ -65,9 +65,9 @@
daemon, select <b>Advanced</b>.</p>"),
// help text to a button
- "complex_button" : _("<p><b><big>Complex configuration</big></b><br>
+ "complex_button" : _("<p><b><big>Advanced configuration</big></b><br>
To configure this host to synchronize against multiple remote hosts or against
-a locally connected clock, use <b>Complex Configuration</b>."),
+a locally connected clock, use <b>Advanced Configuration</b>."),
// help text 1/4
"clock_type" : _("<p><b><big>Clock Type</big></b><br>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/src/ntp-client.desktop new/yast2-ntp-client-2.14.0/src/ntp-client.desktop
--- old/yast2-ntp-client-2.13.12/src/ntp-client.desktop 2006-07-18 15:01:23.000000000 +0200
+++ new/yast2-ntp-client-2.14.0/src/ntp-client.desktop 2006-10-27 14:03:11.000000000 +0200
@@ -12,10 +12,11 @@
X-SuSE-YaST-Argument=
X-SuSE-YaST-RootOnly=true
X-SuSE-YaST-AutoInst=all
-X-SuSE-YaST-AutoInstClonable=true
X-SuSE-YaST-Geometry=
X-SuSE-YaST-SortKey=
X-SuSE-YaST-AutoInstResource=ntp-client
+X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstSchema=ntpclient.rnc
Icon=yast-ntp-client
Exec=/sbin/yast2 ntp-client
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/src/ntpclient.rnc new/yast2-ntp-client-2.14.0/src/ntpclient.rnc
--- old/yast2-ntp-client-2.13.12/src/ntpclient.rnc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ntp-client-2.14.0/src/ntpclient.rnc 2006-10-30 09:30:29.000000000 +0100
@@ -0,0 +1,45 @@
+default namespace = "http://www.suse.com/1.0/yast2ns"
+namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
+namespace config = "http://www.suse.com/1.0/configns"
+
+ntp-client =
+ element ntp-client {
+ configure_dhcp?, peers, start_at_boot, start_in_chroot?
+ }
+create_symlink =
+ element create_symlink { BOOLEAN }
+configure_dhcp =
+ element configure_dhcp { BOOLEAN }
+initial_sync =
+ element initial_sync { BOOLEAN }
+fudge_comment = element fudge_comment { text }
+fudge_options = element fudge_options { text }
+param = element param { text }
+peer =
+ element peer {
+ (peer_address
+ | peer_comment
+ | create_symlink
+ | peer_device
+ | fudge_comment
+ | fudge_options
+ | initial_sync
+ | peer_options
+ | param
+ | peer_type)*
+ }
+peer_type = element type { text }
+peer_options = element options { text }
+peer_device = element device { text }
+peer_comment = element comment { text }
+peer_address = element address { text }
+
+peers =
+ element peers {
+ LIST,
+ peer*
+ }
+start_at_boot =
+ element start_at_boot { BOOLEAN }
+start_in_chroot =
+ element start_in_chroot { BOOLEAN }
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/src/widgets.ycp new/yast2-ntp-client-2.14.0/src/widgets.ycp
--- old/yast2-ntp-client-2.13.12/src/widgets.ycp 2006-06-26 09:08:26.000000000 +0200
+++ new/yast2-ntp-client-2.14.0/src/widgets.ycp 2006-10-27 12:24:34.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widgets definitions
* Authors: Jiri Srain
*
- * $Id: widgets.ycp 31104 2006-05-23 07:08:27Z locilka $
+ * $Id: widgets.ycp 33772 2006-10-27 10:24:31Z kmachalkova $
*/
{
@@ -231,7 +231,7 @@
}
}
- y2milestone("Switching to complex configuration...");
+ y2milestone("Switching to advanced configuration...");
return `complex;
}
ntpEnabledOrDisabled (key, event);
@@ -493,7 +493,7 @@
* @param event map event that caused storing process
*/
define void addressStore (string id, map event) ``{
- // Don't store anything in case of switching to the complex configuration
+ // Don't store anything in case of switching to the advanced configuration
if (event["ID"]:nil == `complex) return;
NtpClient::selected_record["address"] = UI::QueryWidget (`id (id), `Value);
@@ -529,7 +529,7 @@
return true;
}
// do not check the server IP/Host when changing dialog to "Select"
- // or when switching to the complex configuration
+ // or when switching to the advanced configuration
if (event["ID"]:nil == `select_local || event["ID"]:nil == `select_public || event["ID"]:nil == `complex) {
return true;
}
@@ -1105,7 +1105,7 @@
"complex_button" : $[
"widget" : `push_button,
// push button label
- "label" : _("Co&mplex Configuration"),
+ "label" : _("Ad&vanced Configuration"),
"help" : HELPS["complex_button"]:"",
"handle_events" : [ "complex_button", "never", "boot" ],
"handle" : complexButtonHandle,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ntp-client-2.13.12/testsuite/tests/Write.ycp new/yast2-ntp-client-2.14.0/testsuite/tests/Write.ycp
--- old/yast2-ntp-client-2.13.12/testsuite/tests/Write.ycp 2006-06-26 09:08:27.000000000 +0200
+++ new/yast2-ntp-client-2.14.0/testsuite/tests/Write.ycp 2006-10-30 09:50:38.000000000 +0100
@@ -11,7 +11,7 @@
* Authors:
* Jiri Srain
*
- * $Id: Write.ycp 24572 2005-08-03 13:43:17Z locilka $
+ * $Id: Write.ycp 33820 2006-10-30 08:50:35Z kmachalkova $
*
*/
@@ -80,7 +80,9 @@
$["address":"peer1", "initial_sync":false, "options":" options_peer", "type":"peer"]
],
"start_at_boot":false,
- "start_in_chroot":true,])), [READ, WRITE, EXEC], nil);
+ "start_in_chroot":true,
+ "configure_dhcp": false,])), [READ, WRITE, EXEC], nil);
+
TEST (``(NtpClient::Write ()), [READ, WRITE, EXEC], nil);
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org