Hello community,
here is the log from the commit of package yast2-core
checked in at Mon Oct 2 11:46:26 CEST 2006.
--------
--- yast2-core/yast2-core.changes 2006-09-25 18:32:12.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2006-10-02 09:04:34.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Oct 1 15:29:24 CEST 2006 - mvidner@suse.cz
+
+- Adapted for upcoming blocxx 2.x changes (by Michael Calmer).
+- 2.14.2
+
+-------------------------------------------------------------------
Old:
----
yast2-core-2.14.1.tar.bz2
New:
----
yast2-core-2.14.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.nrabcg/_old 2006-10-02 11:46:04.000000000 +0200
+++ /var/tmp/diff_new_pack.nrabcg/_new 2006-10-02 11:46:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-core (Version 2.14.1)
+# spec file for package yast2-core (Version 2.14.2)
#
# 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-core
-Version: 2.14.1
+Version: 2.14.2
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-core-2.14.1.tar.bz2
+Source0: yast2-core-2.14.2.tar.bz2
prefix: /usr
# obviously
BuildRequires: gcc-c++
@@ -114,7 +114,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-core-2.14.1
+%setup -n yast2-core-2.14.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -186,6 +186,9 @@
/usr/share/YaST2/data/devtools/bin/generateYCPWrappers
%changelog -n yast2-core
+* Sun Oct 01 2006 - mvidner@suse.cz
+- Adapted for upcoming blocxx 2.x changes (by Michael Calmer).
+- 2.14.2
* Mon Sep 25 2006 - mvidner@suse.cz
- Removed unneeded BuildRequires.
- Call xsltproc with --nonet, via $(XSLTPROC_FLAGS).
++++++ yast2-core-2.14.1.tar.bz2 -> yast2-core-2.14.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.14.1/VERSION new/yast2-core-2.14.2/VERSION
--- old/yast2-core-2.14.1/VERSION 2006-09-25 16:00:30.000000000 +0200
+++ new/yast2-core-2.14.2/VERSION 2006-10-02 09:04:16.000000000 +0200
@@ -1 +1 @@
-2.14.1
+2.14.2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.14.1/configure new/yast2-core-2.14.2/configure
--- old/yast2-core-2.14.1/configure 2006-09-25 18:13:31.000000000 +0200
+++ new/yast2-core-2.14.2/configure 2006-10-02 09:06:16.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-core 2.14.1.
+# Generated by GNU Autoconf 2.59 for yast2-core 2.14.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-core'
PACKAGE_TARNAME='yast2-core'
-PACKAGE_VERSION='2.14.1'
-PACKAGE_STRING='yast2-core 2.14.1'
+PACKAGE_VERSION='2.14.2'
+PACKAGE_STRING='yast2-core 2.14.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
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-core 2.14.1 to adapt to many kinds of systems.
+\`configure' configures yast2-core 2.14.2 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-core 2.14.1:";;
+ short | recursive ) echo "Configuration of yast2-core 2.14.2:";;
esac
cat <<\_ACEOF
@@ -1186,7 +1186,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-core configure 2.14.1
+yast2-core configure 2.14.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1200,7 +1200,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-core $as_me 2.14.1, which was
+It was created by yast2-core $as_me 2.14.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1930,7 +1930,7 @@
# Define the identity of the package.
PACKAGE='yast2-core'
- VERSION='2.14.1'
+ VERSION='2.14.2'
cat >>confdefs.h <<_ACEOF
@@ -2141,7 +2141,7 @@
-VERSION="2.14.1"
+VERSION="2.14.2"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner "
@@ -22685,7 +22685,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-core $as_me 2.14.1, which was
+This file was extended by yast2-core $as_me 2.14.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22748,7 +22748,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-core config.status 2.14.1
+yast2-core config.status 2.14.2
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-core-2.14.1/configure.in new/yast2-core-2.14.2/configure.in
--- old/yast2-core-2.14.1/configure.in 2006-09-25 18:12:58.000000000 +0200
+++ new/yast2-core-2.14.2/configure.in 2006-10-02 09:05:44.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.24 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-core, 2.14.1, http://bugs.opensuse.org/, yast2-core)
+AC_INIT(yast2-core, 2.14.2, http://bugs.opensuse.org/, yast2-core)
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.14.1"
+VERSION="2.14.2"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.14.1/liby2/src/genericfrontend.cc new/yast2-core-2.14.2/liby2/src/genericfrontend.cc
--- old/yast2-core-2.14.1/liby2/src/genericfrontend.cc 2006-09-19 13:24:03.000000000 +0200
+++ new/yast2-core-2.14.2/liby2/src/genericfrontend.cc 2006-10-01 15:22:09.000000000 +0200
@@ -60,22 +60,42 @@
}
+#include
#include
#include
+#if BLOCXX_LIBRARY_VERSION >= 5
+#include
+#else
#include
+#endif
/**
* The YaST logger for LiMaL framework. It's just a wrapper around
* the standard YaST logging mechanism.
*/
+#if BLOCXX_LIBRARY_VERSION >= 5
+class YaSTLogger : public blocxx::LogAppender
+#else
class YaSTLogger : public blocxx::Logger
+#endif
{
public:
+ virtual ~YaSTLogger() {};
+
/**
* Constructor. YaST will try to log every message level,
* because we filter on our own.
*/
+#if BLOCXX_LIBRARY_VERSION >= 5
+ YaSTLogger() : blocxx::LogAppender(
+ blocxx::LogAppender::ALL_COMPONENTS,
+ blocxx::LogAppender::ALL_CATEGORIES,
+ blocxx::LogAppender::STR_TTCC_MESSAGE_FORMAT
+ )
+ {}
+#else
YaSTLogger() : blocxx::Logger ("YaST",blocxx::E_ALL_LEVEL) {}
+#endif
/**
* The logging message processing. The method converts the
@@ -85,13 +105,25 @@
*
* @param m the message to be logged
*/
+#if BLOCXX_LIBRARY_VERSION >= 5
+ virtual void doProcessLogMessage(const blocxx::String & f,
+ const blocxx::LogMessage& m) const
+ {
+ (void)f;
+#else
virtual void doProcessLogMessage(const blocxx::LogMessage& m) const
{
+#endif
loglevel_t level = LOG_DEBUG;
if (m.category == blocxx::Logger::STR_FATAL_CATEGORY
|| m.category == blocxx::Logger::STR_ERROR_CATEGORY)
{
level = LOG_ERROR;
+#if BLOCXX_LIBRARY_VERSION >= 5
+ } else if (m.category == blocxx::Logger::STR_WARNING_CATEGORY)
+ {
+ level = LOG_WARNING;
+#endif
} else if (m.category == blocxx::Logger::STR_INFO_CATEGORY)
{
level = LOG_MILESTONE;
@@ -100,7 +132,7 @@
y2_logger(level,m.component.c_str ()
,m.filename,m.fileline,m.methodname,m.message.c_str ());
}
-
+#if BLOCXX_LIBRARY_VERSION <= 4
/**
* Clone this logger - create a new instance as a copy
* of this one and return a reference to the instance.
@@ -109,11 +141,27 @@
{
return blocxx::LoggerRef(new YaSTLogger(*this));
}
+#endif
};
+// YaSTLogger redirection factory for BloCxx/LiMaL
+struct logger_initializer
+{
+ logger_initializer()
+ {
+#if BLOCXX_LIBRARY_VERSION >= 5
+ blocxx::LogAppender::setDefaultLogAppender(
+ blocxx::LogAppenderRef(new YaSTLogger())
+ );
+#else
+ blocxx::Logger::setDefaultLogger(
+ blocxx::LoggerRef(new YaSTLogger())
+ );
+#endif
+ }
+};
+static logger_initializer initialize_logger;
-// create a blocxx::LoggerRef used by YaST
-blocxx::LoggerRef logger(new YaSTLogger());
int
main (int argc, char **argv)
@@ -152,10 +200,6 @@
exit(5);
}
- // register the LiMaL logger
- blocxx::Logger::setDefaultLogger(logger);
-
-
// Scan all options for -l/--logfile. They must be honored BEFORE
// the logger is used the first time.
for (int arg = 1; arg < argc; arg++)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org