Hello community, here is the log from the commit of package yast2-ncurses for openSUSE:Factory checked in at Fri May 14 00:27:44 CEST 2010. -------- --- yast2-ncurses/yast2-ncurses.changes 2010-04-29 15:02:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2010-05-12 15:09:15.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 12 14:55:56 CEST 2010 - gs@suse.de + +- Use ncurses6 library (package libncurses6) +- V 2.19.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ncurses-2.19.4.tar.bz2 New: ---- yast2-ncurses-2.19.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.poDTjf/_old 2010-05-14 00:27:17.000000000 +0200 +++ /var/tmp/diff_new_pack.poDTjf/_new 2010-05-14 00:27:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.19.4) +# spec file for package yast2-ncurses (Version 2.19.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-ncurses -Version: 2.19.4 +Version: 2.19.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.19.4.tar.bz2 +Source0: yast2-ncurses-2.19.5.tar.bz2 Prefix: /usr @@ -56,7 +56,7 @@ component for YaST2. %prep -%setup -n yast2-ncurses-2.19.4 +%setup -n yast2-ncurses-2.19.5 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-ncurses-2.19.4.tar.bz2 -> yast2-ncurses-2.19.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.4/Makefile.in new/yast2-ncurses-2.19.5/Makefile.in --- old/yast2-ncurses-2.19.4/Makefile.in 2010-04-29 15:00:31.000000000 +0200 +++ new/yast2-ncurses-2.19.5/Makefile.in 2010-05-12 14:04:53.000000000 +0200 @@ -192,6 +192,7 @@ MAINTAINER = @MAINTAINER@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NCURSES_CONFIG = @NCURSES_CONFIG@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.4/VERSION new/yast2-ncurses-2.19.5/VERSION --- old/yast2-ncurses-2.19.4/VERSION 2010-04-29 14:59:21.000000000 +0200 +++ new/yast2-ncurses-2.19.5/VERSION 2010-05-12 15:04:45.000000000 +0200 @@ -1 +1 @@ -2.19.4 +2.19.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.4/configure new/yast2-ncurses-2.19.5/configure --- old/yast2-ncurses-2.19.4/configure 2010-04-29 15:00:28.000000000 +0200 +++ new/yast2-ncurses-2.19.5/configure 2010-05-12 14:04:50.000000000 +0200 @@ -791,6 +791,7 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +NCURSES_CONFIG ALLOCA CXXCPP OTOOL64 @@ -5977,13 +5978,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5980: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5981: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5983: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5984: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5986: output\"" >&5) + (eval echo "\"\$as_me:5987: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7178,7 +7179,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7181 "configure"' > conftest.$ac_ext + echo '#line 7182 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9507,11 +9508,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9510: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9511: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9514: \$? = $ac_status" >&5 + echo "$as_me:9515: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9846,11 +9847,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9849: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9850: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9853: \$? = $ac_status" >&5 + echo "$as_me:9854: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9951,11 +9952,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9954: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9955: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9958: \$? = $ac_status" >&5 + echo "$as_me:9959: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10006,11 +10007,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10009: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10010: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10013: \$? = $ac_status" >&5 + echo "$as_me:10014: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12806,7 +12807,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12809 "configure" +#line 12810 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12902,7 +12903,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12905 "configure" +#line 12906 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14922,11 +14923,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14925: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14926: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14929: \$? = $ac_status" >&5 + echo "$as_me:14930: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15021,11 +15022,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15024: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15025: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15028: \$? = $ac_status" >&5 + echo "$as_me:15029: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15073,11 +15074,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15076: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15077: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15080: \$? = $ac_status" >&5 + echo "$as_me:15081: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16617,6 +16618,60 @@ +for ac_prog in ncursesw6-config ncursesw5-config +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $NCURSES_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_NCURSES_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG +if test -n "$NCURSES_CONFIG"; then + { $as_echo "$as_me:$LINENO: result: $NCURSES_CONFIG" >&5 +$as_echo "$NCURSES_CONFIG" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$NCURSES_CONFIG" && break +done +test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" + + +if test "$NCURSES_CONFIG" != none ; then + +CPPFLAGS="`$NCURSES_CONFIG --cflags` $CPPFLAGS" +LIBS="`$NCURSES_CONFIG --libs` $LIBS" + +fi + if test "${ac_cv_header_ncursesw_curses_h+set}" = set; then { $as_echo "$as_me:$LINENO: checking for ncursesw/curses.h" >&5 $as_echo_n "checking for ncursesw/curses.h... " >&6; } @@ -16749,12 +16804,12 @@ $as_echo "$ac_cv_header_ncursesw_curses_h" >&6; } fi -if test "x$ac_cv_header_ncursesw_curses_h" = x""yes; then - CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" -fi +#AC_CHECK_HEADER([ncursesw/curses.h], +# [CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"]) + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.4/configure.in new/yast2-ncurses-2.19.5/configure.in --- old/yast2-ncurses-2.19.4/configure.in 2010-04-29 15:00:13.000000000 +0200 +++ new/yast2-ncurses-2.19.5/configure.in 2010-05-12 14:04:36.000000000 +0200 @@ -169,8 +169,19 @@ AC_HEADER_STDC -AC_CHECK_HEADER([ncursesw/curses.h], - [CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"]) +AC_PATH_PROGS(NCURSES_CONFIG,ncursesw6-config ncursesw5-config,none) + +if test "$NCURSES_CONFIG" != none ; then + +CPPFLAGS="`$NCURSES_CONFIG --cflags` $CPPFLAGS" +LIBS="`$NCURSES_CONFIG --libs` $LIBS" + +fi + +AC_CHECK_HEADER([ncursesw/curses.h]) + +#AC_CHECK_HEADER([ncursesw/curses.h], +# [CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"]) AC_LANG_PUSH([C++]) AC_CHECK_HEADERS([YaST2/yui/YWidgetFactory.h], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.4/configure.in.in new/yast2-ncurses-2.19.5/configure.in.in --- old/yast2-ncurses-2.19.4/configure.in.in 2008-09-11 12:22:18.000000000 +0200 +++ new/yast2-ncurses-2.19.5/configure.in.in 2010-05-12 14:10:21.000000000 +0200 @@ -8,10 +8,19 @@ @YAST2-CHECKS-COMMON@ @YAST2-CHECKS-PROGRAM@ +AC_PATH_PROGS(NCURSES_CONFIG,ncursesw6-config ncursesw5-config,none) + +if test "$NCURSES_CONFIG" != none ; then + +CPPFLAGS="`$NCURSES_CONFIG --cflags` $CPPFLAGS" +LIBS="`$NCURSES_CONFIG --libs` $LIBS" + +fi + ## SUSE ncurses do not need the wide include ## but other distros do, #201705 -AC_CHECK_HEADER([ncursesw/curses.h], - [CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"]) +AC_CHECK_HEADER([ncursesw/curses.h]) + ## check for libyui includes AC_LANG_PUSH([C++]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.4/doc/Makefile.in new/yast2-ncurses-2.19.5/doc/Makefile.in --- old/yast2-ncurses-2.19.4/doc/Makefile.in 2010-04-29 15:00:30.000000000 +0200 +++ new/yast2-ncurses-2.19.5/doc/Makefile.in 2010-05-12 14:04:52.000000000 +0200 @@ -143,6 +143,7 @@ MAINTAINER = @MAINTAINER@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NCURSES_CONFIG = @NCURSES_CONFIG@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.4/doc/autodocs/Makefile.in new/yast2-ncurses-2.19.5/doc/autodocs/Makefile.in --- old/yast2-ncurses-2.19.4/doc/autodocs/Makefile.in 2010-04-29 15:00:30.000000000 +0200 +++ new/yast2-ncurses-2.19.5/doc/autodocs/Makefile.in 2010-05-12 14:04:52.000000000 +0200 @@ -132,6 +132,7 @@ MAINTAINER = @MAINTAINER@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NCURSES_CONFIG = @NCURSES_CONFIG@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.4/src/Makefile.am new/yast2-ncurses-2.19.5/src/Makefile.am --- old/yast2-ncurses-2.19.4/src/Makefile.am 2008-09-11 12:22:18.000000000 +0200 +++ new/yast2-ncurses-2.19.5/src/Makefile.am 2010-05-12 14:10:36.000000000 +0200 @@ -2,7 +2,7 @@ # Makefile.am for ncurses/src # -AM_CXXFLAGS = -DY2LOG=\"ui-ncurses\" -DLOCALEDIR=\"${localedir}\" +AM_CXXFLAGS = -DY2LOG=\"ui-ncurses\" -DLOCALEDIR=\"${localedir}\" -DNCURSES_INTERNALS=1 # plugin, libtool forces 'lib' prefix plugin_LTLIBRARIES = libpy2ncurses.la @@ -11,7 +11,8 @@ libpy2ncurses_la_LDFLAGS = -version-info 2:0 libpy2ncurses_la_LIBADD = \ - -lncursesw -lpanelw -lyui + $(LIBS) -lpanelw -lyui + #libpy2ncurses_la_LIBADD = \ # -L$(libdir) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.4/src/Makefile.in new/yast2-ncurses-2.19.5/src/Makefile.in --- old/yast2-ncurses-2.19.4/src/Makefile.in 2010-04-29 15:00:31.000000000 +0200 +++ new/yast2-ncurses-2.19.5/src/Makefile.in 2010-05-12 14:19:00.000000000 +0200 @@ -76,7 +76,8 @@ am__installdirs = "$(DESTDIR)$(plugindir)" \ "$(DESTDIR)$(pkgincludedir)" LTLIBRARIES = $(plugin_LTLIBRARIES) -libpy2ncurses_la_DEPENDENCIES = +am__DEPENDENCIES_1 = +libpy2ncurses_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am_libpy2ncurses_la_OBJECTS = position.lo YNCursesUI.lo NCtoY2Event.lo \ NCApplication.lo NCWidgetFactory.lo NCOptionalWidgetFactory.lo \ NCPackageSelectorPluginStub.lo NCtext.lo NCstring.lo \ @@ -190,6 +191,7 @@ MAINTAINER = @MAINTAINER@ MAKEINFO = @MAKEINFO@ MKDIR_P = @MKDIR_P@ +NCURSES_CONFIG = @NCURSES_CONFIG@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ @@ -298,14 +300,14 @@ ydatadir = @ydatadir@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ -AM_CXXFLAGS = -DY2LOG=\"ui-ncurses\" -DLOCALEDIR=\"${localedir}\" +AM_CXXFLAGS = -DY2LOG=\"ui-ncurses\" -DLOCALEDIR=\"${localedir}\" -DNCURSES_INTERNALS=1 # plugin, libtool forces 'lib' prefix plugin_LTLIBRARIES = libpy2ncurses.la #noinst_LTLIBRARIES = liby2ncurses.la libpy2ncurses_la_LDFLAGS = -version-info 2:0 libpy2ncurses_la_LIBADD = \ - -lncursesw -lpanelw -lyui + $(LIBS) -lpanelw -lyui pkginclude_HEADERS = \ stdutil.h \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.4/src/ncursesw.cc new/yast2-ncurses-2.19.5/src/ncursesw.cc --- old/yast2-ncurses-2.19.4/src/ncursesw.cc 2010-04-29 13:46:37.000000000 +0200 +++ new/yast2-ncurses-2.19.5/src/ncursesw.cc 2010-05-12 14:05:36.000000000 +0200 @@ -284,7 +284,7 @@ count++; } -NCursesWindow::NCursesWindow( WINDOW* &window ) +NCursesWindow::NCursesWindow( WINDOW* window ) : w(0), alloced(FALSE), par(0), subwins(0), sib(0) { if ( !b_initialized ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-2.19.4/src/ncursesw.h new/yast2-ncurses-2.19.5/src/ncursesw.h --- old/yast2-ncurses-2.19.4/src/ncursesw.h 2010-01-21 09:08:41.000000000 +0100 +++ new/yast2-ncurses-2.19.5/src/ncursesw.h 2010-05-06 11:55:55.000000000 +0200 @@ -973,7 +973,7 @@ /** * Constructor. Useful only for stdscr **/ - NCursesWindow( WINDOW* &window ); + NCursesWindow( WINDOW* window ); /** * Constructor. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org