Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Mon Apr 24 16:19:28 CEST 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-21 23:15:34.000000000 +0200
+++ STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-24 11:11:35.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Apr 24 10:56:35 CEST 2006 - lslezak@suse.cz
+
+- select language packages in SetLocale(), handle the main locale
+ when processing additional locales (#162064)
+- 2.13.65
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.13.64.tar.bz2
New:
----
yast2-pkg-bindings-2.13.65.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.3FRgPM/_old 2006-04-24 16:18:55.000000000 +0200
+++ /var/tmp/diff_new_pack.3FRgPM/_new 2006-04-24 16:18:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.13.64)
+# spec file for package yast2-pkg-bindings (Version 2.13.65)
#
# 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-pkg-bindings
-Version: 2.13.64
+Version: 2.13.65
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.13.64.tar.bz2
+Source0: yast2-pkg-bindings-2.13.65.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
Summary: YaST2 Package Manager Access
@@ -36,7 +36,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.13.64
+%setup -n yast2-pkg-bindings-2.13.65
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,10 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Mon Apr 24 2006 - lslezak@suse.cz
+- select language packages in SetLocale(), handle the main locale
+ when processing additional locales (#162064)
+- 2.13.65
* Fri Apr 21 2006 - jsrain@suse.de
- SourceCreateBase (#160585)
- 2.13.64
++++++ yast2-pkg-bindings-2.13.64.tar.bz2 -> yast2-pkg-bindings-2.13.65.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.64/VERSION new/yast2-pkg-bindings-2.13.65/VERSION
--- old/yast2-pkg-bindings-2.13.64/VERSION 2006-04-21 23:13:20.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.65/VERSION 2006-04-24 10:59:28.000000000 +0200
@@ -1 +1 @@
-2.13.64
+2.13.65
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.64/configure new/yast2-pkg-bindings-2.13.65/configure
--- old/yast2-pkg-bindings-2.13.64/configure 2006-04-21 23:16:27.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.65/configure 2006-04-24 11:00:04.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.64.
+# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.65.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.13.64'
-PACKAGE_STRING='yast2-pkg-bindings 2.13.64'
+PACKAGE_VERSION='2.13.65'
+PACKAGE_STRING='yast2-pkg-bindings 2.13.65'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -971,7 +971,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-pkg-bindings 2.13.64 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.13.65 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1038,7 +1038,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.64:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.65:";;
esac
cat <<\_ACEOF
@@ -1184,7 +1184,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.13.64
+yast2-pkg-bindings configure 2.13.65
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1198,7 +1198,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-pkg-bindings $as_me 2.13.64, which was
+It was created by yast2-pkg-bindings $as_me 2.13.65, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1928,7 +1928,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.13.64'
+ VERSION='2.13.65'
cat >>confdefs.h <<_ACEOF
@@ -2139,7 +2139,7 @@
-VERSION="2.13.64"
+VERSION="2.13.65"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Michael Andres "
@@ -20273,7 +20273,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-pkg-bindings $as_me 2.13.64, which was
+This file was extended by yast2-pkg-bindings $as_me 2.13.65, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20336,7 +20336,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.13.64
+yast2-pkg-bindings config.status 2.13.65
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.64/configure.in new/yast2-pkg-bindings-2.13.65/configure.in
--- old/yast2-pkg-bindings-2.13.64/configure.in 2006-04-21 23:16:14.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.65/configure.in 2006-04-24 10:59:48.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.13.64, http://www.suse.de/feedback, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.65, http://www.suse.de/feedback, yast2-pkg-bindings)
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.64"
+VERSION="2.13.65"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Michael Andres "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.64/pkg-bindings.pot new/yast2-pkg-bindings-2.13.65/pkg-bindings.pot
--- old/yast2-pkg-bindings-2.13.64/pkg-bindings.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-pkg-bindings-2.13.65/pkg-bindings.pot 2006-03-27 16:52:32.000000000 +0200
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-27 16:52+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/Package.cc:1669 src/Package.cc:1729
+msgid "See /var/log/YaST2/badlist for more information."
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.64/src/PkgModuleFunctions.cc new/yast2-pkg-bindings-2.13.65/src/PkgModuleFunctions.cc
--- old/yast2-pkg-bindings-2.13.64/src/PkgModuleFunctions.cc 2006-04-12 22:48:21.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.65/src/PkgModuleFunctions.cc 2006-04-24 10:52:55.000000000 +0200
@@ -287,7 +287,16 @@
{
try
{
- zypp_ptr()->setTextLocale(zypp::Locale(locale->value()));
+ zypp::Locale loc = zypp::Locale(locale->value());
+ zypp_ptr()->setTextLocale(loc);
+
+ // add packages for the preferred locale
+ zypp::ZYpp::LocaleSet lset;
+ lset.insert(loc);
+ zypp_ptr()->setRequestedLocales(lset);
+
+ // remember the main locale
+ preferred_locale = loc;
}
catch(...)
{
@@ -344,6 +353,12 @@
i++;
}
+ // add the main locale if it's initialized
+ if (preferred_locale != zypp::Locale::noCode)
+ {
+ lset.insert(preferred_locale);
+ }
+
try
{
zypp_ptr()->setRequestedLocales(lset);
@@ -375,7 +390,11 @@
for (zypp::ZYpp::LocaleSet::const_iterator it = lset.begin();
it != lset.end(); ++it)
{
- langycplist->add (YCPString(it->code()));
+ // ignore the main locale
+ if (*it != preferred_locale)
+ {
+ langycplist->add (YCPString(it->code()));
+ }
}
}
catch(...)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.64/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.13.65/src/PkgModuleFunctions.h
--- old/yast2-pkg-bindings-2.13.64/src/PkgModuleFunctions.h 2006-04-21 22:01:50.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.65/src/PkgModuleFunctions.h 2006-04-24 10:44:58.000000000 +0200
@@ -66,6 +66,10 @@
zypp::ZYpp::Ptr zypp_pointer;
+ // remember the main locale (set by SetLocale) for SetAdditionalLocales,
+ // add the main locale to the additional ones
+ zypp::Locale preferred_locale;
+
/**
* ZYPP
*/
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...