Hello community,
here is the log from the commit of package yast2-ncurses
checked in at Tue Oct 31 15:22:38 CET 2006.
--------
--- yast2-ncurses/yast2-ncurses.changes 2006-10-11 11:33:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2006-10-31 12:47:54.000000000 +0100
@@ -1,0 +2,8 @@
+Mon Oct 30 12:48:44 CET 2006 - gs@suse.de
+
+- Package Installation: Fold hidden patterns into parents (Fate #301229)
+- Online Update: show list of installable (relevant) patches
+ (bug # 168758)
+- 2.13.47
+
+-------------------------------------------------------------------
Old:
----
yast2-ncurses-2.13.46.tar.bz2
New:
----
yast2-ncurses-2.13.47.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.3evK9e/_old 2006-10-31 15:13:07.000000000 +0100
+++ /var/tmp/diff_new_pack.3evK9e/_new 2006-10-31 15:13:07.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses (Version 2.13.46)
+# spec file for package yast2-ncurses (Version 2.13.47)
#
# 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-ncurses
-Version: 2.13.46
+Version: 2.13.47
Release: 1
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-2.13.46.tar.bz2
+Source0: yast2-ncurses-2.13.47.tar.bz2
prefix: /usr
BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
BuildRequires: blocxx-devel libxcrypt-devel
@@ -41,7 +41,7 @@
%prep
-%setup -n yast2-ncurses-2.13.46
+%setup -n yast2-ncurses-2.13.47
%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,11 @@
%doc %{prefix}/share/doc/packages/yast2-ncurses
%changelog -n yast2-ncurses
+* Mon Oct 30 2006 - gs@suse.de
+- Package Installation: Fold hidden patterns into parents (Fate #301229)
+- Online Update: show list of installable (relevant) patches
+ (bug # 168758)
+- 2.13.47
* Wed Oct 11 2006 - gs@suse.de
- Online Update: Allow deletion of patches (bug #208694)
Package Installation: change status to delete if '-' is pressed,
++++++ yast2-ncurses-2.13.46.tar.bz2 -> yast2-ncurses-2.13.47.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/Makefile.am new/yast2-ncurses-2.13.47/Makefile.am
--- old/yast2-ncurses-2.13.46/Makefile.am 2006-09-14 11:35:30.000000000 +0200
+++ new/yast2-ncurses-2.13.47/Makefile.am 2006-10-29 11:02:35.000000000 +0100
@@ -7,8 +7,7 @@
#
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -20,7 +19,7 @@
# 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,$(PREFIX)/share/YaST2/data/devtools)
+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)
@@ -34,7 +33,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -67,7 +66,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in
+$(RPMNAME).pc: $(RPMNAME).pc.in config.status
./config.status --file=$@:$<
if CREATE_PKGCONFIG_NOARCH
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/Makefile.in new/yast2-ncurses-2.13.47/Makefile.in
--- old/yast2-ncurses-2.13.46/Makefile.in 2006-09-14 11:35:50.000000000 +0200
+++ new/yast2-ncurses-2.13.47/Makefile.in 2006-10-29 11:02:50.000000000 +0100
@@ -162,6 +162,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = $(shell cat $(srcdir)/VERSION)
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
ZYPP_LIBS = @ZYPP_LIBS@
@@ -236,15 +237,14 @@
ystartupdir = @ystartupdir@
#where devtools are
-PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
-Y2TOOL = $(PREFIX)/bin/y2tool
+Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS)
ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4)
HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE)
# 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,$(PREFIX)/share/YaST2/data/devtools)
+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.english
@@ -255,7 +255,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal
CLEANFILES =
MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec
@@ -773,7 +773,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in
+@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in config.status
@CREATE_PKGCONFIG_TRUE@ ./config.status --file=$@:$<
dist-hook:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/VERSION new/yast2-ncurses-2.13.47/VERSION
--- old/yast2-ncurses-2.13.46/VERSION 2006-10-11 11:33:38.000000000 +0200
+++ new/yast2-ncurses-2.13.47/VERSION 2006-10-31 09:55:54.000000000 +0100
@@ -1 +1 @@
-2.13.46
+2.13.47
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/configure new/yast2-ncurses-2.13.47/configure
--- old/yast2-ncurses-2.13.46/configure 2006-09-14 11:35:45.000000000 +0200
+++ new/yast2-ncurses-2.13.47/configure 2006-10-29 11:02:45.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-ncurses 2.13.41.
+# Generated by GNU Autoconf 2.59 for yast2-ncurses 2.13.46.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ncurses'
PACKAGE_TARNAME='yast2-ncurses'
-PACKAGE_VERSION='2.13.41'
-PACKAGE_STRING='yast2-ncurses 2.13.41'
+PACKAGE_VERSION='2.13.46'
+PACKAGE_STRING='yast2-ncurses 2.13.46'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -466,7 +466,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_F
ALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YDOXYGEN CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA PKG_CONFIG ac_pt_PKG_CONFIG ZYPP_CFLAGS ZYPP_LIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT Y2DEVTOOLS_PREFIX CREATE_PKGCONFIG_TRUE
CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YDOXYGEN CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA PKG_CONFIG ac_pt_PKG_CONFIG ZYPP_CFLAGS ZYPP_LIBS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -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-ncurses 2.13.41 to adapt to many kinds of systems.
+\`configure' configures yast2-ncurses 2.13.46 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-ncurses 2.13.41:";;
+ short | recursive ) echo "Configuration of yast2-ncurses 2.13.46:";;
esac
cat <<\_ACEOF
@@ -1184,7 +1184,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ncurses configure 2.13.41
+yast2-ncurses configure 2.13.46
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-ncurses $as_me 2.13.41, which was
+It was created by yast2-ncurses $as_me 2.13.46, 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-ncurses'
- VERSION='2.13.41'
+ VERSION='2.13.46'
cat >>confdefs.h <<_ACEOF
@@ -2139,9 +2139,9 @@
-VERSION="2.13.41"
+VERSION="2.13.46"
RPMNAME="yast2-ncurses"
-MAINTAINER="Martin Lazar "
+MAINTAINER="Katarina Machalkova "
pkgconfigdir=\${libdir}/pkgconfig
pkgconfigdatadir=\${datadir}/pkgconfig
@@ -2383,6 +2383,8 @@
{ (exit 1); exit 1; }; }
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -4873,7 +4875,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4876 "configure"' > conftest.$ac_ext
+ echo '#line 4878 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5774,7 +5776,7 @@
# Provide some information about the compiler.
-echo "$as_me:5777:" \
+echo "$as_me:5779:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6837,11 +6839,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:6840: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6842: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6844: \$? = $ac_status" >&5
+ echo "$as_me:6846: \$? = $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.
@@ -7105,11 +7107,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:7108: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7110: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7112: \$? = $ac_status" >&5
+ echo "$as_me:7114: \$? = $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.
@@ -7209,11 +7211,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:7212: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7214: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7216: \$? = $ac_status" >&5
+ echo "$as_me:7218: \$? = $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
@@ -9554,7 +9556,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11999: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12001: \$? = $ac_status" >&5
+ echo "$as_me:12003: \$? = $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.
@@ -12098,11 +12100,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:12101: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12103: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12105: \$? = $ac_status" >&5
+ echo "$as_me:12107: \$? = $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
@@ -13668,11 +13670,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:13671: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13673: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13675: \$? = $ac_status" >&5
+ echo "$as_me:13677: \$? = $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.
@@ -13772,11 +13774,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:13775: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13777: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13779: \$? = $ac_status" >&5
+ echo "$as_me:13781: \$? = $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
@@ -15975,11 +15977,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:15978: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15980: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15982: \$? = $ac_status" >&5
+ echo "$as_me:15984: \$? = $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.
@@ -16243,11 +16245,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:16246: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16248: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16250: \$? = $ac_status" >&5
+ echo "$as_me:16252: \$? = $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.
@@ -16347,11 +16349,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:16350: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16352: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16354: \$? = $ac_status" >&5
+ echo "$as_me:16356: \$? = $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
@@ -19544,6 +19546,149 @@
+if test "${ac_cv_header_ncursesw_curses_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for ncursesw/curses.h" >&5
+echo $ECHO_N "checking for ncursesw/curses.h... $ECHO_C" >&6
+if test "${ac_cv_header_ncursesw_curses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_ncursesw_curses_h" >&5
+echo "${ECHO_T}$ac_cv_header_ncursesw_curses_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking ncursesw/curses.h usability" >&5
+echo $ECHO_N "checking ncursesw/curses.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking ncursesw/curses.h presence" >&5
+echo $ECHO_N "checking ncursesw/curses.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: ncursesw/curses.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: ncursesw/curses.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: ncursesw/curses.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: ncursesw/curses.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: ncursesw/curses.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: ncursesw/curses.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: ncursesw/curses.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: ncursesw/curses.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: ncursesw/curses.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ---------------------------------------- ##
+## Report this to http://bugs.opensuse.org/ ##
+## ---------------------------------------- ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for ncursesw/curses.h" >&5
+echo $ECHO_N "checking for ncursesw/curses.h... $ECHO_C" >&6
+if test "${ac_cv_header_ncursesw_curses_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_ncursesw_curses_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_ncursesw_curses_h" >&5
+echo "${ECHO_T}$ac_cv_header_ncursesw_curses_h" >&6
+
+fi
+if test $ac_cv_header_ncursesw_curses_h = yes; then
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"
+fi
+
+
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -20160,7 +20305,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-ncurses $as_me 2.13.41, which was
+This file was extended by yast2-ncurses $as_me 2.13.46, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20223,7 +20368,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-ncurses config.status 2.13.41
+yast2-ncurses config.status 2.13.46
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -20485,6 +20630,7 @@
s,@LN_S@,$LN_S,;t t
s,@PKG_CONFIG_PATH@,$PKG_CONFIG_PATH,;t t
s,@XGETTEXT@,$XGETTEXT,;t t
+s,@Y2DEVTOOLS_PREFIX@,$Y2DEVTOOLS_PREFIX,;t t
s,@CREATE_PKGCONFIG_TRUE@,$CREATE_PKGCONFIG_TRUE,;t t
s,@CREATE_PKGCONFIG_FALSE@,$CREATE_PKGCONFIG_FALSE,;t t
s,@CREATE_PKGCONFIG_NOARCH_TRUE@,$CREATE_PKGCONFIG_NOARCH_TRUE,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/configure.in new/yast2-ncurses-2.13.47/configure.in
--- old/yast2-ncurses-2.13.46/configure.in 2006-09-14 11:35:30.000000000 +0200
+++ new/yast2-ncurses-2.13.47/configure.in 2006-10-29 11:02:35.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ncurses
dnl
-dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses, 2.13.41, http://bugs.opensuse.org/, yast2-ncurses)
+AC_INIT(yast2-ncurses, 2.13.46, http://bugs.opensuse.org/, yast2-ncurses)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,9 +17,9 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.41"
+VERSION="2.13.46"
RPMNAME="yast2-ncurses"
-MAINTAINER="Martin Lazar "
+MAINTAINER="Katarina Machalkova "
dnl pkgconfig honors lib64
pkgconfigdir=\${libdir}/pkgconfig
@@ -110,6 +110,8 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
+Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
+AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`
@@ -158,6 +160,9 @@
AC_HEADER_STDC
+AC_CHECK_HEADER([ncursesw/curses.h],
+ [CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw"])
+
PKG_CHECK_MODULES([ZYPP], [libzypp])
AC_CONFIG_FILES(Makefile src/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/doc/Makefile.in new/yast2-ncurses-2.13.47/doc/Makefile.in
--- old/yast2-ncurses-2.13.46/doc/Makefile.in 2006-09-14 11:35:49.000000000 +0200
+++ new/yast2-ncurses-2.13.47/doc/Makefile.in 2006-10-29 11:02:49.000000000 +0100
@@ -126,6 +126,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
ZYPP_LIBS = @ZYPP_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/doc/autodocs/Makefile.in new/yast2-ncurses-2.13.47/doc/autodocs/Makefile.in
--- old/yast2-ncurses-2.13.46/doc/autodocs/Makefile.in 2006-09-14 11:35:49.000000000 +0200
+++ new/yast2-ncurses-2.13.47/doc/autodocs/Makefile.in 2006-10-29 11:02:49.000000000 +0100
@@ -146,6 +146,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
ZYPP_LIBS = @ZYPP_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/src/Makefile.in new/yast2-ncurses-2.13.47/src/Makefile.in
--- old/yast2-ncurses-2.13.46/src/Makefile.in 2006-09-14 11:46:47.000000000 +0200
+++ new/yast2-ncurses-2.13.47/src/Makefile.in 2006-10-29 11:02:49.000000000 +0100
@@ -199,6 +199,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
ZYPP_LIBS = @ZYPP_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/src/NCPopupSelection.cc new/yast2-ncurses-2.13.47/src/NCPopupSelection.cc
--- old/yast2-ncurses-2.13.46/src/NCPopupSelection.cc 2006-10-08 13:52:12.000000000 +0200
+++ new/yast2-ncurses-2.13.47/src/NCPopupSelection.cc 2006-10-29 12:21:20.000000000 +0100
@@ -25,6 +25,7 @@
#include "PkgNames.h"
#include "NCPkgTable.h"
#include "ObjectStatStrategy.h"
+#include
#include "YQZypp.h"
@@ -159,7 +160,8 @@
packages = selPtr->install_packages ();
else if (patPtr)
{
- packages = patPtr->install_packages ();
+ zypp::ui::PatternContents patternContents( patPtr );
+ packages = patternContents.install_packages();
}
packager->showSelPackages( getCurrentLine(), packages );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/src/PackageSelector.cc new/yast2-ncurses-2.13.47/src/PackageSelector.cc
--- old/yast2-ncurses-2.13.46/src/PackageSelector.cc 2006-10-11 10:44:32.000000000 +0200
+++ new/yast2-ncurses-2.13.47/src/PackageSelector.cc 2006-10-31 12:39:08.000000000 +0100
@@ -748,7 +748,7 @@
if ( filter == "installable" )
{
// show common label "Online Update Patches"
- static_cast(filterLabel)->setLabel( YCPString(PkgNames::Patches()) );
+ static_cast(filterLabel)->setLabel( YCPString(PkgNames::YOUPatches()) );
}
else if ( filter == "installed" )
{
@@ -1136,6 +1136,7 @@
{
NCPkgTable * packageList = getPackageList();
+ bool displayPatch = false;
if ( !packageList || !patchPtr
|| !selectable )
@@ -1144,27 +1145,71 @@
return false;
}
- if ( filter == "all"
- || ( filter == "installed" && selectable->status() == S_KeepInstalled )
- // FIXME Is filter installable correct? There was a method installable() before. Condition was:
- // ( patchPtr->installable() && patchPtr->getSelectable()->status() != PMSelectable::S_KeepInstalled )
- || ( filter == "installable" && ( selectable->status() != S_KeepInstalled ) )
- || ( filter == "new" && ( selectable->status() == S_Install ||
- selectable->status() == S_NoInst ) )
- || ( filter == "security" && patchPtr->category() == "security" )
- || ( filter == "recommended" && patchPtr->category() == "recommended" )
- || ( filter == "optional" && patchPtr->category() == "optional" )
- || ( filter == "YaST2" && patchPtr->category() == "yast" )
+ if ( filter == "all" )
+ {
+ displayPatch = true;
+ }
+ else if ( filter == "installed" )
+ {
+ if ( selectable->hasInstalledObj() )
+ displayPatch = true;
+ }
+ else if ( filter == "installable" )
+ {
+ if ( selectable->hasInstalledObj() ) // installed?
+ {
+ // display only if broken
+ if ( selectable->installedPoolItem().status().isIncomplete() )
+ {
+ displayPatch = true;
+ NCMIL << "Installed patch is broken: " << patchPtr->name().c_str() << " - "
+ << patchPtr->summary().c_str() << endl;
+ }
+ }
+ else // not installed - display only if needed
+ {
+ if ( selectable->candidatePoolItem().status().isNeeded() )
+ {
+ displayPatch = true;
+ }
+ else
+ {
+ NCMIL << "Patch not needed: " << patchPtr->name().c_str() << " - "
+ << patchPtr->summary().c_str() << endl;
+ }
+ }
+ }
+ else if ( filter == "new" )
+ {
+ if ( !selectable->hasInstalledObj() )
+ displayPatch = true;
+ }
+ else if ( filter == "security" )
+ {
+ if ( patchPtr->category() == "security" )
+ displayPatch = true;
+ }
- )
+ else if ( filter == "recommended" )
{
- packageList->createPatchEntry( patchPtr, selectable );
- return true;
+ if ( patchPtr->category() == "recommended" )
+ displayPatch = true;
}
- else
+ else if ( filter == "optional" )
{
- return false;
+ if ( patchPtr->category() == "optional" )
+ displayPatch = true;
+ }
+ else if ( filter == "YaST2" )
+ {
+ if ( patchPtr->category() == "yast" )
+ displayPatch = true;
}
+
+ if ( displayPatch )
+ packageList->createPatchEntry( patchPtr, selectable );
+
+ return displayPatch;
}
@@ -2084,6 +2129,10 @@
// the patch size is not available
// descr += PkgNames::Size();
// descr += patchPtr->size().asString( 8 );
+ descr += "<b>";
+ descr += PkgNames::PatchKind();
+ descr += ": </b>";
+ descr += patchPtr->category();
descr += "<br>";
// get and format the patch description
zypp::Text value = patchPtr->description();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.13.46/testsuite/Makefile.in new/yast2-ncurses-2.13.47/testsuite/Makefile.in
--- old/yast2-ncurses-2.13.46/testsuite/Makefile.in 2006-09-14 11:35:50.000000000 +0200
+++ new/yast2-ncurses-2.13.47/testsuite/Makefile.in 2006-10-29 11:02:50.000000000 +0100
@@ -164,6 +164,7 @@
STYLESHEET_YDOC = @STYLESHEET_YDOC@
VERSION = @VERSION@
XGETTEXT = @XGETTEXT@
+Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@
YDOXYGEN = @YDOXYGEN@
ZYPP_CFLAGS = @ZYPP_CFLAGS@
ZYPP_LIBS = @ZYPP_LIBS@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org