Hello community, here is the log from the commit of package yast2-libyui for openSUSE:Factory checked in at 2011-11-16 17:22:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-libyui (Old) and /work/SRC/openSUSE:Factory/.yast2-libyui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-libyui", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-libyui/yast2-libyui.changes 2011-09-23 12:53:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-libyui.new/yast2-libyui.changes 2011-11-16 17:23:43.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 16 14:06:41 CET 2011 - [email protected] + +- Fixed bnc#713343: YaST ncurses help screen is too small +- Version: 2.21.2 + +------------------------------------------------------------------- Old: ---- yast2-libyui-2.21.1.tar.bz2 New: ---- yast2-libyui-2.21.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-libyui.spec ++++++ --- /var/tmp/diff_new_pack.0R0j8J/_old 2011-11-16 17:23:45.000000000 +0100 +++ /var/tmp/diff_new_pack.0R0j8J/_new 2011-11-16 17:23:45.000000000 +0100 @@ -19,16 +19,14 @@ Name: yast2-libyui -Version: 2.21.1 -Release: 1 +Version: 2.21.2 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-libyui-2.21.1.tar.bz2 - -Prefix: /usr +Source0: yast2-libyui-%{version}.tar.bz2 Group: System/YaST -License: GPLv2+ +License: GPL-2.0+ Source1: yast2-libyui-rpmlintrc BuildRequires: gcc-c++ @@ -55,9 +53,9 @@ This package has very few dependencies. %package devel -License: GPLv2+ Requires: yast2-libyui = %version Group: Development/Libraries + Summary: YaST2 - User Interface Engine Requires: glibc-devel @@ -73,26 +71,26 @@ This package has very few dependencies. %prep -%setup -n yast2-libyui-2.21.1 +%setup -n yast2-libyui-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -118,11 +116,11 @@ %defattr(-,root,root) %{_libdir}/lib*.so %{_libdir}/lib*.la -%{prefix}/include/YaST2 +%{_prefix}/include/YaST2 %{_libdir}/pkgconfig/yast2-libyui.pc %dir %{_datadir}/cmake %dir %{_datadir}/cmake/Modules %{_datadir}/cmake/Modules/* -%doc %{prefix}/share/doc/packages/yast2-libyui +%doc %{_prefix}/share/doc/packages/yast2-libyui %changelog ++++++ yast2-libyui-2.21.1.tar.bz2 -> yast2-libyui-2.21.2.tar.bz2 ++++++ ++++ 3247 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-libyui-2.21.1/Makefile.am new/yast2-libyui-2.21.2/Makefile.am --- old/yast2-libyui-2.21.1/Makefile.am 2011-04-19 12:10:46.000000000 +0200 +++ new/yast2-libyui-2.21.2/Makefile.am 2011-11-16 14:54:33.000000000 +0100 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) 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 @@ -155,7 +154,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) 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-libyui-2.21.1/VERSION new/yast2-libyui-2.21.2/VERSION --- old/yast2-libyui-2.21.1/VERSION 2011-04-19 12:09:14.000000000 +0200 +++ new/yast2-libyui-2.21.2/VERSION 2011-11-16 14:06:52.000000000 +0100 @@ -1 +1 @@ -2.21.1 +2.21.2 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-libyui-2.21.1/config.h.in new/yast2-libyui-2.21.2/config.h.in --- old/yast2-libyui-2.21.1/config.h.in 2011-04-19 12:10:56.000000000 +0200 +++ new/yast2-libyui-2.21.2/config.h.in 2011-11-16 14:54:41.000000000 +0100 @@ -89,3 +89,6 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES + +/* Define to `unsigned int' if <sys/types.h> does not define. */ +#undef size_t 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-libyui-2.21.1/configure.in new/yast2-libyui-2.21.2/configure.in --- old/yast2-libyui-2.21.1/configure.in 2011-04-19 12:10:46.000000000 +0200 +++ new/yast2-libyui-2.21.2/configure.in 2011-11-16 14:54:33.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-libyui dnl -dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-libyui, 2.21.1, http://bugs.opensuse.org/, yast2-libyui) +AC_INIT(yast2-libyui, 2.21.2, http://bugs.opensuse.org/, yast2-libyui) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.1" +VERSION="2.21.2" RPMNAME="yast2-libyui" MAINTAINER="Thomas Goettlicher <[email protected]>" 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-libyui-2.21.1/libtool.m4 new/yast2-libyui-2.21.2/libtool.m4 --- old/yast2-libyui-2.21.1/libtool.m4 2011-04-19 12:10:52.000000000 +0200 +++ new/yast2-libyui-2.21.2/libtool.m4 2011-11-16 14:54:37.000000000 +0100 @@ -1020,7 +1020,7 @@ # to the aix ld manual. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +AC_LINK_IFELSE([AC_LANG_PROGRAM],[ lt_aix_libpath_sed=' /Import File Strings/,/^$/ { /^0/ { @@ -4825,9 +4825,18 @@ # implicitly export all symbols. save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - AC_LINK_IFELSE(int foo(void) {}, + AC_LINK_IFELSE( + [AC_LANG_SOURCE( + [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], + [C++], [[int foo (void) { return 0; }]], + [Fortran 77], [[ + subroutine foo + end]], + [Fortran], [[ + subroutine foo + end]])])], [ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' - ) + ]) LDFLAGS="$save_LDFLAGS" else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' 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-libyui-2.21.1/ltversion.m4 new/yast2-libyui-2.21.2/ltversion.m4 --- old/yast2-libyui-2.21.1/ltversion.m4 2011-04-19 12:10:52.000000000 +0200 +++ new/yast2-libyui-2.21.2/ltversion.m4 2011-11-16 14:54:37.000000000 +0100 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3017 ltversion.m4 +# serial 3018 ltversion.m4 # This file is part of GNU Libtool m4_define([LT_PACKAGE_VERSION], [2.2.6b]) -m4_define([LT_PACKAGE_REVISION], [1.3017]) +m4_define([LT_PACKAGE_REVISION], [1.3018]) AC_DEFUN([LTVERSION_VERSION], [macro_version='2.2.6b' -macro_revision='1.3017' +macro_revision='1.3018' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 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-libyui-2.21.1/src/YDialog.cc new/yast2-libyui-2.21.2/src/YDialog.cc --- old/yast2-libyui-2.21.1/src/YDialog.cc 2011-04-18 17:29:22.000000000 +0200 +++ new/yast2-libyui-2.21.2/src/YDialog.cc 2011-11-15 15:22:05.000000000 +0100 @@ -631,10 +631,23 @@ void YDialog::showText( const string & text, bool useRichText ) { + + // set help text dialog size to 80% of topmost dialogi, respectively 45x15 (default) + + unsigned int dialogWidth = 45; + unsigned int dialogHeight = 15; + + if ( ! _dialogStack.empty() ) + { + YDialog * dialog = _dialogStack.top(); + dialogWidth = (unsigned int) ( (float) dialog->preferredWidth() * 0.8 ); + dialogHeight = (unsigned int) ( (float) dialog->preferredHeight() * 0.8 ); + } + try { YDialog * dialog = YUI::widgetFactory()->createPopupDialog(); - YAlignment * minSize = YUI::widgetFactory()->createMinSize( dialog, 45, 15 ); + YAlignment * minSize = YUI::widgetFactory()->createMinSize( dialog, dialogWidth, dialogHeight ); YLayoutBox * vbox = YUI::widgetFactory()->createVBox( minSize ); YUI::widgetFactory()->createRichText( vbox, text, ! useRichText ); YButtonBox * buttonBox = YUI::widgetFactory()->createButtonBox( vbox ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
