commit yast2-country

13 Sep 2007

Hello community,

here is the log from the commit of package yast2-country
checked in at Thu Sep 13 19:00:56 CEST 2007.

--------

--- yast2-country/yast2-country.changes	2007-09-11 21:32:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes	2007-09-13 18:30:37.514907000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 13 18:26:15 CEST 2007 - kmachalkova@suse.cz
+
+- In 'change date and time' dialog, remember whether synchronization 
+  with NTP server has been selected (#308238)
+- On running system, do not call ntp-client functions before making 
+  sure package yast2-ntp-client gets installed
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.pQ1228/_old	2007-09-13 19:00:47.000000000 +0200
+++ /var/tmp/diff_new_pack.pQ1228/_new	2007-09-13 19:00:47.000000000 +0200
@@ -12,7 +12,7 @@
 
 Name:           yast2-country
 Version:        2.15.19
-Release:        1
+Release:        4
 License:        GPL v2 or later
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -111,6 +111,11 @@
 %{prefix}/share/applications/YaST2/timezone.desktop
 
 %changelog
+* Thu Sep 13 2007 - kmachalkova@suse.cz
+- In 'change date and time' dialog, remember whether synchronization
+  with NTP server has been selected (#308238)
+- On running system, do not call ntp-client functions before making
+  sure package yast2-ntp-client gets installed
 * Tue Sep 11 2007 - jsuchome@suse.cz
 - do not call xset in text mode (#309438)
 - 2.15.19

++++++ yast2-country-2.15.19.tar.bz2 ++++++
++++ 11479 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-country-2.15.19/configure.in new/yast2-country-2.15.19/configure.in
--- old/yast2-country-2.15.19/configure.in	2006-12-11 09:59:02.000000000 +0100
+++ new/yast2-country-2.15.19/configure.in	2007-07-27 12:20:15.000000000 +0200
@@ -1,9 +1,9 @@
 dnl configure.in for yast2-country
 dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-country, 2.15.2, http://bugs.opensuse.org/, yast2-country)
+AC_INIT(yast2-country, 2.15.13, http://bugs.opensuse.org/, yast2-country)
 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.15.2"
+VERSION="2.15.13"
 RPMNAME="yast2-country"
 MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>"
 
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-country-2.15.19/language/testsuite/tests/IncompleteTranslation.ycp new/yast2-country-2.15.19/language/testsuite/tests/IncompleteTranslation.ycp
--- old/yast2-country-2.15.19/language/testsuite/tests/IncompleteTranslation.ycp	2006-09-08 11:20:22.000000000 +0200
+++ new/yast2-country-2.15.19/language/testsuite/tests/IncompleteTranslation.ycp	2007-05-18 10:56:17.000000000 +0200
@@ -1,7 +1,7 @@
 /**
  * tests for Language::IncompleteTranslation
  * Author:	jsuchome@suse.cz
- * $Id: IncompleteTranslation.ycp 31977 2006-07-25 08:02:35Z jsuchome $
+ * $Id: IncompleteTranslation.ycp 31976 2006-07-25 08:02:24Z jsuchome $
  */
 {
 
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-country-2.15.19/missing new/yast2-country-2.15.19/missing
--- old/yast2-country-2.15.19/missing	2006-12-11 09:59:08.000000000 +0100
+++ new/yast2-country-2.15.19/missing	2007-07-27 12:20:22.000000000 +0200
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 #   Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
@@ -33,6 +33,8 @@
 fi
 
 run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +46,7 @@
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +79,7 @@
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).
-case "$1" in
+case $1 in
   lex|yacc)
     # Not GNU programs, they don't have --version.
     ;;
@@ -135,7 +138,7 @@
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $1 in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -164,7 +167,7 @@
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -214,25 +217,25 @@
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
@@ -244,18 +247,18 @@
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
@@ -267,11 +270,9 @@
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
 	touch $file
     else
 	test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* \([^ ]*\) *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -317,13 +324,13 @@
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 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-country-2.15.19/timezone/src/dialogs.ycp new/yast2-country-2.15.19/timezone/src/dialogs.ycp
--- old/yast2-country-2.15.19/timezone/src/dialogs.ycp	2007-09-06 22:23:39.000000000 +0200
+++ new/yast2-country-2.15.19/timezone/src/dialogs.ycp	2007-09-13 18:25:38.000000000 +0200
@@ -11,7 +11,7 @@
  * Summary:
  *	Dialogs for timezone and time configuration.
  *
- * $Id: dialogs.ycp 40795 2007-09-06 16:22:57Z kmachalkova $
+ * $Id: dialogs.ycp 40899 2007-09-13 16:25:38Z kmachalkova $
  */
 {
   textdomain "country";
@@ -142,11 +142,25 @@
 	Popup::Error( sformat("Invalid NTP server hostname %1", server) );
     }
 
+    boolean ntp_used = false;
+
+    void CreateUI() {
+        WFM::CallFunction("ntp-client_proposal", ["CreateUI"]);
+
+        ntp_used = (boolean) WFM::CallFunction("ntp-client_proposal", ["GetUseNTP"]);
+
+        if ( UI::WidgetExists(`id(`ntp_content)) )
+        {
+            UI::ChangeWidget(`id(`rb), `CurrentButton, (ntp_used ? `ntp : `manual));
+            enable_disable_widgets(ntp_used);
+        }
+    }
+
     term cont	= `HBox (
 	`RadioButtonGroup (`id (`rb), `HCenter (`VBox (
 	    `Left (`VBox (
 		// radio button label (= how to setup time)
-		`Left (`RadioButton (`id (`manual), `opt (`notify), _("Manually"), true)),
+		`Left (`RadioButton (`id (`manual), `opt (`notify), _("Manually"))),
 		`VSpacing (0.5),
 		`HBox (
 		    `HSpacing (3),
@@ -157,15 +171,26 @@
 		    )
 		),
 	        `VSpacing (1),
-	        `ReplacePoint(`id(`rp), `Empty())
+                `Left (`VBox ( `id(`ntp_content),
+                    `Left (`RadioButton (`id (`ntp), `opt (`notify),
+                    // radio button label
+                    _("Synchronize with NTP Server"), false)),
+		   `ReplacePoint(`id(`rp), `Empty())
+		   )
+		)
 	    ))
-    ))));
+	))));
+
 
     Wizard::OpenAcceptDialog ();
     Wizard::SetContents (_("Change Date and Time"), cont, htext, true, true);
     Wizard::SetDesktopIcon("timezone");
-    WFM::CallFunction("ntp-client_proposal", ["CreateUI"]);
-    enable_disable_widgets(false);
+
+    boolean ntp_installed = (Stage::initial() || Package::Installed ("yast2-ntp-client"));
+
+    if (ntp_installed) {
+	CreateUI();
+    }
 
     if (!dt_widgets)
     {
@@ -176,8 +201,6 @@
 	});
     }
 
-    boolean ntp_installed = false;
-    boolean ntp_used = false;
 
     any ret = nil;
     repeat
@@ -192,10 +215,12 @@
 		ntp_installed	= Package::Install ("yast2-ntp-client");
 		if (!ntp_installed)
 		{
-		    ntp_used	= false;
+		    ntp_used = false;
 		    UI::ChangeWidget (`id (`manual), `Value, true);
 		    UI::ChangeWidget (`id (`ntp), `Value, false);
 		}
+		else
+		    CreateUI();
 	    }
 	    if (ntp_used )
 	    {
@@ -287,6 +312,7 @@
 	}
     }
     until( ret==`accept || ret==`cancel );
+    WFM::CallFunction("ntp-client_proposal", [ "SetUseNTP", $["ntp_used" : ntp_used] ]);
     Wizard::CloseDialog ();
     return (ret == `accept);
   };
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-country-2.15.19/timezone/src/Timezone.ycp new/yast2-country-2.15.19/timezone/src/Timezone.ycp
--- old/yast2-country-2.15.19/timezone/src/Timezone.ycp	2007-09-11 21:20:55.000000000 +0200
+++ new/yast2-country-2.15.19/timezone/src/Timezone.ycp	2007-09-12 16:51:56.000000000 +0200
@@ -5,7 +5,7 @@
  * Authors:	Klaus Kaempf <kkaempf@suse.de>
  *		Thomas Roelz <tom@suse.de>
  *
- * $Id: Timezone.ycp 39978 2007-08-06 10:46:16Z jsuchome $
+ * $Id: Timezone.ycp 40858 2007-09-11 19:32:57Z jsuchome $
  */
 
 {
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-country-2.15.19/timezone/testsuite/tests/GetDateTimeMap.ycp new/yast2-country-2.15.19/timezone/testsuite/tests/GetDateTimeMap.ycp
--- old/yast2-country-2.15.19/timezone/testsuite/tests/GetDateTimeMap.ycp	2006-09-08 11:21:28.000000000 +0200
+++ new/yast2-country-2.15.19/timezone/testsuite/tests/GetDateTimeMap.ycp	2007-05-18 10:56:17.000000000 +0200
@@ -2,7 +2,7 @@
  * test for Timezone::GetDateTimeMap
  *	- check correct parsing after changed time format (bug #62312)
  * Author: jsuchome@suse.cz
- * $Id: GetDateTimeMap.ycp 31664 2006-06-26 14:24:19Z jsuchome $
+ * $Id: GetDateTimeMap.ycp 31665 2006-06-26 14:24:27Z jsuchome $
  */
 {
     // testedfiles: Timezone.ycp
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-country-2.15.19/timezone/testsuite/tests/GetDateTime.ycp new/yast2-country-2.15.19/timezone/testsuite/tests/GetDateTime.ycp
--- old/yast2-country-2.15.19/timezone/testsuite/tests/GetDateTime.ycp	2006-09-08 11:21:28.000000000 +0200
+++ new/yast2-country-2.15.19/timezone/testsuite/tests/GetDateTime.ycp	2007-05-18 10:56:17.000000000 +0200
@@ -1,7 +1,7 @@
 /**
  * tests for Timezone::GetDateTime
  * Author: jsuchome@suse.cz
- * $Id: GetDateTime.ycp 31664 2006-06-26 14:24:19Z jsuchome $
+ * $Id: GetDateTime.ycp 31665 2006-06-26 14:24:27Z jsuchome $
  */
 {
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)