Hello community,
here is the log from the commit of package yast2-ncurses
checked in at Sun Aug 12 00:12:12 CEST 2007.
--------
--- yast2-ncurses/yast2-ncurses.changes 2007-08-10 11:39:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2007-08-10 17:45:06.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 10 17:44:45 CEST 2007 - mvidner@suse.cz
+
+- Finished integrating Feature #120292, UI as a namespace callable
+ from yast2-*-bindings.
+- 2.15.23
+
+-------------------------------------------------------------------
@@ -16,0 +24,7 @@
+Mon Aug 6 13:56:58 CEST 2007 - mvidner@suse.cz
+
+- Adapted to changes in yast2-core needed for making UI callable from
+ yast2-*-bindings.
+- 2.15.21.1
+
+-------------------------------------------------------------------
Old:
----
yast2-ncurses-2.15.22.tar.bz2
New:
----
yast2-ncurses-2.15.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.W20176/_old 2007-08-12 00:11:57.000000000 +0200
+++ /var/tmp/diff_new_pack.W20176/_new 2007-08-12 00:11:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses (Version 2.15.22)
+# spec file for package yast2-ncurses (Version 2.15.23)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-ncurses
-Version: 2.15.22
-Release: 3
+Version: 2.15.23
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-2.15.22.tar.bz2
+Source0: yast2-ncurses-2.15.23.tar.bz2
prefix: /usr
BuildRequires: dejagnu doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel
@@ -44,7 +44,7 @@
%prep
-%setup -n yast2-ncurses-2.15.22
+%setup -n yast2-ncurses-2.15.23
%build
%{prefix}/bin/y2tool y2autoconf
@@ -80,6 +80,10 @@
%doc %{prefix}/share/doc/packages/yast2-ncurses
%changelog
+* Fri Aug 10 2007 - mvidner@suse.cz
+- Finished integrating Feature #120292, UI as a namespace callable
+ from yast2-*-bindings.
+- 2.15.23
* Fri Aug 10 2007 - kmachalkova@suse.cz
- Removed redefinition of '<<' DiskUsageCounter operator, it is now
defined directly in libzypp
@@ -89,6 +93,10 @@
- Show Filter: <product summary> after filling the repository list
- by gs
- 2.15.22
+* Mon Aug 06 2007 - mvidner@suse.cz
+- Adapted to changes in yast2-core needed for making UI callable from
+ yast2-*-bindings.
+- 2.15.21.1
* Thu Jul 19 2007 - kmachalkova@suse.cz
- Make repositories list popup work (FaTE #301810 - part II) -
show repositories (and their products), show packages for selected
++++++ yast2-ncurses-2.15.22.tar.bz2 -> yast2-ncurses-2.15.23.tar.bz2 ++++++
++++ 21012 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-ncurses-2.15.22/configure.in new/yast2-ncurses-2.15.23/configure.in
--- old/yast2-ncurses-2.15.22/configure.in 2007-07-19 13:11:11.000000000 +0200
+++ new/yast2-ncurses-2.15.23/configure.in 2007-08-09 09:28:23.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ncurses
dnl
-dnl -- This file is generated by y2autoconf 2.15.1 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.5 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses, 2.15.20, http://bugs.opensuse.org/, yast2-ncurses)
+AC_INIT(yast2-ncurses, 2.15.21.1, http://bugs.opensuse.org/, yast2-ncurses)
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.15.20"
+VERSION="2.15.21.1"
RPMNAME="yast2-ncurses"
MAINTAINER="Katarina Machalkova "
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-ncurses-2.15.22/missing new/yast2-ncurses-2.15.23/missing
--- old/yast2-ncurses-2.15.22/missing 2007-07-19 13:11:27.000000000 +0200
+++ new/yast2-ncurses-2.15.23/missing 2007-08-09 09:29:20.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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-ncurses-2.15.22/src/Makefile.am new/yast2-ncurses-2.15.23/src/Makefile.am
--- old/yast2-ncurses-2.15.22/src/Makefile.am 2007-06-26 13:32:42.000000000 +0200
+++ new/yast2-ncurses-2.15.23/src/Makefile.am 2007-08-10 17:43:54.000000000 +0200
@@ -5,7 +5,6 @@
SUBDIRS = pkg
AM_CXXFLAGS = -DY2LOG=\"ui-ncurses\" -DLOCALEDIR=\"${localedir}\"
-AM_LDFLAGS = -L$(libdir)
# plugin, libtool forces 'lib' prefix
plugin_LTLIBRARIES = libpy2ncurses.la
@@ -15,14 +14,14 @@
#liby2ncurses_la_LDFLAGS = -version-info 2:0
libpy2ncurses_la_LIBADD = \
- -L$(libdir) \
- -lyui \
+ -L$(plugindir) \
+ -lpy2UI \
-lncursesw -lpanelw
#libpy2ncurses_la_LIBADD = \
# -L$(libdir) \
# -Lpkg -lpy2ncurses_pkg \
-# -lyui \
+# -lpy2UI \
# -lncursesw -lpanelw
#liby2ncurses_la_LIBADD = $(libpy2ncurses_la_LIBADD)
@@ -164,7 +163,7 @@
# Y2CCNCursesUI.cc Y2CCNCursesUI.h \
# YNCursesComponent.h
-INCLUDES = -I$(srcdir)/pkg -I$(includedir) -I$(includedir)/yui -I$(includedir)/y2util/qt
+INCLUDES = -I$(srcdir)/pkg -I$(includedir) -I$(includedir)/yui -I$(includedir)/y2util/qt ${ZYPP_CFLAGS}
lang2encoding.cc: lang2encoding.tab
./lang2encoding.tab > lang2encoding.cc
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-ncurses-2.15.22/src/pkg/Makefile.am new/yast2-ncurses-2.15.23/src/pkg/Makefile.am
--- old/yast2-ncurses-2.15.22/src/pkg/Makefile.am 2007-07-16 16:24:34.000000000 +0200
+++ new/yast2-ncurses-2.15.23/src/pkg/Makefile.am 2007-08-10 17:43:54.000000000 +0200
@@ -6,7 +6,6 @@
you_layout.ycp
AM_CXXFLAGS = -DY2LOG=\"ui-ncurses\" -DLOCALEDIR=\"${localedir}\"
-AM_LDFLAGS = -L$(libdir)
# plugin, libtool forces 'lib' prefix
# plugin_LTLIBRARIES = libpy2ncurses_pkg.la
@@ -14,7 +13,7 @@
libpy2ncurses_pkg_la_LDFLAGS = -version-info 2:0
libpy2ncurses_pkg_la_LIBADD = \
- -L$(libdir) -lyui \
+ -L$(plugindir) -lpy2UI \
${ZYPP_LIBS}
noinst_HEADERS = \
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-ncurses-2.15.22/src/pkg/pkg_layout.ycp new/yast2-ncurses-2.15.23/src/pkg/pkg_layout.ycp
--- old/yast2-ncurses-2.15.22/src/pkg/pkg_layout.ycp 2007-07-17 09:19:26.000000000 +0200
+++ new/yast2-ncurses-2.15.23/src/pkg/pkg_layout.ycp 2007-07-31 13:43:11.000000000 +0200
@@ -7,7 +7,7 @@
*
* ncurses layout for package selection
*
- * $Id: pkg_layout.ycp 39443 2007-07-16 14:30:49Z kmachalkova $
+ * $Id: pkg_layout.ycp 39833 2007-07-31 11:43:10Z mvidner $
*/
{
textdomain "packages";
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-ncurses-2.15.22/src/Y2CCNCursesUI.h new/yast2-ncurses-2.15.23/src/Y2CCNCursesUI.h
--- old/yast2-ncurses-2.15.22/src/Y2CCNCursesUI.h 2007-05-18 10:55:40.000000000 +0200
+++ new/yast2-ncurses-2.15.23/src/Y2CCNCursesUI.h 2007-08-10 17:43:54.000000000 +0200
@@ -24,6 +24,7 @@
#include "YNCursesComponent.h"
#include <iosfwd>
+#include
#include "ycp/y2log.h"
@@ -34,13 +35,13 @@
* such a component - returns a newly created component of this
* type. The Y2CCNCursesUI can create components with the name "ncursesui".
*/
-class Y2CCNcursesUI : public Y2ComponentCreator
+class Y2CCNcursesUI : public Y2CCUI
{
public:
/**
* Creates a NCursesUI component creator
*/
- Y2CCNcursesUI() : Y2ComponentCreator(Y2ComponentBroker::BUILTIN) { };
+ Y2CCNcursesUI() : Y2CCUI() { };
/**
* Returns true, since the NCursesUI component is a
@@ -59,8 +60,13 @@
{
y2milestone( "Creating %s component", name );
if (!strcmp(name, "ncurses") ) {
- Y2Component* r = new YNCursesComponent();
- return r;
+ Y2Component* ret = YUIComponent::uiComponent ();
+ if (!ret || ret->name () != name)
+ {
+ y2debug ("UI component is %s, creating %s", ret? ret->name().c_str() : "NULL", name);
+ ret = new YNCursesComponent();
+ }
+ return ret;
}
else return 0;
}
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-ncurses-2.15.22/testsuite/Makefile.am new/yast2-ncurses-2.15.23/testsuite/Makefile.am
--- old/yast2-ncurses-2.15.22/testsuite/Makefile.am 2007-05-18 10:55:40.000000000 +0200
+++ new/yast2-ncurses-2.15.23/testsuite/Makefile.am 2007-08-10 17:43:54.000000000 +0200
@@ -14,7 +14,7 @@
runcurses_SOURCES = runcurses.cc
runcurses_LDADD = ../src/libpy2ncurses.la ../src/pkg/libpy2ncurses_pkg.la \
- -lncurses -lpanel -lpthread -ly2 -lyui -lycp -lutil
+ -lncurses -lpanel -lpthread -ly2 -L$(plugindir) -lpy2UI -lycp -lutil
runcurses_LDFLAGS = -L$(libdir) \
-Xlinker --whole-archive \
@@ -26,15 +26,15 @@
NCstring_test.h NCstring_test.cc
utf8test_LDADD = ../src/libpy2ncurses.la ../src/pkg/libpy2ncurses_pkg.la \
- -lncursesw -lpanelw -lpthread -ly2 -lyui -lycp -lutil
+ -lncursesw -lpanelw -lpthread -ly2 -L$(plugindir) -lpy2UI -lycp -lutil
in_wch_SOURCES = in_wch.cc
-#in_wch_LDADD = -lncursesw -lpanelw -lpthread -ly2 -lyui -lycp -lutil
+#in_wch_LDADD = -lncursesw -lpanelw -lpthread -ly2 -lpy2UI -lycp -lutil
in_wch_LDADD = -lncursesw
y2ncurses_SOURCES = y2ncurses.cc
-y2ncurses_LDADD = -lncurses -lpanel -lpthread -ly2 -lyui -lycp \
+y2ncurses_LDADD = -lncurses -lpanel -lpthread -ly2 -L$(plugindir) -lpy2UI -lycp \
-lutil
y2ncurses_LDFLAGS = -static -L$(libdir) \
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-ncurses-2.15.22/VERSION new/yast2-ncurses-2.15.23/VERSION
--- old/yast2-ncurses-2.15.22/VERSION 2007-08-06 19:09:55.000000000 +0200
+++ new/yast2-ncurses-2.15.23/VERSION 2007-08-10 17:44:25.000000000 +0200
@@ -1 +1 @@
-2.15.22
+2.15.23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org