Hello community, here is the log from the commit of package yast2-country for openSUSE:11.4 checked in at Tue Feb 22 17:38:29 CET 2011.
-------- --- old-versions/11.4/all/yast2-country/yast2-country.changes 2010-11-10 07:57:31.000000000 +0100 +++ 11.4/yast2-country/yast2-country.changes 2011-02-22 10:30:25.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Feb 22 10:27:40 CET 2011 - [email protected] + +- more time zones (bnc#673425) +- do not show time zones that conflict with others +- 2.20.6 + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- yast2-country-2.20.5.tar.bz2 New: ---- yast2-country-2.20.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.mATdAl/_old 2011-02-22 17:37:07.000000000 +0100 +++ /var/tmp/diff_new_pack.mATdAl/_new 2011-02-22 17:37:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-country (Version 2.20.5) +# spec file for package yast2-country # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,11 +19,11 @@ Name: yast2-country -Version: 2.20.5 -Release: 1 +Version: 2.20.6 +Release: 1.<RELEASE2> BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.20.5.tar.bz2 +Source0: yast2-country-2.20.6.tar.bz2 Prefix: /usr @@ -80,7 +80,7 @@ timezone) for yast2. %prep -%setup -n yast2-country-2.20.5 +%setup -n yast2-country-2.20.6 %build %{prefix}/bin/y2tool y2autoconf @@ -148,4 +148,5 @@ %dir /usr/share/YaST2/data/languages /usr/share/YaST2/data/languages/*.ycp /usr/share/YaST2/modules/Language.y* + %changelog ++++++ yast2-country-2.20.5.tar.bz2 -> yast2-country-2.20.6.tar.bz2 ++++++ ++++ 4609 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.20.5/VERSION new/yast2-country-2.20.6/VERSION --- old/yast2-country-2.20.5/VERSION 2010-11-10 07:56:51.000000000 +0100 +++ new/yast2-country-2.20.6/VERSION 2011-02-22 10:28:32.000000000 +0100 @@ -1 +1 @@ -2.20.5 +2.20.6 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.20.5/configure.in new/yast2-country-2.20.6/configure.in --- old/yast2-country-2.20.5/configure.in 2010-04-01 13:29:10.000000000 +0200 +++ new/yast2-country-2.20.6/configure.in 2011-02-22 10:29:30.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-country, 2.19.10, http://bugs.opensuse.org/, yast2-country) +AC_INIT(yast2-country, 2.20.6, http://bugs.opensuse.org/, yast2-country) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.19.10" +VERSION="2.20.6" RPMNAME="yast2-country" MAINTAINER="Jiri Suchomel <[email protected]>" 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.20.5/timezone/data/timezone_raw.ycp new/yast2-country-2.20.6/timezone/data/timezone_raw.ycp --- old/yast2-country-2.20.5/timezone/data/timezone_raw.ycp 2010-10-19 14:42:36.000000000 +0200 +++ new/yast2-country-2.20.6/timezone/data/timezone_raw.ycp 2011-02-21 09:42:01.000000000 +0100 @@ -544,7 +544,7 @@ // time zone "Asia/Kashgar" : _("Kashgar"), // CN // time zone - "Asia/Katmandu" : _("Katmandu"), + "Asia/Kathmandu" : _("Katmandu"), // time zone "Asia/Krasnoyarsk" : _("Krasnoyarsk"), // time zone @@ -815,13 +815,11 @@ // time zone "Pacific/Port_Moresby" : _("Port_Moresby"), // time zone - "Pacific/Dili" : _("Dili"), - // time zone "Pacific/Rarotonga" : _("Rarotonga"), // CK // time zone - "Pacific/Truk" : _("Chuuk"), // FM + "Pacific/Chuuk" : _("Chuuk"), // FM // time zone - "Pacific/Ponape" : _("Pohnpei"), // FM + "Pacific/Pohnpei" : _("Pohnpei"), // FM // time zone "Pacific/Kosrae" : _("Kosrae"), // FM // time zone 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.20.5/timezone/src/Timezone.ycp new/yast2-country-2.20.6/timezone/src/Timezone.ycp --- old/yast2-country-2.20.5/timezone/src/Timezone.ycp 2010-11-10 07:55:58.000000000 +0100 +++ new/yast2-country-2.20.6/timezone/src/Timezone.ycp 2011-02-21 16:24:58.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Klaus Kaempf <[email protected]> * Thomas Roelz <[email protected]> * - * $Id: Timezone.ycp 62785 2010-11-09 14:48:32Z jsuchome $ + * $Id: Timezone.ycp 62790 2010-11-10 07:10:15Z jsuchome $ */ { @@ -67,6 +67,7 @@ "Mideast/Riyadh87" : "Asia/Riyadh", "Mideast/Riyadh88" : "Asia/Riyadh", "Mideast/Riyadh89" : "Asia/Riyadh", + "Europe/Vatican" : "Europe/Rome", ]; // on init, translate these to correct ones 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.20.5/timezone/src/dialogs.ycp new/yast2-country-2.20.6/timezone/src/dialogs.ycp --- old/yast2-country-2.20.5/timezone/src/dialogs.ycp 2010-11-09 15:48:32.000000000 +0100 +++ new/yast2-country-2.20.6/timezone/src/dialogs.ycp 2011-02-21 16:25:37.000000000 +0100 @@ -386,14 +386,10 @@ if (Timezone::hwclock == "--localtime" && !Stage::initial ()) { Timezone::Set (Timezone::timezone, true); + Timezone::call_mkinitrd = true; } Timezone::SetTime( year, month, day, hour, minute, second ); - - if (Timezone::hwclock == "--localtime" && !Stage::initial ()) - { - Timezone::call_mkinitrd = true; - } } } } @@ -480,7 +476,7 @@ foreach (map region, zonemap, { foreach (string key, string name, region["entries"]:$[], { - if (key != "Europe/Vatican") + if (!haskey (yast2zonetab, key)) zones[yast2zonetab[key]:key] = name; }); }); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
