Hello community, here is the log from the commit of package yast2-country for openSUSE:12.1 checked in at Wed Nov 16 16:37:32 CET 2011.
-------- --- openSUSE:12.1/yast2-country/yast2-country.changes 2011-10-24 13:37:41.000000000 +0200 +++ 12.1/yast2-country/yast2-country.changes 2011-11-14 12:18:19.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 14 12:15:40 CET 2011 - jsuch...@suse.cz + +- force installing recommended language packages (bnc#722739) +- use "us" keyboard layout for Dutch (bnc#728547) +- 2.21.6 + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback openSUSE:12.1/yast2-country Destination is openSUSE:12.1:Update:Test/yast2-country calling whatdependson for 12.1-i586 Old: ---- yast2-country-2.21.5.tar.bz2 New: ---- yast2-country-2.21.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.aNKoMk/_old 2011-11-16 16:34:45.000000000 +0100 +++ /var/tmp/diff_new_pack.aNKoMk/_new 2011-11-16 16:34:45.000000000 +0100 @@ -19,16 +19,15 @@ Name: yast2-country -Version: 2.21.5 +Version: 2.21.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-country-%{version}.tar.bz2 -Prefix: /usr Group: System/YaST -License: GPL v2 or later +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 @@ -84,23 +83,23 @@ %setup -n yast2-country-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -117,7 +116,7 @@ # common %files %defattr(-,root,root) -%doc %{prefix}/share/doc/packages/yast2-country +%doc %{_prefix}/share/doc/packages/yast2-country /usr/share/YaST2/modules/Console.y* /usr/share/YaST2/modules/Keyboard.y* /usr/share/YaST2/modules/Timezone.y* @@ -130,9 +129,9 @@ /usr/share/YaST2/include/timezone/ /usr/share/YaST2/scrconf/*.scr /usr/share/YaST2/schema/autoyast/rnc/*.rnc -%{prefix}/share/applications/YaST2/yast-language.desktop -%{prefix}/share/applications/YaST2/timezone.desktop -%{prefix}/share/applications/YaST2/keyboard.desktop +%{_prefix}/share/applications/YaST2/yast-language.desktop +%{_prefix}/share/applications/YaST2/timezone.desktop +%{_prefix}/share/applications/YaST2/keyboard.desktop %attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.modules.yapi.*.policy %package data ++++++ yast2-country-2.21.5.tar.bz2 -> yast2-country-2.21.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.21.5/Makefile.am new/yast2-country-2.21.6/Makefile.am --- old/yast2-country-2.21.5/Makefile.am 2011-06-23 15:50:23.000000000 +0200 +++ new/yast2-country-2.21.6/Makefile.am 2011-10-05 09:59:40.000000000 +0200 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) 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) COPYRIGHT_files_gpl = README COPYING @@ -155,7 +154,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.21.5/Makefile.in new/yast2-country-2.21.6/Makefile.in --- old/yast2-country-2.21.5/Makefile.in 2011-06-23 15:50:28.000000000 +0200 +++ new/yast2-country-2.21.6/Makefile.in 2011-10-05 09:59:44.000000000 +0200 @@ -261,7 +261,6 @@ # 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,$(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) COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ @@ -902,7 +901,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -930,21 +929,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.21.5/VERSION new/yast2-country-2.21.6/VERSION --- old/yast2-country-2.21.5/VERSION 2011-09-21 12:20:39.000000000 +0200 +++ new/yast2-country-2.21.6/VERSION 2011-11-14 12:16:56.000000000 +0100 @@ -1 +1 @@ -2.21.5 +2.21.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.21.5/configure new/yast2-country-2.21.6/configure --- old/yast2-country-2.21.5/configure 2011-06-23 15:50:26.000000000 +0200 +++ new/yast2-country-2.21.6/configure 2011-10-05 09:59:42.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-country 2.21.0. +# Generated by GNU Autoconf 2.68 for yast2-country 2.21.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-country' PACKAGE_TARNAME='yast2-country' -PACKAGE_VERSION='2.21.0' -PACKAGE_STRING='yast2-country 2.21.0' +PACKAGE_VERSION='2.21.5' +PACKAGE_STRING='yast2-country 2.21.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-country 2.21.0 to adapt to many kinds of systems. +\`configure' configures yast2-country 2.21.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-country 2.21.0:";; + short | recursive ) echo "Configuration of yast2-country 2.21.5:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-country configure 2.21.0 +yast2-country configure 2.21.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-country $as_me 2.21.0, which was +It was created by yast2-country $as_me 2.21.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-country' - VERSION='2.21.0' + VERSION='2.21.5' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.0" +VERSION="2.21.5" RPMNAME="yast2-country" MAINTAINER="Jiri Suchomel <jsuch...@suse.cz>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-country $as_me 2.21.0, which was +This file was extended by yast2-country $as_me 2.21.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-country config.status 2.21.0 +yast2-country config.status 2.21.5 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.21.5/configure.in new/yast2-country-2.21.6/configure.in --- old/yast2-country-2.21.5/configure.in 2011-06-23 15:50:23.000000000 +0200 +++ new/yast2-country-2.21.6/configure.in 2011-10-05 09:59:40.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-country dnl -dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-country, 2.21.0, http://bugs.opensuse.org/, yast2-country) +AC_INIT(yast2-country, 2.21.5, 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.21.0" +VERSION="2.21.5" RPMNAME="yast2-country" MAINTAINER="Jiri Suchomel <jsuch...@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.21.5/country.pot new/yast2-country-2.21.6/country.pot --- old/yast2-country-2.21.5/country.pot 2011-06-23 15:50:31.000000000 +0200 +++ new/yast2-country-2.21.6/country.pot 2011-10-05 09:59:47.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-23 15:50+0200\n" +"POT-Creation-Date: 2011-10-05 09:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -247,6 +247,11 @@ msgid "Simplified Chinese" msgstr "" +#. keyboard layout +#: keyboard/data/keyboard_raw.ycp:684 +msgid "Romanian" +msgstr "" + #. help text for keyboard expert screen #: keyboard/src/dialogs.ycp:32 msgid "" @@ -395,7 +400,7 @@ msgstr "" #. summary label -#: keyboard/src/keyboard.ycp:96 keyboard/src/modules/Keyboard.ycp:1439 +#: keyboard/src/keyboard.ycp:96 keyboard/src/modules/Keyboard.ycp:1445 #, ycp-format msgid "Current Keyboard Layout: %1" msgstr "" @@ -436,7 +441,7 @@ #. 2 radio-buttons follow this label. #. Such keyboard layout is used only for the time of the update, #. it is not saved to the system. -#: keyboard/src/modules/Keyboard.ycp:1366 +#: keyboard/src/modules/Keyboard.ycp:1372 msgid "" "You are currently using a keyboard layout\n" "different from the one in the system to update.\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.21.5/language/data/language_nl_NL.ycp new/yast2-country-2.21.6/language/data/language_nl_NL.ycp --- old/yast2-country-2.21.5/language/data/language_nl_NL.ycp 2010-05-27 10:24:48.000000000 +0200 +++ new/yast2-country-2.21.6/language/data/language_nl_NL.ycp 2011-11-11 11:13:52.000000000 +0100 @@ -38,6 +38,6 @@ // 2. what time zone propose for this language "timezone" : "Europe/Amsterdam", // 3. which keyboard layout propose for this language - "keyboard" : "dutch", + "keyboard" : "english-us", ]; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.21.5/language/src/modules/Language.ycp new/yast2-country-2.21.6/language/src/modules/Language.ycp --- old/yast2-country-2.21.5/language/src/modules/Language.ycp 2011-06-02 10:37:15.000000000 +0200 +++ new/yast2-country-2.21.6/language/src/modules/Language.ycp 2011-11-14 09:44:34.000000000 +0100 @@ -900,7 +900,7 @@ // no language package would be installed // // do this just once at the beginning -void ResetRecommendedPackaged() +void ResetRecommendedPackages() { if (!reset_recommended) { @@ -937,12 +937,19 @@ PackageSystem::EnsureSourceInit (); PackageSystem::EnsureTargetInit (); - ResetRecommendedPackaged(); + map<string,any> solver_flags_backup = Pkg::GetSolverFlags (); + // first, do not ignore recommended (= also language) packages + Pkg::SetSolverFlags ($[ "ignoreAlreadyRecommended" : false ]); + // ... but skip non-language recommended packages + ResetRecommendedPackages(); Pkg::SetAdditionalLocales (selected_languages); + // now, add only recommended language packages (other recommended are PkgNeutral-ized) boolean solved = Pkg::PkgSolve (true); + Pkg::SetSolverFlags (solver_flags_backup); + return solved; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.21.5/languages_db.pot new/yast2-country-2.21.6/languages_db.pot --- old/yast2-country-2.21.5/languages_db.pot 2011-06-23 15:50:31.000000000 +0200 +++ new/yast2-country-2.21.6/languages_db.pot 2011-10-05 09:59:47.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-23 15:50+0200\n" +"POT-Creation-Date: 2011-10-05 09:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.21.5/timezone_db.pot new/yast2-country-2.21.6/timezone_db.pot --- old/yast2-country-2.21.5/timezone_db.pot 2011-06-23 15:50:31.000000000 +0200 +++ new/yast2-country-2.21.6/timezone_db.pot 2011-10-05 09:59:47.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-23 15:50+0200\n" +"POT-Creation-Date: 2011-10-05 09:59+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org