Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2013-10-02 13:34:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-13 14:46:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2013-10-02 13:34:42.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Oct 1 08:58:23 CEST 2013 - jsuchome@suse.cz + +- fixed check for old value during saving /etc/adjtime (#841859) +- 3.0.2 + +------------------------------------------------------------------- Old: ---- yast2-country-3.0.1.tar.bz2 New: ---- yast2-country-3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.iyEnDi/_old 2013-10-02 13:34:44.000000000 +0200 +++ /var/tmp/diff_new_pack.iyEnDi/_new 2013-10-02 13:34:44.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-country # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,25 +17,21 @@ Name: yast2-country -Version: 3.0.1 +Version: 3.0.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-country-%{version}.tar.bz2 + +Group: System/YaST +License: GPL-2.0 #policy files for YaPI dbus interface Source1: org.opensuse.yast.modules.yapi.time.policy Source2: org.opensuse.yast.modules.yapi.language.policy -BuildRequires: perl-XML-Writer +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2 yast2-perl-bindings BuildRequires: polkit-devel -BuildRequires: update-desktop-files -BuildRequires: yast2 -BuildRequires: yast2-devtools -BuildRequires: yast2-perl-bindings -BuildRequires: yast2-testsuite -Requires: timezone -Requires: yast2-perl-bindings -Requires: yast2-trans-stats +Requires: yast2-trans-stats yast2-perl-bindings timezone # XVersion.ycp # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 @@ -58,12 +54,8 @@ Obsoletes: yast2-config-keyboard Obsoletes: yast2-config-language Obsoletes: yast2-config-timezone -Provides: yast2-db-country -Provides: yast2-db-keyboard -Provides: yast2-db-timezone -Obsoletes: yast2-db-country -Obsoletes: yast2-db-keyboard -Obsoletes: yast2-db-timezone +Provides: yast2-db-country yast2-db-keyboard yast2-db-timezone +Obsoletes: yast2-db-country yast2-db-keyboard yast2-db-timezone Provides: yast2-trans-inst-keyboard Obsoletes: yast2-trans-inst-keyboard Provides: yast2-trans-inst-language @@ -84,8 +76,6 @@ Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Country Settings (Language, Keyboard, and Timezone) -License: GPL-2.0 -Group: System/YaST %description Country specific data and configuration modules (language, keyboard, @@ -115,6 +105,7 @@ %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + # Policies mkdir -p $RPM_BUILD_ROOT/usr/share/polkit-1/actions install -m 0644 %SOURCE1 $RPM_BUILD_ROOT/usr/share/polkit-1/actions/ @@ -162,5 +153,3 @@ %dir /usr/share/YaST2/data/languages /usr/share/YaST2/data/languages/*.ycp /usr/share/YaST2/modules/Language.rb - -%changelog ++++++ yast2-country-3.0.1.tar.bz2 -> yast2-country-3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.0.1/Makefile.in new/yast2-country-3.0.2/Makefile.in --- old/yast2-country-3.0.1/Makefile.in 2013-09-13 13:37:08.000000000 +0200 +++ new/yast2-country-3.0.2/Makefile.in 2013-09-12 11:26:38.000000000 +0200 @@ -684,7 +684,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) + chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.0.1/VERSION new/yast2-country-3.0.2/VERSION --- old/yast2-country-3.0.1/VERSION 2013-09-13 13:36:48.000000000 +0200 +++ new/yast2-country-3.0.2/VERSION 2013-10-01 08:59:19.000000000 +0200 @@ -1 +1 @@ -3.0.1 +3.0.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.0.1/configure.ac new/yast2-country-3.0.2/configure.ac --- old/yast2-country-3.0.1/configure.ac 2013-09-13 13:37:02.000000000 +0200 +++ new/yast2-country-3.0.2/configure.ac 2013-09-12 11:26:35.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.ac for yast2-country dnl -dnl -- This file is generated by y2autoconf 3.0.5 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 3.0.4 - DO NOT EDIT! -- dnl (edit configure.ac.in or configure.in.in instead) AC_INIT(yast2-country, 3.0.1, http://bugs.opensuse.org/, yast2-country) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.0.1/language/src/data/languages/language_tg_TJ.ycp new/yast2-country-3.0.2/language/src/data/languages/language_tg_TJ.ycp --- old/yast2-country-3.0.1/language/src/data/languages/language_tg_TJ.ycp 2013-07-30 13:08:11.000000000 +0200 +++ new/yast2-country-3.0.2/language/src/data/languages/language_tg_TJ.ycp 2013-09-17 16:13:42.000000000 +0200 @@ -28,7 +28,7 @@ // <translated Language-to-display-UTF8-coded> ] // "tg_TJ" : [ - "тоҷикӣ", + "Тоҷикӣ", "Tadjik", ".UTF-8", "", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.0.1/timezone/src/modules/Timezone.rb new/yast2-country-3.0.2/timezone/src/modules/Timezone.rb --- old/yast2-country-3.0.1/timezone/src/modules/Timezone.rb 2013-07-30 13:08:11.000000000 +0200 +++ new/yast2-country-3.0.2/timezone/src/modules/Timezone.rb 2013-10-01 08:58:12.000000000 +0200 @@ -817,15 +817,12 @@ Builtins.y2milestone("Save Saved data for timezone: <%1>", @timezone) adjtime = ReadAdjTime() - if Builtins.size(adjtime) == 3 || adjtime == nil - new = adjtime == nil ? ["0.0 0 0.0", "0"] : adjtime - Ops.set(new, 2, @hwclock == "-u" ? "UTC" : "LOCAL") - if Ops.get(new, 2, "") != Ops.get(adjtime, 2, "") + if adjtime.size == 3 || adjtime.nil? + new = adjtime.nil? ? ["0.0 0 0.0", "0"] : adjtime.dup + new[2] = @hwclock == "-u" ? "UTC" : "LOCAL" + if new[2] != adjtime[2] SCR.Write(path(".etc.adjtime"), new) - Builtins.y2milestone( - "Saved /etc/adjtime with '%1'", - Ops.get(new, 2, "") - ) + Builtins.y2milestone("Saved /etc/adjtime with '%1'", new[2]) end end -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org