January 2008 - openSUSE Commits - openSUSE Mailing Lists

commit anjuta
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package anjuta checked in at Fri Feb 1 00:15:12 CET 2008. -------- --- GNOME/anjuta/anjuta.changes 2007-11-01 18:23:00.000000000 +0100 +++ anjuta/anjuta.changes 2008-01-31 13:44:13.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 31 13:44:09 CET 2008 - sbrabec(a)suse.cz + +- Devhelp documentation moved to the separate package (bnc#248813). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ anjuta.spec ++++++ --- /var/tmp/diff_new_pack.W23270/_old 2008-02-01 00:13:42.000000000 +0100 +++ /var/tmp/diff_new_pack.W23270/_new 2008-02-01 00:13:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package anjuta (Version 2.2.2) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -20,7 +20,7 @@ Requires: autogen Requires: automake autoconf libtool gettext alsa alsa-devel audiofile devhelp esound esound-devel gconf2 gconf2-devel gconf2-doc gnome-terminal gnome-vfs2 gnome-vfs2-devel gnome-vfs2-doc libart_lgpl libart_lgpl-devel libbonobo libbonobo-devel libbonobo-doc libbonoboui libbonoboui-devel libbonoboui-doc libglade2 libglade2-devel libglade2-doc libgnome libgnome-devel libgnome-doc libgnomecanvas libgnomecanvas-devel libgnomecanvas-doc libgnomeui libgnomeui-devel libgnomeui-doc libwnck libwnck-devel libxml2 libxml2-devel openssl openssl-devel orbit2 orbit2-devel popt popt-devel libgnomeprint libgnomeprint-devel libgnomeprint-doc libgnomeprintui libgnomeprintui-devel libgnomeprintui-doc yelp gnome-doc-utils Version: 2.2.2 -Release: 18 +Release: 60 Requires: %{name}-lang = %{version} Summary: GNOME IDE for C and C++ Source: anjuta-%{version}.tar.bz2 @@ -80,6 +80,30 @@ Luca Bellonda <lbell(a)tsc4.com> Biswapesh Chattopadhyay <biswapesh_chatterjee(a)tcscal.co.in> +%package doc +Summary: GNOME IDE for C and C++ +Group: Development/Tools/IDE +Requires: %{name} = %{version} + +%description doc +Anjuta is a versatile integrated development environment (IDE) for C +and C++. It has been written for GTK and GNOME and features a number of +advanced programming facilities. It is basically a GUI interface for +the collection of command line programming utilities and tools +available for the GNU system. These are usually run via a text console +and can be unfriendly to use. + + + +Authors: +-------- + Naba kumar <naba(a)gnome.org> + St�phane D�murget <demurgets(a)free.fr> + Andy Piper <andy.piper(a)freeuk.com> + Hector Rivera Falu <misha(a)phreaker.net> + Luca Bellonda <lbell(a)tsc4.com> + Biswapesh Chattopadhyay <biswapesh_chatterjee(a)tcscal.co.in> + %lang_package %prep %setup -q @@ -121,6 +145,8 @@ mv $RPM_BUILD_ROOT/%{_datadir}/anjuta/scripts/anjuta-tags $RPM_BUILD_ROOT/%{_bindir} %suse_update_desktop_file -C "" -D anjuta/anjuta-manual.xml -G "Integrated Development Environment" anjuta Development IDE GNOME %find_lang anjuta +%find_lang anjuta-faqs anjuta.lang +%find_lang anjuta-manual anjuta.lang %find_gconf_schemas %fdupes $RPM_BUILD_ROOT @@ -161,21 +187,6 @@ %dir %{_datadir}/omf/anjuta-manual %{_datadir}/omf/anjuta-manual/*.omf %doc %{_mandir}/man?/*.* -%dir %{_datadir}/gnome/help/anjuta-faqs -%dir %{_datadir}/gnome/help/anjuta-faqs/C -%{_datadir}/gnome/help/anjuta-faqs/C/*.xml -%dir %{_datadir}/gnome/help/anjuta-manual -%dir %{_datadir}/gnome/help/anjuta-manual/C/ -%{_datadir}/gnome/help/anjuta-manual/C/*.xml -%dir %{_datadir}/gnome/help/anjuta-manual/C/figures -%{_datadir}/gnome/help/anjuta-manual/C/figures/*.png -%dir %{_datadir}/gtk-doc/html/libanjuta -%{_datadir}/gtk-doc/html/libanjuta/*.html -%{_datadir}/gtk-doc/html/libanjuta/*.sgml -%{_datadir}/gtk-doc/html/libanjuta/*.png -%{_datadir}/gtk-doc/html/libanjuta/*.devhelp -%{_datadir}/gtk-doc/html/libanjuta/*.devhelp2 -%{_datadir}/gtk-doc/html/libanjuta/*.css %files devel %defattr(-, root, root) @@ -188,22 +199,29 @@ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc +%files doc +%defattr(-, root, root) +%{_datadir}/gtk-doc/html/libanjuta + %files lang -f %name.lang + %changelog -* Thu Nov 01 2007 - sbrabec(a)suse.cz +* Thu Jan 31 2008 sbrabec(a)suse.cz +- Devhelp documentation moved to the separate package (bnc#248813). +* Thu Nov 01 2007 sbrabec(a)suse.cz - Build with gtksourceview18. -* Fri Oct 26 2007 - sbrabec(a)suse.cz +* Fri Oct 26 2007 sbrabec(a)suse.cz - Require autogen (#336176). - Fixed shared libbfd detection. -* Wed Oct 24 2007 - sbrabec(a)suse.cz +* Wed Oct 24 2007 sbrabec(a)suse.cz - Build all optional plugins except GtkSourceView: subversion, glade, class inheritance, performance profiler, Valgrind. -* Tue Oct 23 2007 - maw(a)suse.de +* Wed Oct 24 2007 maw(a)suse.de - Update to version 2.2.2: + Bugs (bugzilla.gnome.org) fixed: #477976, #427104, #479020, [#478238], #456465, #466031, #343522, #487112, #486597, #482067, [#477976], #427104, #487854, #474811, #488061, and #488928. -* Wed Oct 17 2007 - maw(a)suse.de +* Wed Oct 17 2007 maw(a)suse.de - Add gdl-devel and libxslt-devel to the list of build requirements - Remove configure.patch - Don't attempt to install files that don't exist @@ -211,9 +229,9 @@ - Add abuild.patch - Add no-bins-in-usrshare.patch - Minor .spec cleanups. -* Thu Oct 11 2007 - sbrabec(a)suse.cz +* Thu Oct 11 2007 sbrabec(a)suse.cz - Removed bogus dependency on mDNSResponder. -* Mon Oct 08 2007 - mauro(a)suse.de +* Mon Oct 08 2007 mauro(a)suse.de - Update to version 2.2.1: * Fixed lots of memory leaks (thanks valgrind) * Fixed crasher on shutdown @@ -229,140 +247,140 @@ * Fixed bug #450217: Refreshing tree brings to random crashes * Fixed bug 453931 - crash in Anjuta IDE: Trying some c++ exampled * Fixed bug 457093 - crash in Anjuta IDE: just typed in some text -* Fri Aug 10 2007 - coolo(a)suse.de +* Fri Aug 10 2007 coolo(a)suse.de - put the Version before the use of %%version -* Mon Aug 06 2007 - maw(a)suse.de +* Mon Aug 06 2007 maw(a)suse.de - Split out a -lang subpackage - Use %%fupes. -* Mon Jun 18 2007 - maw(a)suse.de +* Mon Jun 18 2007 maw(a)suse.de - Add abuild.patch (#241836). -* Mon Apr 23 2007 - pgajdos(a)suse.cz +* Mon Apr 23 2007 pgajdos(a)suse.cz - fixed new gcc warnings - literal-comparsion.patch -* Wed Apr 18 2007 - pgajdos(a)suse.cz +* Wed Apr 18 2007 pgajdos(a)suse.cz - fixed 'array subscript is above array bounds' [#248868] - array-index.patch -* Thu Jan 04 2007 - sbrabec(a)suse.cz +* Thu Jan 04 2007 sbrabec(a)suse.cz - Prefix changed to /usr. - Spec file cleanup. -* Sun Oct 15 2006 - schwab(a)suse.de +* Mon Oct 16 2006 schwab(a)suse.de - Make sure config.rpath is present. -* Fri Feb 24 2006 - sbrabec(a)suse.cz +* Fri Feb 24 2006 sbrabec(a)suse.cz - Improved Categories. -* Fri Feb 17 2006 - sreeves(a)suse.de +* Fri Feb 17 2006 sreeves(a)suse.de - Update .desktop file (Name, GenericName, Comment, DocPath) -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Wed Jan 18 2006 - sbrabec(a)suse.cz +* Wed Jan 18 2006 sbrabec(a)suse.cz - Updated to version 1.2.4a. -* Wed Nov 02 2005 - dmueller(a)suse.de +* Wed Nov 02 2005 dmueller(a)suse.de - don't build as root -* Wed Oct 26 2005 - sbrabec(a)suse.cz +* Wed Oct 26 2005 sbrabec(a)suse.cz - Updated to version 1.2.4 (#118228). -* Tue Aug 02 2005 - ro(a)suse.de +* Tue Aug 02 2005 ro(a)suse.de - intltoolize with force -* Mon Jun 20 2005 - sbrabec(a)suse.cz +* Mon Jun 20 2005 sbrabec(a)suse.cz - Removed mkinstalldirs patch - fixed upstream (#56985). -* Mon May 16 2005 - sbrabec(a)suse.cz +* Mon May 16 2005 sbrabec(a)suse.cz - Updated to version 1.2.3. -* Wed Apr 27 2005 - meissner(a)suse.de +* Wed Apr 27 2005 meissner(a)suse.de - fixed buffer overflow and one aliasing issue. -* Tue Apr 05 2005 - sbrabec(a)suse.cz +* Tue Apr 05 2005 sbrabec(a)suse.cz - Do not require linc. -* Sun Nov 07 2004 - ro(a)suse.de +* Mon Nov 08 2004 ro(a)suse.de - make it build with new intltool -* Tue Oct 26 2004 - ro(a)suse.de +* Tue Oct 26 2004 ro(a)suse.de - locale rename: no -> nb -* Tue Sep 07 2004 - sbrabec(a)suse.cz +* Tue Sep 07 2004 sbrabec(a)suse.cz - Generated shared mime info. -* Mon Jul 12 2004 - sbrabec(a)suse.cz +* Mon Jul 12 2004 sbrabec(a)suse.cz - Fixed default applications for GNOME2 (bug #42852). http://sourceforge.net/tracker/index.php?func=detail&aid=987912&group_id=14… - Added gnome-terminal, yelp and devhelp to Requires. - Added *-doc GNOME developer documentation to Requires. -* Tue Jun 15 2004 - sbrabec(a)suse.cz +* Tue Jun 15 2004 sbrabec(a)suse.cz - Worked around missing mkinstalldirs (#42037, #41985). -* Thu Jun 10 2004 - sbrabec(a)suse.cz +* Thu Jun 10 2004 sbrabec(a)suse.cz - Updated to version 1.2.2. - Fixed IA64 crash on start (#41854). -* Mon Apr 26 2004 - ro(a)suse.de +* Mon Apr 26 2004 ro(a)suse.de - fix function return type to void -* Wed Mar 17 2004 - sbrabec(a)suse.cz +* Wed Mar 17 2004 sbrabec(a)suse.cz - Fixed scrollkeeper calling conventions (#36215). -* Mon Mar 15 2004 - sbrabec(a)suse.cz +* Mon Mar 15 2004 sbrabec(a)suse.cz - FHS 2.3 fix (mandir, infodir, #35821). -* Mon Mar 15 2004 - sbrabec(a)suse.cz +* Mon Mar 15 2004 sbrabec(a)suse.cz - Added package set sufficient for compilation to requirements (#35900), -* Thu Feb 19 2004 - ro(a)suse.de +* Thu Feb 19 2004 ro(a)suse.de - fix plugindir for lib64 -* Thu Feb 12 2004 - sbrabec(a)suse.cz +* Thu Feb 12 2004 sbrabec(a)suse.cz - Updated to version 1.2.1 (GNOME2). - Added anjuta_update_global_tags. -* Sat Aug 16 2003 - adrian(a)suse.de +* Sat Aug 16 2003 adrian(a)suse.de - add Categories -* Thu Jul 24 2003 - hhetter(a)suse.de +* Fri Jul 25 2003 hhetter(a)suse.de - %%_lib fixes -* Mon Jul 14 2003 - sbrabec(a)suse.cz +* Mon Jul 14 2003 sbrabec(a)suse.cz - GNOME prefix change to /opt/gnome. -* Fri Jun 20 2003 - ro(a)suse.de +* Fri Jun 20 2003 ro(a)suse.de - added directory to filelist -* Tue Jun 03 2003 - ro(a)suse.de +* Tue Jun 03 2003 ro(a)suse.de - add manpages to filelist - remove unpackaged files from buildroot -* Mon Nov 11 2002 - ro(a)suse.de +* Mon Nov 11 2002 ro(a)suse.de - changed neededforbuild <jade_dsl> to <openjade> - changed neededforbuild <sp> to <opensp> -* Wed Nov 06 2002 - hhetter(a)suse.de +* Wed Nov 06 2002 hhetter(a)suse.de - update to version 1.0.0 - package split en/ja documentation and translation - completed scrollkeeper installation - use correct kde datadir - fix docbook usage - full filelist rework -* Fri Sep 27 2002 - ro(a)suse.de +* Fri Sep 27 2002 ro(a)suse.de - Added alsa alsa-devel to neededforbuild (esound) -* Thu Aug 15 2002 - ro(a)suse.de +* Thu Aug 15 2002 ro(a)suse.de - removed gnome-utils from neededforbuild -* Tue Aug 13 2002 - hhetter(a)suse.de +* Tue Aug 13 2002 hhetter(a)suse.de - fix neededforbuild -* Fri Jul 26 2002 - adrian(a)suse.de +* Fri Jul 26 2002 adrian(a)suse.de - fix neededforbuild -* Mon Jul 01 2002 - meissner(a)suse.de +* Mon Jul 01 2002 meissner(a)suse.de - auto* rerun, added intltool to neededforbuild -* Mon Jul 01 2002 - hhetter(a)suse.de +* Mon Jul 01 2002 hhetter(a)suse.de - updated to version 0.1.9 -* Tue May 28 2002 - ro(a)suse.de +* Tue May 28 2002 ro(a)suse.de - removed gpc from neededforbuild -* Fri Feb 01 2002 - ro(a)suse.de +* Fri Feb 01 2002 ro(a)suse.de - changed neededforbuild <libpng> to <libpng-devel-packages> -* Wed Dec 05 2001 - hhetter(a)suse.de +* Wed Dec 05 2001 hhetter(a)suse.de - update to version 0.1.8 * first version after merging with gIDE -* Fri Aug 24 2001 - hhetter(a)suse.de +* Fri Aug 24 2001 hhetter(a)suse.de - update to version 0.1.7, changes include: * translation and documentation updates * fixed bugs preventing use of the wizard * cleaned up user-interface - filelist corrections and updates - functionality test on i386 -* Mon Aug 13 2001 - hhetter(a)suse.de +* Mon Aug 13 2001 hhetter(a)suse.de - removed no longer needed patch - updated to version 0.1.6 -* Wed Jun 20 2001 - hhetter(a)suse.de +* Wed Jun 20 2001 hhetter(a)suse.de - fixed redundand docdir -* Thu Apr 05 2001 - uli(a)suse.de +* Thu Apr 05 2001 uli(a)suse.de - ditched reimplementation of strcasestr (harmful with recent gccs) - fixed passing of RPM_OPT_FLAGS -* Thu Mar 29 2001 - hhetter(a)suse.de +* Thu Mar 29 2001 hhetter(a)suse.de - update to version 0.1.4 - use bz2 - filelist review -* Wed Mar 14 2001 - hhetter(a)suse.de +* Wed Mar 14 2001 hhetter(a)suse.de - changed docdir from gnome/anjuta/ to anjuta/ - filelist corrections -* Mon Mar 12 2001 - hhetter(a)suse.de +* Mon Mar 12 2001 hhetter(a)suse.de - Update to version 0.1.3 - filelist corrections/updates - testrun on 7.1 -* Mon Jan 22 2001 - hhetter(a)suse.de +* Mon Jan 22 2001 hhetter(a)suse.de - inital build ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-qt
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-qt checked in at Fri Feb 1 00:12:38 CET 2008. -------- --- yast2-qt/yast2-qt.changes 2008-01-30 09:28:28.000000000 +0100 +++ yast2-qt/yast2-qt.changes 2008-01-31 16:45:36.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 31 15:27:06 CET 2008 - sh(a)suse.de + +- Simplified dialog handling +- V 2.16.20 + +------------------------------------------------------------------- Old: ---- yast2-qt-2.16.19.tar.bz2 New: ---- yast2-qt-2.16.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.S19849/_old 2008-02-01 00:11:39.000000000 +0100 +++ /var/tmp/diff_new_pack.S19849/_new 2008-02-01 00:11:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-qt (Version 2.16.19) +# spec file for package yast2-qt (Version 2.16.20) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,17 +10,17 @@ Name: yast2-qt -Version: 2.16.19 -Release: 2 +Version: 2.16.20 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.16.19.tar.bz2 +Source0: yast2-qt-2.16.20.tar.bz2 BuildRequires: docbook-xsl-stylesheets doxygen libdrm-devel libjpeg-devel libqt4-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel update-desktop-files Summary: YaST2 - Graphical User Interface BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-core-devel >= 2.16.24 -Requires: yast2-core >= 2.16.24 +BuildRequires: yast2-core-devel >= 2.16.25 +Requires: yast2-core >= 2.16.25 Requires: yast2_theme >= 2.16.1 Requires: libzypp >= 3.11.8 Provides: yast2_ui @@ -78,6 +78,9 @@ %_libdir/YaST2/plugin/libpy2qt_pkg.so %changelog +* Thu Jan 31 2008 sh(a)suse.de +- Simplified dialog handling +- V 2.16.20 * Wed Jan 30 2008 coolo(a)suse.de - recreate tar to fix build * Tue Jan 29 2008 sh(a)suse.de ++++++ yast2-qt-2.16.19.tar.bz2 -> yast2-qt-2.16.20.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/src/CMakeLists.txt new/yast2-qt-2.16.20/src/CMakeLists.txt --- old/yast2-qt-2.16.19/src/CMakeLists.txt 2008-01-30 09:28:25.000000000 +0100 +++ new/yast2-qt-2.16.20/src/CMakeLists.txt 2008-01-31 16:45:33.000000000 +0100 @@ -5,7 +5,7 @@ -DQT_LOCALEDIR=\\\"${CMAKE_INSTALL_PREFIX}/share/qt4/translations\\\" -DICONDIR=\\"${Y2QT_ICONDIR}\\" -DLOCALEDIR=\\\"${Y2QT_LOCALEDIR}\\\" - -DLANG_FONTS_FILE=\\\"${CMAKE_INSTALL_PREFIX}/share/fonts/lang_fonts\\\" + -DLANG_FONTS_FILE=\\\"${CMAKE_INSTALL_PREFIX}/share/YaST2/data/lang_fonts\\\" -DTHEMEDIR=\\\"${Y2QT_THEMEDIR}\\\" -DQTLIBDIR=\\\"${LIB_INSTALL_DIR}\\\" ) @@ -93,6 +93,8 @@ INSTALL(TARGETS py2qt LIBRARY DESTINATION ${YAST_PLUGIN_DIR} ) +INSTALL(FILES lang_fonts DESTINATION ${CMAKE_INSTALL_PREFIX}/share/YaST2/data ) + ADD_SUBDIRECTORY(pkg) #SET_TARGET_PROPERTIES( y2lang_qt PROPERTIES PREFIX "" ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/src/YQDialog.cc new/yast2-qt-2.16.20/src/YQDialog.cc --- old/yast2-qt-2.16.19/src/YQDialog.cc 2008-01-30 09:28:25.000000000 +0100 +++ new/yast2-qt-2.16.20/src/YQDialog.cc 2008-01-31 16:45:34.000000000 +0100 @@ -118,6 +118,24 @@ } +void +YQDialog::openInternal() +{ + ensureOnlyOneDefaultButton(); + QWidget::show(); + QWidget::raise(); // FIXME: is this really necessary? + QWidget::update(); +} + + +void +YQDialog::activate() +{ + QWidget::raise(); + QWidget::update(); +} + + int YQDialog::preferredWidth() { @@ -212,10 +230,12 @@ void YQDialog::activate( bool active ) { +#if 0 if ( active ) { ensureOnlyOneDefaultButton(); } +#endif } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/src/YQDialog.h new/yast2-qt-2.16.20/src/YQDialog.h --- old/yast2-qt-2.16.19/src/YQDialog.h 2008-01-30 09:28:26.000000000 +0100 +++ new/yast2-qt-2.16.20/src/YQDialog.h 2008-01-31 16:45:35.000000000 +0100 @@ -203,8 +203,24 @@ **/ YQWizard * ensureOnlyOneDefaultButton( YWidgetListConstIterator begin, YWidgetListConstIterator end ); + + /** + * Internal open() method, called exactly once during the life + * time of the dialog in open(). + * + * Implemented from YDialog. + **/ + virtual void openInternal(); /** + * Activate this dialog: Make sure that it is shown as the topmost dialog + * of this application and that it can receive input. + * + * Implemented from YDialog. + **/ + virtual void activate(); + + /** * Qt event handlers. * * All reimplemented from QWidget. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/src/YQUI_core.cc new/yast2-qt-2.16.20/src/YQUI_core.cc --- old/yast2-qt-2.16.19/src/YQUI_core.cc 2008-01-30 09:28:25.000000000 +0100 +++ new/yast2-qt-2.16.20/src/YQUI_core.cc 2008-01-31 16:45:34.000000000 +0100 @@ -171,7 +171,7 @@ // Hide the main window for now. The first call to UI::OpenDialog() on an - // `opt(`defaultSize) dialog will trigger a showDialog() call that shows + // `opt(`defaultSize) dialog will trigger a dialog->open() call that shows // the main window - there is nothing to display yet. _main_win->hide(); @@ -523,29 +523,6 @@ } -#warning FIXME Move this to Y(Q)Dialog (and rename it to ::finalize()?) -void YQUI::showDialog( YDialog * dialog ) -{ - QWidget * qw = (QWidget *) dialog->widgetRep(); - - if ( qw ) - { - qw->show(); - qw->raise(); - qw->update(); - } - - ( (YQDialog *) dialog)->ensureOnlyOneDefaultButton(); - - //qApp->processEvents(); -} - - -void YQUI::closeDialog( YDialog * dialog ) -{ -} - - QString YQUI::productName() const { return fromUTF8( YUI::productName() ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/config/default.exp new/yast2-qt-2.16.20/testsuite/config/default.exp --- old/yast2-qt-2.16.19/testsuite/config/default.exp 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/config/default.exp 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -# default.exp -- empty - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/config/unix.exp new/yast2-qt-2.16.20/testsuite/config/unix.exp --- old/yast2-qt-2.16.19/testsuite/config/unix.exp 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/config/unix.exp 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -load_lib "y2qt_init.exp" - -proc y2qt_exit {} {} -proc y2qt_version {} {} - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/config/unknown.exp new/yast2-qt-2.16.20/testsuite/config/unknown.exp --- old/yast2-qt-2.16.19/testsuite/config/unknown.exp 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/config/unknown.exp 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -perror "No setup for current configuration" -exit 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/lib/y2qt.exp new/yast2-qt-2.16.20/testsuite/lib/y2qt.exp --- old/yast2-qt-2.16.19/testsuite/lib/y2qt.exp 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/lib/y2qt.exp 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -# qt.exp -- empty diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/lib/y2qt_init.exp new/yast2-qt-2.16.20/testsuite/lib/y2qt_init.exp --- old/yast2-qt-2.16.19/testsuite/lib/y2qt_init.exp 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/lib/y2qt_init.exp 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -# -# run a ui file with y2qt -# -proc y2qt-run { src } { - - set path [split $src "/"] - set filename [lindex $path [expr [llength $path]-1]] - - # extract basename and check extension - - set fname [split $filename "."] - - if {[llength $fname] < 2} { - fail "Bad filename syntax '$src'" - return - } - if {[lindex $fname [expr [llength $fname]-1]] != "ui"} { - fail "Not .ui extension '$src'" - return - } - - # setup filenames - - set base_name [lindex $fname 0] - - set stdout_name "tests/$base_name.out" - set tmpout_name "tmp.out.$base_name" - set tmperr_name "tmp.err.$base_name" - - # due to a change of _debug() the stderr will be redirected to a log - # set stderr_name "tests/$base_name.err" - - # run the test for qt - - set result [exec "runqt" "$src" "-l" "$tmperr_name" ">" "$tmpout_name"] - - # check return code - - if {$result != ""} { - warning "Compilation of $base_name results in '$result'" - } - - # check stdout - - if {[diff $stdout_name $tmpout_name] != 1} { - fail "Wrong stdout for $base_name" - } - - # check stderr -- no longer needed ?! - - # ok, all is fine - - pass $base_name -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/README new/yast2-qt-2.16.20/testsuite/README --- old/yast2-qt-2.16.19/testsuite/README 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -Qt testsuite - -The Qt testsuite test the y2qt component by running all -.ui files in the qt.test directory (qt.test/*.ui) through -runqt. - -Every run results in a stdout and stderr output which is -checked agains .out and .err respectively. - -The file lib/qt.exp defines a function which runs all tests -contained in qt.test (i.e. makes a 'glob' on qt.test/*.ui) - -For every .ui file you put in tests, you must create the proper -.out and .err file with the following command - -runqt file.ui > file.out 2> file.err diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/runqt.cc new/yast2-qt-2.16.20/testsuite/runqt.cc --- old/yast2-qt-2.16.19/testsuite/runqt.cc 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/runqt.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1,104 +0,0 @@ -/*---------------------------------------------------------------------\ -| | -| __ __ ____ _____ ____ | -| \ \ / /_ _/ ___|_ _|___ \ | -| \ V / _` \___ \ | | __) | | -| | | (_| |___) || | / __/ | -| |_|\__,_|____/ |_| |_____| | -| | -| core system | -| (C) SuSE GmbH | -\----------------------------------------------------------------------/ - - File: runqt.cc - - Author: Klaus Kaempf (kkaempf(a)suse.de) - Maintainer: Klaus Kaempf (kkaempf(a)suse.de) - -/-*/ - -#include <stdio.h> - -#include "YUIQt.h" - -#include <ycp/YCPParser.h> -#include <yui/YUIInterpreter.h> -#include <ycp/y2log.h> - -extern int yydebug; - -int -main (int argc, char *argv[]) -{ - const char *fname = 0; - FILE *infile = stdin; - - if (argc > 1) { - int argp = 1; - while (argp < argc) { - if ((argv[argp][0] == '-') - && (argv[argp][1] == 'l') - && (argp+1 < argc)) { - argp++; - set_log_filename (argv[argp]); - } - else if (fname == 0) { - fname = argv[argp]; - } else { - fprintf (stderr, "Bad argument '%s'\nUsage: runqt [ name.ycp ]\n", argv[argp]); - } - argp++; - } - } - - YCPParser *parser; - parser = new YCPParser (); - - if (!parser) { - fprintf (stderr, "Failed to create YCPParser\n"); - return 1; - } - - YUIInterpreter *interpreter; - interpreter = new YUIQt (argc, argv, true, NULL); - - if (!interpreter) { - fprintf (stderr, "Failed to create YUIQt\n"); - delete parser; - return 1; - } - - if (fname != 0) { - infile = fopen (fname, "r"); - if (infile == 0) { - fprintf (stderr, "Failed to open '%s'\n", fname); - return 1; - } - } - else { - fname = "stdin"; - } - - parser->setInput (infile, fname); - parser->setBuffered(); - - YCPValue value = YCPVoid(); - - for (;;) { - value = parser->parse(); - if (value.isNull()) - break; - - value = interpreter->evaluate(value); - - printf ("(%s)\n", value->toString().c_str()); - } - - delete interpreter; - delete parser; - - if (infile != stdin) - fclose (infile); - - return 0; -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/aaa.out new/yast2-qt-2.16.20/testsuite/tests/aaa.out --- old/yast2-qt-2.16.19/testsuite/tests/aaa.out 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/aaa.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -(`stdio()) -("After building the test environment new:all make clean, make -f Makefile.cvs, configure --prefix=/,make and make install as root.... there is more information on stderr ...It's a libtool feature :-) When you make a program a script will beinstalled in the source directory which will do the final linkingjust before you run it. (Just do more ui/Qt/qt to see what I mean)\nThe messages are warnings issued by the linker(for some reason these warnings are enabled within SuSE linux). Whenyou run the program a second time, the program is already linked so youwon't get the warnings any more.\nYou can get rid of the warnings by removing the \"-warn-common\" outof your egcs specfile. No idea why it is in there in the first place.") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/aaa.ui new/yast2-qt-2.16.20/testsuite/tests/aaa.ui --- old/yast2-qt-2.16.19/testsuite/tests/aaa.ui 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/aaa.ui 1970-01-01 01:00:00.000000000 +0100 @@ -1,34 +0,0 @@ - -# --------------------------------------------------------- -# -# Filename: aaa.ui -# -# Purpose: dummy test case for ui test -# -# Creator: jd(a)suse.de -# -# Maintainer: jd(a)suse.de -# -# Remarks: there is more information on stderr -# -# --------------------------------------------------------- - -{ - return( "After building the test environment new:" + - "all make clean, make -f Makefile.cvs, configure --prefix=/," + - "make and make install as root." + - "... there is more information on stderr ..." + - - "It's a libtool feature :-) When you make a program a script will be" + - "installed in the source directory which will do the final linking" + - "just before you run it. (Just do more ui/Qt/qt to see what I mean)\n" + - - "The messages are warnings issued by the linker" + - "(for some reason these warnings are enabled within SuSE linux). When" + - "you run the program a second time, the program is already linked so you" + - "won't get the warnings any more.\n" + - - "You can get rid of the warnings by removing the \"-warn-common\" out" + - "of your egcs specfile. No idea why it is in there in the first place." ); -} - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/Label1.ui new/yast2-qt-2.16.20/testsuite/tests/Label1.ui --- old/yast2-qt-2.16.19/testsuite/tests/Label1.ui 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/Label1.ui 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -{ - OpenDialog( - `VBox( - `Label("Hello, World!"), - `PushButton("&OK") - ) - ); - UserInput(); - CloseDialog(); - return 0; -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/mkdata.sh new/yast2-qt-2.16.20/testsuite/tests/mkdata.sh --- old/yast2-qt-2.16.19/testsuite/tests/mkdata.sh 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/mkdata.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -#!/bin/bash -# mkdata make test data -# -../../y2ui < $1.ui > $1.out 2> $1.err diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/ru1.out new/yast2-qt-2.16.20/testsuite/tests/ru1.out --- old/yast2-qt-2.16.19/testsuite/tests/ru1.out 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/ru1.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -(`stdio()) -("If you get a warning next, something likeWARNING: No font available with requested character set! #1please have a look at the installed fonts.At the moment variable fonts are not installed") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/ru1.ui new/yast2-qt-2.16.20/testsuite/tests/ru1.ui --- old/yast2-qt-2.16.19/testsuite/tests/ru1.ui 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/ru1.ui 1970-01-01 01:00:00.000000000 +0100 @@ -1,102 +0,0 @@ - -# --------------------------------------------------------- -# -# Filename: Ru1.ui -# -# Purpose: test cases for ui test -# -# Creator: jd(a)suse.de -# -# Maintainer: jd(a)suse.de -# -# Remarks: Always the user interaction is removed: -# any answer = UserInput(); -# Furthermore the tested action is set into a loop -# -# --------------------------------------------------------- - -{ - SetCharset("ISO 8859-5"); - any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch()); - any vbox = `VBox( - -// Main.cpp:112 - `Label ("Copying system config file."), - `Label ( "Копирование Системной Конфугурации"), - -// Main.cpp:231 Main.cpp:250 MenuAction.cpp:364 MenuAction.cpp:386 MenuAction.cpp:878 - `Label ("DISMISS"), - `Label ( "ПРОДОЛЖИТЬ"), - -// Main.cpp:235 MenuAction.cpp:371 - `Label ("Yudit: information"), - `Label ( "Yudit: информация"), - -// Main.cpp:254 - `Label ("Yudit: error"), - `Label ( "Yudit: ошибка"), - -// MainWidget.cpp:208 - `Label ("File"), - `Label ( "Файл"), - -// MainWidget.cpp:210 - `Label ("Open..."), - `Label ( "Открыть..."), - -// MainWidget.cpp:212 - `Label ("Append..."), - `Label ( "Добавить..."), - -// MainWidget.cpp:214 - `Label ("Re-Load"), - `Label ( "Перезагрузить"), - -// MainWidget.cpp:216 - `Label ("New Window"), - `Label ( "Новое Окно"), - -// MainWidget.cpp:219 - `Label ("Save"), - `Label ( "Записать"), - -// MainWidget.cpp:221 - `Label ("Save As..."), - `Label ( "Записать В Файл..."), - -// MainWidget.cpp:224 MainWidget.cpp:317 - `Label ("Config"), - `Label ( "Конфигурация"), - -// MainWidget.cpp:226 - `Label ("Print..."), - `Label ( "Печать..."), - -// MainWidget.cpp:229 - `Label ("Close"), - `Label ( "Закрыть"), - -// MainWidget.cpp:231 - `Label ("Exit All"), - `Label ( "Конец Работы"), - ok - ); - - integer loop = 0; - while( loop < 10 ) - { - ShowDialog( Dialog( vbox )); - any CurrentMap = QueryDialog( ); - CloseDialog(); - - if( ( is( CurrentMap, map ) == false ) || - ( size( CurrentMap ) != 0 ) ) return false; - - loop = loop + 1; - } - return( "If you get a warning next, something like" + - "WARNING: No font available with requested character set! #1" + - "please have a look at the installed fonts." + - "At the moment variable fonts are not installed" ); -} - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/stretch2.out new/yast2-qt-2.16.20/testsuite/tests/stretch2.out --- old/yast2-qt-2.16.19/testsuite/tests/stretch2.out 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/stretch2.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -(`stdio()) -(true) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/stretch2.ui new/yast2-qt-2.16.20/testsuite/tests/stretch2.ui --- old/yast2-qt-2.16.19/testsuite/tests/stretch2.ui 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/stretch2.ui 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ - -# --------------------------------------------------------- -# -# Filename: Stretch2.ui -# -# Purpose: test cases for UI test -# -# Creator: jd(a)suse.de -# -# Maintainer: jd(a)suse.de -# -# --------------------------------------------------------- - - -// Example 2 for Stretch -// -// Syntax: Stretch() -// - - -{ - any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch()); - - integer loop = 0; - while( loop < 100 ) - { - ShowDialog( - Dialog(`VBox( - `Stretch(), - `Label("Some text goes here"), - `Stretch(), - `Label("This is some more text"), - ok - ))); - any CurrentMap = QueryDialog( ); - CloseDialog(); - - if( ( is( CurrentMap, map ) == false ) || ( size( CurrentMap ) != 0 )) return( false ); - - loop = loop + 1; - } - - return true; -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/textentry3.out new/yast2-qt-2.16.20/testsuite/tests/textentry3.out --- old/yast2-qt-2.16.19/testsuite/tests/textentry3.out 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/textentry3.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -(`stdio()) -(true) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/textentry3.ui new/yast2-qt-2.16.20/testsuite/tests/textentry3.ui --- old/yast2-qt-2.16.19/testsuite/tests/textentry3.ui 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/textentry3.ui 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ - -# --------------------------------------------------------- -# -# Filename: Textentry3.ui -# -# Purpose: test cases for ui test -# -# Creator: jd(a)suse.de -# -# Maintainer: jd(a)suse.de -# -# Remarks: Always the user interaction is removed: -# any answer = UserInput(); -# Furthermore the tested action is set into a loop -# -# --------------------------------------------------------- - -// Example 3 for Textentry -// -// Syntax: Textentry( Id id, UTF8 label ,UTF8 defaultText [, int maxLength, [int fieldSize]] ) -// - -{ - any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch()); - any dialog = Dialog( `VBox( - `Textentry(`Id("text"), "&Please enter your name:", "Helmut"), - ok - )); - - any CurrentMap = $[]; - integer loop = 0; - while( loop < 100 ) - { - any dialog = Dialog( `VBox( - `Textentry(`Id("text"), "&Please enter your name:", "Helmut"), - ok - )); - - ChangeWidget( dialog, `Id("text"), "Hans-Diether" ); - ShowDialog(); - CurrentMap = QueryDialog( dialog ); - CloseDialog(); - - if( ( is( CurrentMap, map ) == false ) || - ( size( CurrentMap ) != 1 ) || - ( select( CurrentMap, 0 ) != [ `Id("text"), "Hans-Diether" ] ) ) return false; - - dialog = Dialog( `VBox( - `Textentry(`Id("text"), "&Please enter your name:", "Helmut"), - ok - )); - - ChangeWidget( dialog, `Id("text"), "Helmut" ); - ShowDialog(); - CurrentMap = QueryDialog( dialog ); - CloseDialog(); - - if( ( is( CurrentMap, map ) == false ) || - ( size( CurrentMap ) != 1 ) || - ( select( CurrentMap, 0 ) != [ `Id("text"), "Helmut" ] ) ) return false; - - loop = loop + 1; - } - - return true; -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/thread002.out new/yast2-qt-2.16.20/testsuite/tests/thread002.out --- old/yast2-qt-2.16.19/testsuite/tests/thread002.out 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/thread002.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -(`stdio()) -(true) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/thread002.ui new/yast2-qt-2.16.20/testsuite/tests/thread002.ui --- old/yast2-qt-2.16.19/testsuite/tests/thread002.ui 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/thread002.ui 1970-01-01 01:00:00.000000000 +0100 @@ -1,63 +0,0 @@ - -# --------------------------------------------------------- -# -# Filename: threadXXX.ui -# -# Purpose: test cases for ui test -# -# Creator: jd(a)suse.de -# -# Maintainer: jd(a)suse.de -# -# Remarks: Always the user interaction is removed: -# any answer = UserInput(); -# Furthermore the tested action is set into a loop -# -# --------------------------------------------------------- - - -// Example1 for threads, former vbox1 -// -// Syntax: VBox( [Id id, ] widget1, widget2, ... ) -// - -{ - - define Check( ) - `` { - return( ( is( CurrentMap, map ) == true ) && - ( size( CurrentMap ) == 4 ) && - ( select( CurrentMap, 0 ) == [`Id("cb1"), false] ) && - ( select( CurrentMap, 1 ) == [`Id("cb2"), false] ) && - ( select( CurrentMap, 2 ) == [`Id("cb3"), false] ) && - ( select( CurrentMap, 3 ) == [`Id("cb4"), false] ) ); - }; - - if( true ) - { - any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch()); - - integer loop = 0; - while( loop < 10 ) - { - any dialog = Dialog( `VBox( - `VBox( - `Checkbox(`Id("cb1"), "Option1"), - `Checkbox(`Id("cb2"), "Option2"), - `Checkbox(`Id("cb3"), "Option3"), - `Checkbox(`Id("cb4"), "Option4") - ), - ok - )); - - ShowDialog( ); - any CurrentMap = QueryDialog( dialog ); - CloseDialog( ); - if( Check() == false ) return false; - - loop = loop + 1; - } - } - return( true ); -} - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/vbox1.out new/yast2-qt-2.16.20/testsuite/tests/vbox1.out --- old/yast2-qt-2.16.19/testsuite/tests/vbox1.out 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/vbox1.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -(`stdio()) -(true) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/vbox1.ui new/yast2-qt-2.16.20/testsuite/tests/vbox1.ui --- old/yast2-qt-2.16.19/testsuite/tests/vbox1.ui 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/vbox1.ui 1970-01-01 01:00:00.000000000 +0100 @@ -1,133 +0,0 @@ - -# --------------------------------------------------------- -# -# Filename: Vbox1.ui -# -# Purpose: test cases for ui test -# -# Creator: jd(a)suse.de -# -# Maintainer: jd(a)suse.de -# -# Remarks: Always the user interaction is removed: -# any answer = UserInput(); -# Furthermore the tested action is set into a loop -# -# --------------------------------------------------------- - - -// Example1 for VBox -// -// Syntax: VBox( [Id id, ] widget1, widget2, ... ) -// -// A VBox is used to give the UI a hint about how to -// organize the dialog. All widgets listed inside the VBox -// are laid out from top to bottom. -// -// A VBox can have an Id. This Id will be added as a prefix -// to all widget Ids within the VBox. -// -// This example shows a VBox which organizes 4 checkboxes -// above each other. -// - - -{ - - define Check( boolean CheckBoxTwoState ) - ``{ - return( ( is( CurrentMap, map ) == true ) && - ( size( CurrentMap ) == 4 ) && - ( select( CurrentMap, 0 ) == [`Id("cb1"), false] ) && - ( select( CurrentMap, 1 ) == [`Id("cb2"), CheckBoxTwoState] ) && - ( select( CurrentMap, 2 ) == [`Id("cb3"), false] ) && - ( select( CurrentMap, 3 ) == [`Id("cb4"), false] ) ); - }; - - -// the display function ShowDialog() is called without parameters - if( true ) - { - any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch()); - - integer loop = 0; - while( loop < 100 ) - { - any dialog = OpenDialog( `VBox( - `VBox( - `Checkbox(`Id("cb1"), "Option1"), - `Checkbox(`Id("cb2"), "Option2"), - `Checkbox(`Id("cb3"), "Option3"), - `Checkbox(`Id("cb4"), "Option4") - ), - ok - )); - - ShowDialog( ); - any CurrentMap = QueryDialog( dialog ); - CloseDialog( ); - - if( Check( false ) == false ) return false; - - loop = loop + 1; - } - } - -// the display function ShowDialog() is called with the dialog parameter - if( true ) - { - any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch()); - - integer loop = 0; - while( loop < 100 ) - { - any dialog = Dialog( `VBox( - `VBox( - `Checkbox(`Id("cb1"), "Option1"), - `Checkbox(`Id("cb2"), "Option2"), - `Checkbox(`Id("cb3"), "Option3"), - `Checkbox(`Id("cb4"), "Option4") - ), - ok - )); - - ShowDialog( dialog ); - any CurrentMap = QueryDialog( dialog ); - CloseDialog( dialog ); - - if( Check( false ) == false ) return false; - - loop = loop + 1; - } - } - -// the display function ShowDialog() is called with the dialog itself - if( true ) - { - any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch()); - - integer loop = 0; - while( loop < 100 ) - { - ShowDialog( - Dialog( `VBox( - `VBox( - `Checkbox(`Id("cb1"), "Option1"), - `Checkbox(`Id("cb2"), "Option2", true), - `Checkbox(`Id("cb3"), "Option3"), - `Checkbox(`Id("cb4"), "Option4", false) - ), - ok - ))); - any CurrentMap = QueryDialog( ); - CloseDialog( ); - - if( Check( true ) == false ) return false; - - loop = loop + 1; - } - } - - return true; -} - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/vbox2.out new/yast2-qt-2.16.20/testsuite/tests/vbox2.out --- old/yast2-qt-2.16.19/testsuite/tests/vbox2.out 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/vbox2.out 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -(`stdio()) -(true) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/tests/vbox2.ui new/yast2-qt-2.16.20/testsuite/tests/vbox2.ui --- old/yast2-qt-2.16.19/testsuite/tests/vbox2.ui 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/tests/vbox2.ui 1970-01-01 01:00:00.000000000 +0100 @@ -1,81 +0,0 @@ - -# --------------------------------------------------------- -# -# Filename: Vbox2.ui -# -# Purpose: test cases for ui test -# -# Creator: jd(a)suse.de -# -# Maintainer: jd(a)suse.de -# -# Remarks: Always the user interaction is removed: -# any answer = UserInput(); -# Furthermore the tested action is set into a loop -# -# --------------------------------------------------------- - -// Example 2 for VBox -// -// Syntax: VBox( [Id id, ] widget1, widget2, ... ) -// -// A VBox is used to give the UI a hint about how to -// organize the dialog. All widgets listed inside the VBox -// are laid out from top to bottom. -// -// A VBox can have an Id. This Id will be added as a prefix -// to all widget Ids within the VBox. -// -// This example shows two VBox'es. The first VBox has an Id -// set. The Id's of the checkboxes in this VBox will be -// prefixed with the Id of the VBox. -// - - -{ - define Check( ) - `` { - return( ( ( is( CurrentMap, map ) == true ) && - ( size( CurrentMap ) == 5 ) && - ( select( CurrentMap, 0 ) == [`Id("vb", "cb1", "cb2", "cb3", "cb4"), false] ) && - ( select( CurrentMap, 1 ) == [`Id("cb1"), false] ) && - ( select( CurrentMap, 2 ) == [`Id("cb2"), false] ) && - ( select( CurrentMap, 3 ) == [`Id("cb3"), false] ) && - ( select( CurrentMap, 4 ) == [`Id("cb4"), false] ))); - }; - - - any ok = `HBox(`Stretch(), `Pushbutton(`Id("ok"), "OK"), `Stretch()); - - boolean CheckState = true; - integer loop = 0; - while( loop < 100 ) - { - any dialog = Dialog( `VBox( - `VBox( `Id("vb"), - `Checkbox(`Id("cb1"), "Option1"), - `Checkbox(`Id("cb2"), "Option2"), - `Checkbox(`Id("cb3"), "Option3"), - `Checkbox(`Id("cb4"), "Option4") - ), - `VBox( - `Checkbox(`Id("cb1"), "Option1"), - `Checkbox(`Id("cb2"), "Option2"), - `Checkbox(`Id("cb3"), "Option3"), - `Checkbox(`Id("cb4"), "Option4") - ), - ok - )); - - ShowDialog(); - any CurrentMap = QueryDialog( dialog ); - CloseDialog( dialog ); - - CheckState = Check( ); - if( CheckState == false ) return CheckState; - - loop = loop + 1; - } - - return CheckState; -} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/y2qt.cc new/yast2-qt-2.16.20/testsuite/y2qt.cc --- old/yast2-qt-2.16.19/testsuite/y2qt.cc 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/y2qt.cc 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -/* it's all in liby2/src/genericfrontend.cc */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/testsuite/y2qt.test/y2qt.exp new/yast2-qt-2.16.20/testsuite/y2qt.test/y2qt.exp --- old/yast2-qt-2.16.19/testsuite/y2qt.test/y2qt.exp 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/testsuite/y2qt.test/y2qt.exp 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -# -# y2qt.exp -# 'main' file for all ui tests -# - -# get all files matching tests/*.ui - -set filenames [glob $srcdir/tests/*.ui] - -# foreach file, call ui-run (from testsuite/lib) - -foreach file $filenames { y2qt-run $file } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/VERSION.cmake new/yast2-qt-2.16.20/VERSION.cmake --- old/yast2-qt-2.16.19/VERSION.cmake 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/VERSION.cmake 2008-01-31 16:45:33.000000000 +0100 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "19") +SET(VERSION_PATCH "20") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.16.19/yast2-qt.spec.in new/yast2-qt-2.16.20/yast2-qt.spec.in --- old/yast2-qt-2.16.19/yast2-qt.spec.in 2008-01-30 09:28:24.000000000 +0100 +++ new/yast2-qt-2.16.20/yast2-qt.spec.in 2008-01-31 16:45:33.000000000 +0100 @@ -6,8 +6,8 @@ Summary: - BuildRequires: yast2-devtools >= 2.16.3 -BuildRequires: yast2-core-devel >= 2.16.24 -Requires: yast2-core >= 2.16.24 +BuildRequires: yast2-core-devel >= 2.16.25 +Requires: yast2-core >= 2.16.25 Requires: yast2_theme >= 2.16.1 Requires: libzypp >= 3.11.8 Provides: yast2_ui ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit installation-images
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package installation-images checked in at Fri Feb 1 00:08:47 CET 2008. -------- --- installation-images/installation-images.changes 2008-01-30 15:40:10.000000000 +0100 +++ installation-images/installation-images.changes 2008-01-31 15:14:53.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 31 15:14:50 CET 2008 - snwint(a)suse.de + +- put debuginfo into image files + +------------------------------------------------------------------- Old: ---- installation-images-10.8.tar.bz2 New: ---- installation-images-10.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.F12749/_old 2008-02-01 00:07:58.000000000 +0100 +++ /var/tmp/diff_new_pack.F12749/_new 2008-02-01 00:07:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 10.8) +# spec file for package installation-images (Version 10.9) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -118,9 +118,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 10.8 +Version: 10.9 Release: 1 -Source: installation-images-10.8.tar.bz2 +Source: installation-images-10.9.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -376,11 +376,16 @@ cp -a images/root %{buildroot}/SuSE/$theme/boot/$boot_arch/root %endif %endif -cd / mkdir -p %{buildroot}/CD1/boot/$boot_arch -time tar cf %{buildroot}/CD1/boot/$boot_arch/inst-sys.lib.debuginfo.tar usr/lib/debug -time tar cf %{buildroot}/CD1/boot/$boot_arch/inst-sys.src.debuginfo.tar usr/src/debug -time bzip2 -v9 %{buildroot}/CD1/boot/$boot_arch/inst-sys.*.debuginfo.tar* +install -m 644 etc/README.debuginfo %{buildroot}/CD1/boot/$boot_arch +for i in lib src ; do + mkdir -p /xxx/usr/$i + mv /usr/$i/debug /xxx/usr/$i + mksquashfs /xxx %{buildroot}/CD1/boot/$boot_arch/root.${i}.debug -noappend + chmod 644 %{buildroot}/CD1/boot/$boot_arch/root.${i}.debug + mv /xxx/usr/$i/debug /usr/$i + rmdir /xxx/usr/$i /xxx/usr /xxx +done %install # get rid of /usr/lib/rpm/brp-strip-debug @@ -398,6 +403,8 @@ /CD1 %changelog +* Thu Jan 31 2008 snwint(a)suse.de +- put debuginfo into image files * Wed Jan 30 2008 snwint(a)suse.de - fixed perl file list (#357249) * Wed Jan 30 2008 snwint(a)suse.de ++++++ installation-images-10.8.tar.bz2 -> installation-images-10.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-10.8/Changelog new/installation-images-10.9/Changelog --- old/installation-images-10.8/Changelog 2008-01-30 15:35:37.000000000 +0100 +++ new/installation-images-10.9/Changelog 2008-01-31 15:05:48.000000000 +0100 @@ -1,3 +1,6 @@ +31/1/2008: v10.9 + - put debuginfo into image files + 30/1/2008: v10.8 - fixed perl file list (#357249) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-10.8/data/root/etc/inst_setup new/installation-images-10.9/data/root/etc/inst_setup --- old/installation-images-10.8/data/root/etc/inst_setup 2008-01-25 16:34:53.000000000 +0100 +++ new/installation-images-10.9/data/root/etc/inst_setup 2008-01-31 14:28:11.000000000 +0100 @@ -1,28 +1,22 @@ #! /bin/sh # -# *** NOTE *** # -# linuxrc now takes care of integrating the instsys. No need to fiddle with -# symlinks and such here. -# -# linuxrc-based tools are in /lbin. +# Note: linuxrc-based tools are in /lbin. # PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11/bin:/lbin # tmpfs has mode 1777, sshd doesnt like that chmod 755 / -# simple debuginfo handling, workaround read-only loop mount -# if the root image is loop mounted, extract the debuginfo like this: -# cd / ; tar xfj inst-sys.lib.debuginfo.tar.bz2 ; tar xfj inst-sys.src.debuginfo.tar.bz2 -# if the root image is on a remote filesystem, extract it on the server side -tmpfs_debuginfo_paths=/dev/shm/dbg -for i in lib src -do - mkdir -v $tmpfs_debuginfo_paths.$i - mount -v --bind $tmpfs_debuginfo_paths.$i /usr/$i/debug -done + +# gdb can't be symlink +if [ -L /usr/bin/gdb ] ; then + i=`readlink /usr/bin/gdb` + rm -f /usr/bin/gdb + touch /usr/bin/gdb + mount --bind $i /usr/bin/gdb +fi # see bug 61535 [ -e /proc/sys/vm/local-oom-kill ] && echo 1 > /proc/sys/vm/local-oom-kill @@ -263,10 +257,7 @@ killall Xvnc >/dev/null 2>&1 killall sshd >/dev/null 2>&1 -# debuginfo will take a huge amount of memory, swapoff may lead to OOM -# just get rid of it. -umount -v /usr/*/debug -rm -rf ${tmpfs_debuginfo_paths}.* +umount /usr/bin/gdb 2>/dev/null umount devpts 2>/dev/null for file in $FILES_TO_RESTORE ; do diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-10.8/etc/README.debuginfo new/installation-images-10.9/etc/README.debuginfo --- old/installation-images-10.8/etc/README.debuginfo 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-10.9/etc/README.debuginfo 2008-01-31 15:12:27.000000000 +0100 @@ -0,0 +1,9 @@ +To get the debuginfo images automatically added copy them to the server and +edit boot/<arch>/config to look similar to: + +# cat boot/i386/config +root: common root ?root.<lang> ?root.lib.debug ?root.src.debug +rescue: common rescue +root.ja: root.ja root.fonts +root.zh_CN: root.zh_CN root.fonts +root.zh_TW: root.zh_TW root.fonts diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-10.8/VERSION new/installation-images-10.9/VERSION --- old/installation-images-10.8/VERSION 2008-01-30 15:35:42.000000000 +0100 +++ new/installation-images-10.9/VERSION 2008-01-31 15:04:54.000000000 +0100 @@ -1 +1 @@ -10.8 +10.9 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-core
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-core checked in at Fri Feb 1 00:07:01 CET 2008. -------- --- yast2-core/yast2-core.changes 2008-01-29 20:08:28.000000000 +0100 +++ yast2-core/yast2-core.changes 2008-01-31 15:41:36.590883000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 31 15:25:52 CET 2008 - sh(a)suse.de + +- Simplified and unified internal UI dialog handling +- V 2.16.25 + +------------------------------------------------------------------- Old: ---- yast2-core-2.16.24.tar.bz2 New: ---- yast2-core-2.16.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.l10664/_old 2008-02-01 00:06:25.000000000 +0100 +++ /var/tmp/diff_new_pack.l10664/_new 2008-02-01 00:06:25.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-core (Version 2.16.24) +# spec file for package yast2-core (Version 2.16.25) # # Copyright (c) 2008 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.16.24 +Version: 2.16.25 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-core-2.16.24.tar.bz2 +Source0: yast2-core-2.16.25.tar.bz2 Prefix: /usr # obviously BuildRequires: gcc-c++ @@ -86,7 +86,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-core-2.16.24 +%setup -n yast2-core-2.16.25 %build %{prefix}/bin/y2tool y2autoconf @@ -162,7 +162,11 @@ %{_libdir}/pkgconfig/yast2-core.pc %doc %{prefix}/share/doc/packages/yast2-core /usr/share/YaST2/data/devtools/bin/generateYCPWrappers + %changelog +* Thu Jan 31 2008 sh(a)suse.de +- Simplified and unified internal UI dialog handling +- V 2.16.25 * Tue Jan 29 2008 sh(a)suse.de - YCP-less event handling in libyui core - V 2.16.24 ++++++ yast2-core-2.16.24.tar.bz2 -> yast2-core-2.16.25.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/configure new/yast2-core-2.16.25/configure --- old/yast2-core-2.16.24/configure 2008-01-24 14:28:05.000000000 +0100 +++ new/yast2-core-2.16.25/configure 2008-01-31 15:31:41.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-core 2.16.23. +# Generated by GNU Autoconf 2.60 for yast2-core 2.16.25. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='yast2-core' PACKAGE_TARNAME='yast2-core' -PACKAGE_VERSION='2.16.23' -PACKAGE_STRING='yast2-core 2.16.23' +PACKAGE_VERSION='2.16.25' +PACKAGE_STRING='yast2-core 2.16.25' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1433,7 +1433,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.16.23 to adapt to many kinds of systems. +\`configure' configures yast2-core 2.16.25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1504,7 +1504,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-core 2.16.23:";; + short | recursive ) echo "Configuration of yast2-core 2.16.25:";; esac cat <<\_ACEOF @@ -1610,7 +1610,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-core configure 2.16.23 +yast2-core configure 2.16.25 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1624,7 +1624,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.16.23, which was +It was created by yast2-core $as_me 2.16.25, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2425,7 +2425,7 @@ # Define the identity of the package. PACKAGE='yast2-core' - VERSION='2.16.23' + VERSION='2.16.25' cat >>confdefs.h <<_ACEOF @@ -2653,7 +2653,7 @@ -VERSION="2.16.23" +VERSION="2.16.25" RPMNAME="yast2-core" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -23794,7 +23794,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-core $as_me 2.16.23, which was +This file was extended by yast2-core $as_me 2.16.25, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23847,7 +23847,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-core config.status 2.16.23 +yast2-core config.status 2.16.25 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/configure.in new/yast2-core-2.16.25/configure.in --- old/yast2-core-2.16.24/configure.in 2008-01-24 14:27:50.000000000 +0100 +++ new/yast2-core-2.16.25/configure.in 2008-01-31 15:31:22.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-core, 2.16.23, http://bugs.opensuse.org/, yast2-core) +AC_INIT(yast2-core, 2.16.25, http://bugs.opensuse.org/, yast2-core) 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.16.23" +VERSION="2.16.25" RPMNAME="yast2-core" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/libyui/doc/examples/DumbTab2.ycp new/yast2-core-2.16.25/libyui/doc/examples/DumbTab2.ycp --- old/yast2-core-2.16.24/libyui/doc/examples/DumbTab2.ycp 2007-11-27 15:07:30.000000000 +0100 +++ new/yast2-core-2.16.25/libyui/doc/examples/DumbTab2.ycp 2008-01-31 15:24:59.000000000 +0100 @@ -6,7 +6,7 @@ `VSpacing(), `HCenter( `HSquash( - `VBox( + `VBox( `HSpacing( 50 ), `InputField( "Name" ), `InputField( "E-Mail" ), @@ -27,7 +27,10 @@ + "You need to do most everything yourself.\n" + "Each tab behaves very much like a push button;\n" + "the YCP application is notified when the user clicks on a tab.\n" - + "The application must take care to exchange the tab contents." ) + + "The application must take care to exchange the tab contents.\n" + + "\n" + + "Note: That means changes made in on tab are lost when switching\n" + + "the tabs, e.g. text entered here in the address tab.") ); term style_hints_page = @@ -44,8 +47,8 @@ ) ); - - + + UI::OpenDialog(`opt(`defaultsize), `VBox( `DumbTab( [ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/libyui/src/ChangeLog new/yast2-core-2.16.25/libyui/src/ChangeLog --- old/yast2-core-2.16.24/libyui/src/ChangeLog 2008-01-29 19:04:19.000000000 +0100 +++ new/yast2-core-2.16.25/libyui/src/ChangeLog 2008-01-31 15:29:51.000000000 +0100 @@ -484,3 +484,13 @@ * Moved YCP part out of YEvent to new class YCPEvent * YUI::runPkgSelection() now returns YEvent * and is pure virtual + + +2008-01-31 sh(a)suse.de + +* Moved dialog handling from YUI to YDialog: + - removed YUI::showDialog() + - removed YUI::closeDialog() + - Now using YDialog::open() and YDialog::destroy() + - Derived classes now have to implement YDialog::openInternal() + and YDialog::activate() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/libyui/src/YCPErrorDialog.cc new/yast2-core-2.16.25/libyui/src/YCPErrorDialog.cc --- old/yast2-core-2.16.24/libyui/src/YCPErrorDialog.cc 2008-01-25 19:50:13.000000000 +0100 +++ new/yast2-core-2.16.25/libyui/src/YCPErrorDialog.cc 2008-01-30 18:14:44.000000000 +0100 @@ -51,20 +51,19 @@ fac->createHStretch( buttonBox ); YPushButton * closeButton = fac->createPushButton( buttonBox, "&Close" ); closeButton->setId( new YCPValueWidgetID( YCPSymbol( "cancel" ) ) ); - - dialog->setInitialSize(); - dialog->checkShortcuts(); - YUI::ui()->showDialog( dialog ); + dialog->open(); YCPValue input = YUI::ui()->waitForUserInput(); yuiMilestone() << "Input: " << input << endl; - YUI::ui()->closeDialog( YDialog::currentDialog() ); - YDialog::deleteTopmostDialog(); + dialog->destroy(); } catch ( YUIException & ex ) { YUI_CAUGHT( exception ); + + // No other action. If opening this error dialog fails, the user will + // just have to live with the error being reported in the log file only. } catch ( ... ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/libyui/src/YCPEvent.cc new/yast2-core-2.16.25/libyui/src/YCPEvent.cc --- old/yast2-core-2.16.24/libyui/src/YCPEvent.cc 2008-01-29 17:16:25.000000000 +0100 +++ new/yast2-core-2.16.25/libyui/src/YCPEvent.cc 2008-01-29 20:20:14.000000000 +0100 @@ -44,6 +44,9 @@ YCPValue YCPEvent::eventId() const { + if ( ! _event ) + return YCPVoid(); + // // Widget Events // @@ -121,18 +124,21 @@ { YCPMap map; - map->add( YCPString( "EventType" ), YCPString ( YEvent::toString( _event->eventType() ) ) ); - map->add( YCPString( "EventSerialNo" ), YCPInteger( _event->serial() ) ); + if ( _event ) + { + map->add( YCPString( "EventType" ), YCPString ( YEvent::toString( _event->eventType() ) ) ); + map->add( YCPString( "EventSerialNo" ), YCPInteger( _event->serial() ) ); - YCPValue id = eventId(); + YCPValue id = eventId(); - if ( ! id.isNull() && ! id->isVoid() ) - { - map->add( YCPString( "ID" ), id ); - } + if ( ! id.isNull() && ! id->isVoid() ) + { + map->add( YCPString( "ID" ), id ); + } - addWidgetEventFields( map, id ); - addKeyEventFields ( map, id ); + addWidgetEventFields( map, id ); + addKeyEventFields ( map, id ); + } return map; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/libyui/src/YDialog.cc new/yast2-core-2.16.25/libyui/src/YDialog.cc --- old/yast2-core-2.16.24/libyui/src/YDialog.cc 2008-01-17 15:03:20.000000000 +0100 +++ new/yast2-core-2.16.25/libyui/src/YDialog.cc 2008-01-30 19:07:15.000000000 +0100 @@ -40,12 +40,14 @@ , colorMode( colorMode ) , shortcutCheckPostponed( false ) , defaultButton( 0 ) + , isOpen( false ) {} YDialogType dialogType; YDialogColorMode colorMode; bool shortcutCheckPostponed; YPushButton * defaultButton; + bool isOpen; }; @@ -55,7 +57,7 @@ , priv( new YDialogPrivate( dialogType, colorMode ) ) { YUI_CHECK_NEW( priv ); - + _dialogStack.push( this ); #if VERBOSE_DIALOGS @@ -69,6 +71,57 @@ #if VERBOSE_DIALOGS yuiDebug() << "Destroying " << this << endl; #endif + + if ( ! _dialogStack.empty() && _dialogStack.top() == this ) + { + _dialogStack.pop(); + + if ( ! _dialogStack.empty() ) + _dialogStack.top()->activate(); + } + else + yuiError() << "Not top of dialog stack: " << this << endl; +} + + +void +YDialog::open() +{ + if ( priv->isOpen ) + return; + + checkShortcuts(); + setInitialSize(); + openInternal(); // Make sure this is only called once! + + priv->isOpen = true; +} + + +bool +YDialog::isOpen() const +{ + return priv->isOpen; +} + + +bool +YDialog::destroy( bool doThrow ) +{ + YUI_CHECK_WIDGET( this ); + + if ( _dialogStack.empty() || + _dialogStack.top() != this ) + { + if ( doThrow ) + YUI_THROW( YUIDialogStackingOrderException() ); + + return false; + } + + delete this; + + return true; } @@ -145,12 +198,21 @@ #if VERBOSE_DIALOGS yuiDebug() << "Setting initial size for " << this << endl; #endif - + // Trigger geometry management setSize( preferredWidth(), preferredHeight() ); } +void +YDialog::recalcLayout() +{ + yuiDebug() << "Recalculating layout for " << this << endl; + + setSize( preferredWidth(), preferredHeight() ); +} + + YDialog * @@ -178,7 +240,6 @@ else { delete _dialogStack.top(); - _dialogStack.pop(); } return ! _dialogStack.empty(); @@ -188,8 +249,31 @@ void YDialog::deleteAllDialogs() { - while ( deleteTopmostDialog( false ) ) - {} + while ( ! _dialogStack.empty() ) + { + delete _dialogStack.top(); + } +} + + +void +YDialog::deleteTo( YDialog * targetDialog ) +{ + YUI_CHECK_WIDGET( targetDialog ); + + while ( ! _dialogStack.empty() ) + { + YDialog * dialog = _dialogStack.top(); + + delete dialog; + + if ( dialog == targetDialog ) + return; + } + + // If we ever get here, targetDialog was nowhere in the dialog stack. + + YUI_THROW( YUIDialogStackingOrderException() ); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/libyui/src/YDialog.h new/yast2-core-2.16.25/libyui/src/YDialog.h --- old/yast2-core-2.16.24/libyui/src/YDialog.h 2007-12-03 18:03:02.000000000 +0100 +++ new/yast2-core-2.16.25/libyui/src/YDialog.h 2008-01-30 19:09:56.000000000 +0100 @@ -48,7 +48,8 @@ /** * Destructor. - * Don't delete a dialog directly, use YDialog::deleteTopmostDialog(). + * Don't delete a dialog directly, use YDialog::deleteTopmostDialog() + * or YDialog::destroy(). **/ virtual ~YDialog(); @@ -60,10 +61,47 @@ virtual const char * widgetClass() const { return "YDialog"; } /** + * Open a newly created dialog: Finalize it and make it visible + * on the screen. + * + * Applications should call this once after all children are created. + * If the application doesn't do this, it will be done automatically upon + * the next call of YDialog::waitForEvent() (or related). This is OK if + * YDialog::waitForEvent() is called immediately after creating the dialog + * anyway. If it is not, the application might appear sluggish to the user. + * + * Derived classes are free to reimplement this, but they should call this + * base class method in the new implementation. + **/ + void open(); + + /** + * Return 'true' if open() has already been called for this dialog. + **/ + bool isOpen() const; + + /** + * Close and delete this dialog (and all its children) if it is the topmost + * dialog. If this is not the topmost dialog, this will throw an exception + * if 'doThrow' is true (default). + * + * Remember that all pointers to the dialog and its children will be + * invalid after this operation. + * + * This is intentionally not named close() since close() would not imply + * that the dialog and its children are deleted. + * + * Returns 'true' upon success, 'false' upon failure. + **/ + bool destroy( bool doThrow = true ); + + /** * Delete the topmost dialog. * * Will throw a YUINoDialogException if there is no dialog and 'doThrow' is - * 'true'. + * 'true'. + * + * This is equivalent to YDialog::currentDialog()->destroy(). * * Returns 'true' if there is another open dialog after deleting, * 'false' if there is none. @@ -76,6 +114,11 @@ static void deleteAllDialogs(); /** + * Delete all dialogs from the topmost to the one specified. + **/ + static void deleteTo( YDialog * dialog ); + + /** * Returns the number of currently open dialogs (from 1 on), i.e., the * depth of the dialog stack. **/ @@ -103,6 +146,20 @@ void setInitialSize(); /** + * Recalculate the layout of the dialog and of all its children after + * children have been added or removed or if any of them changed its + * preferred width of height. + * + * This is a very expensive operation. Call it only when really necessary. + * YDialog::open() includes a call to YDialog::setInitialSize() which does + * the same. + * + * The basic idea behind this function is to call it when the dialog + * changed after it (and its children hierarchy) was initially created. + **/ + void recalcLayout(); + + /** * Return this dialog's type (YMainDialog / YPopupDialog). **/ YDialogType dialogType() const; @@ -153,9 +210,29 @@ **/ virtual void setDefaultButton( YPushButton * defaultButton ); + /** + * Activate this dialog: Make sure that it is shown as the topmost dialog + * of this application and that it can receive input. + * + * Derived classes are required to implement this. + **/ + virtual void activate() = 0; + protected: + /** + * Internal open() method. This is called (exactly once during the life + * time of the dialog) in open(). + * + * Derived classes are required to implement this to do whatever is + * necessary to make this dialog visible on the screen. + **/ + virtual void openInternal() = 0; + + /** + * Stack holding all currently existing dialogs. + **/ static std::stack<YDialog *> _dialogStack; private: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/libyui/src/YUI_builtins.cc new/yast2-core-2.16.25/libyui/src/YUI_builtins.cc --- old/yast2-core-2.16.24/libyui/src/YUI_builtins.cc 2008-01-29 20:01:45.000000000 +0100 +++ new/yast2-core-2.16.25/libyui/src/YUI_builtins.cc 2008-01-30 19:11:18.000000000 +0100 @@ -712,6 +712,8 @@ YDialog::currentDialog()->dumpWidgetTree(); #endif + YDialog::currentDialog()->activate(); + delete widgetEvent; return 0; } @@ -791,10 +793,7 @@ YUI_CHECK_NEW( dialog ); YCPDialogParser::parseWidgetTreeTerm( dialog, dialogTerm ); - - dialog->setInitialSize(); - dialog->checkShortcuts(); - showDialog( dialog ); + dialog->open(); } catch ( YUIException & exception ) { @@ -830,28 +829,13 @@ YCPValue YUI::evaluateCloseDialog() { blockEvents(); // We don't want self-generated events from UI builtins. - - closeDialog( YDialog::currentDialog() ); YDialog::deleteTopmostDialog(); - unblockEvents(); return YCPBoolean( true ); } -void YUI::showDialog( YDialog * ) -{ - // dummy default implementation -} - - -void YUI::closeDialog( YDialog * ) -{ - // dummy default implementation -} - - /** * @builtin ChangeWidget diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/libyui/src/YUIException.h new/yast2-core-2.16.25/libyui/src/YUIException.h --- old/yast2-core-2.16.24/libyui/src/YUIException.h 2008-01-17 13:49:02.000000000 +0100 +++ new/yast2-core-2.16.25/libyui/src/YUIException.h 2008-01-30 17:40:56.000000000 +0100 @@ -457,6 +457,18 @@ }; +class YUIDialogStackingOrderException: public YUIException +{ +public: + YUIDialogStackingOrderException() + : YUIException( "Dialog stacking order violated" ) + {} + + virtual ~YUIDialogStackingOrderException() throw() + {} +}; + + class YUISyntaxErrorException: public YUIException { public: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/libyui/src/YUI.h new/yast2-core-2.16.25/libyui/src/YUI.h --- old/yast2-core-2.16.24/libyui/src/YUI.h 2008-01-29 18:59:45.000000000 +0100 +++ new/yast2-core-2.16.25/libyui/src/YUI.h 2008-01-30 18:39:20.000000000 +0100 @@ -427,22 +427,6 @@ virtual YEvent * pollInput() = 0; -public: - /** - * Show and activate a previously created dialog. - * This default implementation does nothing. - **/ - virtual void showDialog( YDialog *dialog ); - - /** - * Decativate and close a previously created dialog. - * This default implementation does nothing. - * - * Don't delete the dialog. This will be done at some other place. - **/ - virtual void closeDialog( YDialog *dialog ); - - protected: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.24/VERSION new/yast2-core-2.16.25/VERSION --- old/yast2-core-2.16.24/VERSION 2008-01-29 17:23:39.000000000 +0100 +++ new/yast2-core-2.16.25/VERSION 2008-01-31 15:25:47.000000000 +0100 @@ -1 +1 @@ -2.16.24 +2.16.25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yum
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yum checked in at Fri Feb 1 00:05:41 CET 2008. -------- --- yum/yum.changes 2008-01-24 10:20:55.000000000 +0100 +++ yum/yum.changes 2008-01-31 13:58:46.228350000 +0100 @@ -1,0 +2,8 @@ +Thu Jan 31 14:10:03 CET 2008 - cthiel(a)suse.de + +- update to version 3.2.10 + * speeding things up and trimming down the memory footprint + * this release is substantially faster on things like: list, search and + depsolving + +------------------------------------------------------------------- Old: ---- yum-3.2.8.tar.bz2 New: ---- yum-3.2.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yum.spec ++++++ --- /var/tmp/diff_new_pack.ZP8100/_old 2008-02-01 00:05:12.000000000 +0100 +++ /var/tmp/diff_new_pack.ZP8100/_new 2008-02-01 00:05:12.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yum (Version 3.2.8) +# spec file for package yum (Version 3.2.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,8 +12,8 @@ Name: yum BuildRequires: dbus-1 python-devel -Version: 3.2.8 -Release: 13 +Version: 3.2.10 +Release: 1 Summary: RPM installer/updater Group: System/Packages License: GPL v2 or later @@ -140,7 +140,7 @@ if [ ! -d "/etc/yum/repos.d" ] ; then mkdir "/etc/yum/repos.d" fi - if [ "/etc/yum.repos.d/*" != '/etc/yum.repos.d/*']; then + if [ "/etc/yum.repos.d/*" != '/etc/yum.repos.d/*' ] ; then for i in /etc/yum.repos.d/*; do NCONF="/etc/yum/repos.d/`basename $i`" @@ -188,6 +188,11 @@ %{_mandir}/man*/yum-updatesd* %changelog +* Thu Jan 31 2008 cthiel(a)suse.de +- update to version 3.2.10 + * speeding things up and trimming down the memory footprint + * this release is substantially faster on things like: list, search and + depsolving * Thu Jan 24 2008 cthiel(a)suse.de - improve post scripts * Tue Jan 22 2008 cthiel(a)suse.de @@ -217,7 +222,7 @@ * Thu Oct 11 2007 cthiel(a)suse.de - added yum-3.2.6-epoch_workaround.patch, to treat null epoch equal to zero epoch (#331818) -* Fri Oct 05 2007 cthiel(a)suse.de +* Sat Oct 06 2007 cthiel(a)suse.de - update to version 3.2.6 * Mostly bug fixes in this version. A number of output changes which mostly just make it clearer whats going on when yum says things like @@ -231,7 +236,7 @@ medium-standing messes. * Tue Sep 18 2007 cthiel(a)suse.de - update default repos to include openSUSE 10.3 -* Wed Aug 29 2007 cthiel(a)suse.de +* Thu Aug 30 2007 cthiel(a)suse.de - fix build * Wed Aug 29 2007 cthiel(a)suse.de - update to version 3.2.4 @@ -606,7 +611,7 @@ * includes countless bugfixes * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Sun Dec 18 2005 cthiel(a)suse.de +* Mon Dec 19 2005 cthiel(a)suse.de - update to version 2.4.2 * Wed Nov 30 2005 cthiel(a)suse.de - update to version 2.4.1 @@ -614,7 +619,7 @@ - build as nonroot * Thu Sep 15 2005 cthiel(a)suse.de - specfile cleanup -* Sat Aug 27 2005 cthiel(a)suse.de +* Sun Aug 28 2005 cthiel(a)suse.de - adapt yum's defaults to SUSE Linux * Tue Aug 16 2005 cthiel(a)suse.de - update to version 2.4.0 ++++++ yum-3.2.8.tar.bz2 -> yum-3.2.10.tar.bz2 ++++++ ++++ 5874 lines of diff (skipped) ++++++ yum-3.2.2.patch ++++++ --- /var/tmp/diff_new_pack.ZP8100/_old 2008-02-01 00:05:13.000000000 +0100 +++ /var/tmp/diff_new_pack.ZP8100/_new 2008-02-01 00:05:13.000000000 +0100 @@ -1,11 +1,11 @@ --- yum/config.py +++ yum/config.py -@@ -553,7 +553,7 @@ - http_caching = SelectionOption('all', ('none', 'packages', 'all')) - metadata_expire = IntOption(1800) # time in seconds - mirrorlist_expire = IntOption(86400) # time in seconds (1 day) +@@ -629,7 +629,7 @@ + # yum-updatesd is running. + metadata_expire = SecondsOption(60 * 90) + mirrorlist_expire = SecondsOption(86400) # time in seconds (1 day) - rpm_check_debug = BoolOption(True) + rpm_check_debug = BoolOption(False) disable_excludes = ListOption() - - + skip_broken = BoolOption(False) + # Note that "instant" is the old behaviour, but group:primary is very ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-users
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-users checked in at Fri Feb 1 00:05:03 CET 2008. -------- --- yast2-users/yast2-users.changes 2008-01-29 15:57:14.000000000 +0100 +++ yast2-users/yast2-users.changes 2008-01-31 16:31:00.532686000 +0100 @@ -1,0 +2,14 @@ +Thu Jan 31 16:11:28 CET 2008 - jsuchome(a)suse.cz + +- unified function names for RootAlias handling +- first steps for implementation of FATE 302980, + "Simplified user config during installation" : +- added inst_user_first.ycp, client for user configuration in first + stage of installation +- UsersSimple.pm is module for saving the data gathered from firs + stage +- inst_root, inst_auth, inst_user updated to check for first stage + configuration data +- 2.16.7 + +------------------------------------------------------------------- Old: ---- yast2-users-2.16.7.tar.bz2 New: ---- yast2-users-2.16.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.gc4160/_old 2008-02-01 00:03:15.000000000 +0100 +++ /var/tmp/diff_new_pack.gc4160/_new 2008-02-01 00:03:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-users (Version 2.16.7) +# spec file for package yast2-users (Version 2.16.8) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-users -Version: 2.16.7 +Version: 2.16.8 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-users-2.16.7.tar.bz2 +Source0: yast2-users-2.16.8.tar.bz2 Prefix: /usr BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite Requires: yast2-perl-bindings yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext @@ -45,7 +45,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-users-2.16.7 +%setup -n yast2-users-2.16.8 %build %{prefix}/bin/y2tool y2autoconf @@ -88,6 +88,17 @@ %{_libdir}/YaST2/plugin/libpy2ag_crack.la %doc %{prefix}/share/doc/packages/yast2-users %changelog +* Thu Jan 31 2008 jsuchome(a)suse.cz +- unified function names for RootAlias handling +- first steps for implementation of FATE 302980, + "Simplified user config during installation" : +- added inst_user_first.ycp, client for user configuration in first + stage of installation +- UsersSimple.pm is module for saving the data gathered from firs + stage +- inst_root, inst_auth, inst_user updated to check for first stage + configuration data +- 2.16.7 * Tue Jan 29 2008 jsuchome(a)suse.cz - "User Management" is "User and Group Management" now in control center: group desktop file removed (F303392) ++++++ yast2-users-2.16.7.tar.bz2 -> yast2-users-2.16.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.7/src/dialogs.ycp new/yast2-users-2.16.8/src/dialogs.ycp --- old/yast2-users-2.16.7/src/dialogs.ycp 2008-01-25 12:20:19.000000000 +0100 +++ new/yast2-users-2.16.8/src/dialogs.ycp 2008-01-30 11:02:52.000000000 +0100 @@ -1644,15 +1644,15 @@ if (root_mail_checked) { if (username != org_username) - Users::RemoveRootMail (org_username); - Users::AddRootMail (username); + Users::RemoveRootAlias (org_username); + Users::AddRootAlias (username); } else if (root_mail) // not checked now, but checked before { if (username != org_username) - Users::RemoveRootMail (org_username); + Users::RemoveRootAlias (org_username); else - Users::RemoveRootMail (username); + Users::RemoveRootAlias (username); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.7/src/inst_auth.ycp new/yast2-users-2.16.8/src/inst_auth.ycp --- old/yast2-users-2.16.7/src/inst_auth.ycp 2008-01-25 12:20:19.000000000 +0100 +++ new/yast2-users-2.16.8/src/inst_auth.ycp 2008-01-31 15:30:57.000000000 +0100 @@ -14,6 +14,7 @@ import "Directory"; import "FileUtils"; +import "GetInstArgs"; import "Label"; import "Ldap"; import "NetworkInterfaces"; @@ -22,9 +23,8 @@ import "Popup"; import "Users"; import "UsersCache"; +import "UsersSimple"; import "Wizard"; -import "GetInstArgs"; - /** @@ -80,6 +80,17 @@ return ret == `ok ? selected : nil; } +//----------------------------------------- main body ---------------------- + +// first check if some settings were written in first stage +if (!GetInstArgs::going_back()) { + + Users::SetKerberosConfiguration (UsersSimple::KerberosConfiguration ()); + Users::SetAfterAuth (UsersSimple::AfterAuth ()); + y2milestone ("skipping authentication dialog..."); + return `next; + // TODO: actually, this could be all for this client... +} // Check if lan is configured list<string> net_devices = NetworkInterfaces::ListDevicesExcept("dialup"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.7/src/inst_root.ycp new/yast2-users-2.16.8/src/inst_root.ycp --- old/yast2-users-2.16.7/src/inst_root.ycp 2007-11-08 11:15:15.000000000 +0100 +++ new/yast2-users-2.16.8/src/inst_root.ycp 2008-01-31 15:14:48.000000000 +0100 @@ -30,10 +30,21 @@ import "Stage"; import "Users"; import "UsersCache"; +import "UsersSimple"; import "Wizard"; include "users/widgets.ycp"; // for EncryptionPopup() + UsersSimple::Read (); + if (!GetInstArgs::going_back() && UsersSimple::RootPasswordWritten ()) + { + y2milestone ("root password was already written..."); + // write encryption method (makes sense even if no local user is set) + Users::SetEncryptionMethod (UsersSimple::EncryptionMethod ()); + Users::WriteSecurity (); + return `auto; + } + boolean check_CA_constraints = ProductFeatures::GetBooleanFeature ("globals","root_password_ca_check"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.7/src/inst_user_first.ycp new/yast2-users-2.16.8/src/inst_user_first.ycp --- old/yast2-users-2.16.7/src/inst_user_first.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-users-2.16.8/src/inst_user_first.ycp 2008-01-31 15:08:32.000000000 +0100 @@ -0,0 +1,452 @@ +{ + import "GetInstArgs"; + import "Label"; + import "Mode"; + import "Stage"; + import "Report"; + import "String"; + import "UsersSimple"; + import "Wizard"; + + textdomain "users"; + + string auth_method = UsersSimple::AfterAuth (); + + string encryption_method = UsersSimple::EncryptionMethod (); + + boolean use_kerberos = UsersSimple::KerberosConfiguration (); + + map button_labels = $[ + // radiobutton to select ldap user auth. + "ldap": _("&LDAP"), + // radiobutton to select nis user auth. + "nis": _("N&IS"), + // radiobutton to select samba user auth. + "samba": _("&Windows Domain"), + // radiobutton to select local user auth. + "users": _("L&ocal (/etc/passwd)"), + // radiobutton to select local user auth. + "edir_ldap": _("&eDirectory LDAP"), + // radiobutton to select local user auth. + "users": _("L&ocal (/etc/passwd)"), + ]; + + map auth2label = $[ + // authentication type + "ldap": _("LDAP"), + // authentication type + "nis": _("NIS"), + // authentication type + "samba": _("Samba (Windows Domain)"), + // authentication type + "edir_ldap": _("eDirectory LDAP"), + ]; + + map<string,string> encoding2label = $[ + // encryption type + "des" : _("DES"), + // encryption type + "md5" : _("MD5"), + // encryption type + "blowfish" : _("Blowfish"), + ]; + + term buttons = `VBox (`VSpacing(0.5)); + list<string> available_clients = [ + "users", "ldap", "nis", "samba", "edir_ldap" ]; + + foreach (string client, available_clients, { + buttons = add (buttons, `Left (`RadioButton ( + `id(client), `opt (`notify), button_labels[client]:"") + )); + }); +// FIXME 'import previous user' is missing + + buttons = add (buttons, `VSpacing(0.5)); + + term auth_term = `VBox ( + `Frame (_("Authentication Method"), + `RadioButtonGroup (`id (`auth_method), buttons) + ), + `VSpacing (), + // check box label + `Left (`CheckBox (`id(`krb), _("Set Up &Kerberos Authentication"))) + ); + + // frame label + term encryption_term = `Frame (_("Password Encryption Type"), + `RadioButtonGroup (`id (`encryption_method), `VBox ( + `VSpacing (0.5), + // Radio button label: password encryption type + `Left (`RadioButton (`id ("des"), _("&DES (Linux default)"))), + // Radio button label: password encryption type + `Left (`RadioButton (`id ("md5"), _("&MD5"))), + // Radio button label: password encryption type + `Left (`RadioButton (`id ("blowfish"), _("&Blowfish"))), + `VSpacing (0.5) + )) + ); + + // help text for dialog "User Authentication Method" 1/3 + string auth_help = _(" +Authentication +Select the authentication method to use for users on your system. +") + + +// helptext 2/3 +_("Select Local to authenticate users only by using the local files /etc/passwd and /etc/shadow."); + + auth_help = auth_help + + // helptext 3/3 -- nis & samba & ldap avialable +_("If you are using a NIS or LDAP server to store user data or if you want +to authenticate users against an NT server, choose the appropriate value.") + + + // helptext: additional kerberos support + _("Check Set Up Kerberos Authentication to configure Kerberos after configuring the user data source."); + + // Help text for password expert dialog + string encryption_help = _(" +Choose a password encryption method for local and system users. +DES, the Linux default method, works in all network environments, but it +restricts passwords to eight characters or less. + +") + + // Help text for password expert dialog + _(" +MD5 allows longer passwords, so provides more security, but some +network protocols do not support this and you may have problems with NIS. +") + + + // Help text for password expert dialog + _(" +Blowfish is similar to MD5, but uses a different algorithm +to encrypt passwords. +"); + + // help text for main add user dialog + string main_help () { + // help text for main add user dialog + string help = _(" +Enter the User's Full Name, Username, and Password to +assign to this user account. + +") + + // help text for main add user dialog + _(" +When entering a password, distinguish between uppercase and +lowercase. Passwords should not contain any special characters, such as +accented characters. + +") + + // help text %1 is encryption type, %2,%3 numbers + sformat (_(" +With the current password encryption (%1), the password length should be between + %2 and %3 characters. +"), + encoding2label[encryption_method]:encryption_method, + UsersSimple::GetMinPasswordLength ("local"), + UsersSimple::GetMaxPasswordLength ("local") + ) + + + UsersSimple::ValidPasswordHelptext () + + + // help text for main add user dialog + _(" +To ensure that the password was entered correctly, +repeat it exactly in a second field. Do not forget your password. + +") + + // help text for main add user dialog + _(" +Create the Username from components of the full name by +clicking Suggestion. It may be modified, but use only +letters (no accented characters), digits, and <tt>._-</tt>. +Do not use uppercase letters in this entry unless you know what you are doing. +Usernames have stricter restrictions than passwords. You can redefine the +restrictions in the /etc/login.defs file. Read its man page for information. + +") + + + // help text for main add user dialog + _(" +The username and password created here are needed to log in and work with your Linux system. With Automatic Login enabled, the login procedure is skipped. This user is logged in automatically. +") + + + // help text for main add user dialog + _(" +Have mail for root forwarded to this user by checking Receive System Mail. +"); + return help; + } + + /** + * Dialog for expert user settings: authentication method as well + * as password encryption (see fate 302980) + * @return true if user accepted expert settings + */ + boolean ExpertDialog () { + + term contents = `HBox ( + `HWeight (1, `HBox ()), + `HWeight (9, `HBox (`VBox ( + `VStretch (), + auth_term, + `VSpacing (), + encryption_term, + `VStretch () + ))), + `HWeight (1, `HBox ()) + ); + + + Wizard::OpenAcceptDialog (); + Wizard::SetContents (_("Expert Settings"), contents, + auth_help + encryption_help, true, true + ); + UI::ChangeWidget (`id (`auth_method), `CurrentButton, auth_method); + UI::ChangeWidget (`id (`encryption_method), `CurrentButton, + encryption_method); + UI::ChangeWidget (`id (`krb), `Value, use_kerberos); + UI::ChangeWidget (`id (`krb), `Enabled, + auth_method != "users" && auth_method != "samba"); + foreach (string enc, string l, encoding2label, { + UI::ChangeWidget (`id(enc),`Enabled, auth_method == "users"); + }); + any retval = `cancel; + while (true) + { + retval = UI::UserInput (); + if (is (retval, string) && haskey (button_labels, (string)retval)) + { + UI::ChangeWidget (`id(`krb),`Enabled, + retval != "users" && retval != "samba"); + foreach (string enc, string l, encoding2label, { + UI::ChangeWidget (`id(enc),`Enabled, retval == "users"); + }); + } + if (retval == `cancel || retval == `accept || retval == `back) + break; + } + if (retval == `accept) + { + auth_method = (string) + UI::QueryWidget (`id (`auth_method), `CurrentButton); + encryption_method = (string) + UI::QueryWidget (`id(`encryption_method), `CurrentButton); + UsersSimple::SetEncryptionMethod (encryption_method); + if (auth_method == "users" || auth_method == "samba") + use_kerberos = false; + else + use_kerberos = (boolean) UI::QueryWidget (`id(`krb), `Value); + } + Wizard::CloseDialog (); + return (retval == `accept); + } + + // build the term with current user configuration status + term get_status_term () { + if (auth_method == "users") + return `VBox ( + `Left (`Label ( + // summary label + _("The authentication method is local /etc/passwd."))), + `Left (`Label ( + // summary label + sformat (_("The password encryption method is %1."), + encoding2label[encryption_method]:encryption_method) + )) + ); + else + { + // summary line: %1 is LDAP/NIS etc. + string auth_line = sformat (_("The authentication method is %1."), + auth2label[auth_method]:auth_method); + if (use_kerberos) + // summary line: %1 is LDAP/NIS etc. + auth_line = sformat (_("The authentication method is %1 and Kerberos."), auth2label[auth_method]:auth_method); + term cont = `VBox ( + `Left (`Label (auth_line)), + `Left (`Label ( + // summary label FIXME too long for ncurses + _("The configuration will be available later during the installation.") + )) + ); + return cont; + } + } + + map<string,any>user = UsersSimple::GetUser (); + + string user_type = user["type"]:"local"; + string username = user["uid"]:""; + string cn = user["cn"]:""; + string password = (string)user["userpassword"]:nil; + + // this user gets root's mail + boolean root_mail = + (username != "" && UsersSimple::GetRootAlias () == username); + + map display_info = UI::GetDisplayInfo (); + boolean text_mode = display_info["TextMode"]:false; + + term fields = `VBox( + // text entry + `TextEntry (`id(`cn), `opt (`notify), _("User's &Full Name"), cn), + // input field for login name + `TextEntry (`id(`username), `opt (`notify),_("&Username"),username), + `Password(`id(`pw1), Label::Password(), ""), + `Password(`id(`pw2), Label::ConfirmPassword(), "") + ); + + term optionbox = `VBox ( + `Left (`CheckBox (`id (`root_pw), + // checkbox label + _("U&se this password for system administrator"), false) +// FIXME no help text + ), + `Left ( + // checkbox label + `CheckBox (`id (`root_mail), _("Receive S&ystem Mail"), root_mail) + ), + // checkbox label + `Left (`CheckBox (`id (`autologin),_("&Automatic Login"), + UsersSimple::AutologinUsed ()) + ) + ); + term contents = `HBox ( + `HWeight (1, `HBox ()), + `HWeight (9, `HBox ( + `VBox ( + `VStretch (), + `ReplacePoint (`id (`rp_user), `VBox ( + fields, + `VSpacing (0.2), + optionbox + )), + `VSpacing (), + // frame label + `Frame (_("Summary"), `HBox (`HSpacing (0.2), `VBox ( + `ReplacePoint (`id (`rp_status), get_status_term ()), + // pushbutton label + `HBox (`Right (`PushButton (`id(`change),_("&Change...")))), + `VSpacing (0.2) + ))), + `VStretch () + ))), + `HWeight (1, `HBox ()) + ); + + if (Mode::normal ()) Wizard::CreateDialog (); // for testing only + + Wizard::SetDesktopIcon("users"); + // dialog caption + Wizard::SetContents (_("Create New User"), contents, + main_help (), + GetInstArgs::enable_back(), GetInstArgs::enable_next() + ); + string proposed_login = ""; + boolean login_modified = false; + symbol ret = `back; + while (true) + { + ret = (symbol) UI::UserInput (); + if (ret == `change) + { + if (ExpertDialog ()) + { + // show correct values now + UI::ReplaceWidget (`id (`rp_status), get_status_term ()); + foreach (symbol w, [`cn, `username, `pw1, `pw2, `root_pw, + `root_mail, `autologin ], { + UI::ChangeWidget (`id (w), `Enabled,auth_method == "users"); + }); + Wizard::RestoreHelp (main_help ()); + } + } + if (ret == `cn) + { + string uname = (string)UI::QueryWidget (`id (`username), `Value); + if (login_modified && uname == "") + login_modified = false; // reenable suggestion + if (!login_modified) + { + string full = (string)UI::QueryWidget (`id (`cn), `Value); + UI::ChangeWidget (`id (`username), `Value, tolower ( + filterchars (full, UsersSimple::ValidLognameChars ())) + ); + } + } + if (ret == `username) + { + login_modified = true; + } + if (ret == `next) + { + // TODO do all the checks + username = (string) UI::QueryWidget(`id(`username), `Value); + if (username == "" || auth_method != "users") + { + break; + } + string pw1 = (string) UI::QueryWidget(`id(`pw1), `Value); + string pw2 = (string) UI::QueryWidget(`id(`pw2),`Value); + + // --------------------------------- password checks + if (pw1 != pw2) + { + // The two group password information do not match + // error popup + Report::Error(_("The passwords do not match. +Try again.")) ; + + continue; + } + // all the checks are done, we can save the data + password = pw1; + } + if (contains ([`back, `abort, `cancel, `next], ret)) + break; + } + if (ret == `next) + { + UsersSimple::SetAfterAuth (auth_method); + UsersSimple::SetKerberosConfiguration (use_kerberos); + if (auth_method == "users" && username != "") + { + // save the first user data + UsersSimple::SetUser ($[ + "uid" : username, + "userpassword" : password, + "cn" : cn + ]); + if ((boolean) UI::QueryWidget (`id (`root_pw), `Value)) + { + UsersSimple::SetRootPassword (password); + } + UsersSimple::SetAutologinUser ( + (UI::QueryWidget(`id (`autologin),`Value)==true) ? username : "" + ); + UsersSimple::SetRootAlias ( + (UI::QueryWidget (`id (`root_mail), `Value) == true) ? + username : "" + ); + } + else if (auth_method != "users") + { + // TODO: preselect the required packages for installation + y2internal ("TODO: preselect required packages for installation"); + } + } + else if (ret == `back) + { + // reset to defaults + UsersSimple::SetAutologinUser (""); + UsersSimple::SetRootAlias (""); + UsersSimple::SetRootPassword (password); + UsersSimple::SetUser ($[]); + } + + + if (Mode::normal ()) Wizard::CloseDialog (); + return ret; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.7/src/inst_user.ycp new/yast2-users-2.16.8/src/inst_user.ycp --- old/yast2-users-2.16.7/src/inst_user.ycp 2007-02-05 11:22:06.000000000 +0100 +++ new/yast2-users-2.16.8/src/inst_user.ycp 2008-01-31 16:06:15.000000000 +0100 @@ -12,17 +12,49 @@ textdomain "users"; + import "Autologin"; import "GetInstArgs"; import "Package"; import "Label"; import "Ldap"; + import "Progress"; import "Users"; import "UsersCache"; + import "UsersSimple"; import "Wizard"; include "users/wizards.ycp"; - any ret = `back; + symbol ret = `back; + if (!GetInstArgs::going_back() && + UsersSimple::AfterAuth () == "users" && + UsersSimple::GetUser () != $[]) + { + map<string,any> user = UsersSimple::GetUser (); + y2milestone ("user defined in 1st stage, let's save now..."); + boolean progress_orig = Progress::set (false); + Users::Read (); + string error = Users::AddUser (user); //TODO check ret values + error = Users::CheckUser ($[]); + if (Users::CommitUser ()) + { + if (UsersSimple::AutologinUsed ()) // TODO check available? + { + Autologin::user = UsersSimple::GetAutologinUser (); + Autologin::used = true; + Autologin::modified = true; + } + string root_alias = UsersSimple::GetRootAlias (); + if (root_alias != "") + { + Users::AddRootAlias (root_alias); + } + error = Users::Write (); + UsersSimple::SetUser ($[]); + } + Progress::set (progress_orig); + return `next; + } // dialog caption string caption = _("User Authentication Method"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.7/src/Makefile.am new/yast2-users-2.16.8/src/Makefile.am --- old/yast2-users-2.16.7/src/Makefile.am 2008-01-29 14:56:10.000000000 +0100 +++ new/yast2-users-2.16.8/src/Makefile.am 2008-01-31 10:46:29.000000000 +0100 @@ -1,7 +1,7 @@ # # Makefile.am for users/src # -# $Id: Makefile.am 38967 2007-06-22 14:20:29Z jsuchome $ +# $Id: Makefile.am 43974 2008-01-29 14:57:24Z jsuchome $ # YCPCFLAGS = -I . @@ -18,6 +18,7 @@ UsersUI.ycp \ UsersPasswd.pm \ UsersPlugins.pm \ + UsersSimple.pm \ UsersPluginLDAPAll.pm \ UsersPluginLDAPShadowAccount.pm \ UsersPluginLDAPPasswordPolicy.pm \ @@ -37,6 +38,8 @@ groups.ycp \ inst_root.ycp \ inst_user.ycp \ + inst_user_first.ycp \ + users_finish.ycp \ inst_auth.ycp \ users_auto.ycp \ users_plugin_ldap_all.ycp \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.7/src/Makefile.in new/yast2-users-2.16.8/src/Makefile.in --- old/yast2-users-2.16.7/src/Makefile.in 2008-01-29 15:49:40.000000000 +0100 +++ new/yast2-users-2.16.8/src/Makefile.in 2008-01-31 10:48:23.000000000 +0100 @@ -17,7 +17,7 @@ # # Makefile.am for users/src # -# $Id: Makefile.am 38967 2007-06-22 14:20:29Z jsuchome $ +# $Id: Makefile.am 43974 2008-01-29 14:57:24Z jsuchome $ # # Makefile.am.common -*- Makefile -*- @@ -231,6 +231,7 @@ UsersUI.ycp \ UsersPasswd.pm \ UsersPlugins.pm \ + UsersSimple.pm \ UsersPluginLDAPAll.pm \ UsersPluginLDAPShadowAccount.pm \ UsersPluginLDAPPasswordPolicy.pm \ @@ -250,6 +251,8 @@ groups.ycp \ inst_root.ycp \ inst_user.ycp \ + inst_user_first.ycp \ + users_finish.ycp \ inst_auth.ycp \ users_auto.ycp \ users_plugin_ldap_all.ycp \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.7/src/users_finish.ycp new/yast2-users-2.16.8/src/users_finish.ycp --- old/yast2-users-2.16.7/src/users_finish.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-users-2.16.8/src/users_finish.ycp 2008-01-31 14:51:37.000000000 +0100 @@ -0,0 +1,53 @@ +/** + * File: include/users/users_finish.ycp + * Package: Configuration of users and groups + * Summary: Installation client for writing users configuration + * at the end of 1st stage + * Authors: Jiri Suchomel <jsuchome(a)suse.cz> + * + * $Id: dialogs.ycp 43901 2008-01-25 11:20:19Z jsuchome $ + */ +{ +textdomain "users"; + +import "UsersSimple"; + +any ret = nil; +string func = ""; +map param = $[]; + +/* Check arguments */ +if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { + func = (string)WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + param = (map)WFM::Args(1); +} + +y2milestone ("starting users_finish"); +y2debug("func=%1", func); +y2debug("param=%1", param); + +if (func == "Info") +{ + return (any)$[ + "steps" : 1, + // progress step title + "title" : _("Writing Users Configuration..."), + "when" : [ `installation, `autoinst ], + ]; +} +else if (func == "Write") +{ + UsersSimple::Write (); +} +else +{ + y2error ("unknown function: %1", func); + ret = nil; +} + +y2debug("ret=%1", ret); +y2milestone("users_finish finished"); +return ret; + +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.7/src/Users.pm new/yast2-users-2.16.8/src/Users.pm --- old/yast2-users-2.16.7/src/Users.pm 2008-01-29 14:55:19.000000000 +0100 +++ new/yast2-users-2.16.8/src/Users.pm 2008-01-30 15:49:03.000000000 +0100 @@ -238,6 +238,7 @@ YaST::YCP::Import ("UsersPasswd"); YaST::YCP::Import ("UsersPlugins"); YaST::YCP::Import ("UsersRoutines"); +YaST::YCP::Import ("UsersSimple"); YaST::YCP::Import ("UsersUI"); ##------------------------------------------------------------------------- @@ -351,7 +352,7 @@ sub SetRootMail { my $self = shift; my $root_a = shift; - y2warning ("this function is obsolete, use RemoveRootMail/AddRootMail instead"); + y2warning ("this function is obsolete, use RemoveRootAlias/AddRootAlias instead"); foreach my $alias (split (/,/, $root_a)) { $alias =~ s/[ \t]//g; $root_aliases{$alias} = 1; @@ -365,16 +366,16 @@ } # remove the given user from root's aliases set -BEGIN { $TYPEINFO{RemoveRootMail} = ["function", "void", "string"]; } -sub RemoveRootMail { +BEGIN { $TYPEINFO{RemoveRootAlias} = ["function", "void", "string"]; } +sub RemoveRootAlias { my $self = shift; my $u = shift; delete $root_aliases{$u} if (defined $root_aliases{$u}); } # add the given user to root's aliases set -BEGIN { $TYPEINFO{AddRootMail} = ["function", "void", "string"]; } -sub AddRootMail { +BEGIN { $TYPEINFO{AddRootAlias} = ["function", "void", "string"]; } +sub AddRootAlias { my $self = shift; my $u = shift; $root_aliases{$u} = 1; @@ -1873,7 +1874,7 @@ if (Autologin->user () eq $username) { Autologin->Disable (); } - $self->RemoveRootMail ($username); + $self->RemoveRootAlias ($username); my $type = $user_in_work{"type"}; my $plugins = $user_in_work{"plugins"}; @@ -4710,49 +4711,37 @@ } ##------------------------------------------------------------------------- -##----------------- check routines (TODO move outside...) --------- - -# "-" means range! -> at the begining or at the end! -# now CHARACTER_CLASS from /etc/login.defs is used -my $valid_logname_chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ._-"; - -my $valid_password_chars = "[-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#\$%^&*() ,;:._+/|?{}=\['\"`~<>]|]";# the ']' is or-ed... - -# error popup -my $valid_password_message = __("The password may only contain the following characters: -0-9, a-z, A-Z, and any of \"`~!\@#\$%^&* ,.;:._-+/|\?='{[(<>)]}\\\". -Try again."); - -my $valid_home_chars = "[0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/_.-]"; +##----------------- check routines ---------------------------------------- ##------------------------------------ BEGIN { $TYPEINFO{ValidLognameChars} = ["function", "string"]; } sub ValidLognameChars { - return $valid_logname_chars; + return UsersSimple->ValidLognameChars (); } ##------------------------------------ BEGIN { $TYPEINFO{ValidPasswordChars} = ["function", "string"]; } sub ValidPasswordChars { - return $valid_password_chars; + return UsersSimple->ValidPasswordChars (); +} + +##------------------------------------ +BEGIN { $TYPEINFO{ValidHomeChars} = ["function", "string"]; } +sub ValidHomeChars { + return UsersSimple->ValidHomeChars (); } ##------------------------------------ BEGIN { $TYPEINFO{ValidPasswordMessage} = ["function", "string"]; } sub ValidPasswordMessage { - return $valid_password_message; + return UsersSimple->ValidPasswordMessage (); } ##------------------------------------ # Return the part of help text about valid password characters BEGIN { $TYPEINFO{ValidPasswordHelptext} = ["function", "string"]; } sub ValidPasswordHelptext { - # help text (default part shown in more places) - return __(" -For the password, use only characters that can be found on an English keyboard -layout. In cases of system error, it may be necessary to log in without a -localized keyboard layout. -"); + return UsersSimple->ValidPasswordHelptext (); } ##------------------------------------ @@ -5006,11 +4995,12 @@ } my $filtered = $pw; + my $valid_password_chars = $self->ValidPasswordChars (); $filtered =~ s/$valid_password_chars//g; $filtered =~ s/\\//g; # bug 175706 if ($filtered ne "") { - return $valid_password_message; + return $self->ValidPasswordMessage (); } return ""; } @@ -5228,6 +5218,7 @@ my $type = UsersCache->GetUserType (); my $first = substr ($home, 0, 1); my $filtered = $home; + my $valid_home_chars= $self->ValidHomeChars (); $filtered =~ s/$valid_home_chars//g; if ($filtered ne "" || $first ne "/" || $home =~ m/\/\./) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.7/src/UsersSimple.pm new/yast2-users-2.16.8/src/UsersSimple.pm --- old/yast2-users-2.16.7/src/UsersSimple.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-users-2.16.8/src/UsersSimple.pm 2008-01-31 15:47:03.000000000 +0100 @@ -0,0 +1,362 @@ +#! /usr/bin/perl -w +# +# File: modules/UsersSimple.pm +# Package: Configuration of users and groups +# Summary: module for first stage user configuration +# +# $Id$ +# + +package UsersSimple; + +use strict; + +use YaST::YCP qw(:LOGGING sformat); +use YaPI; + +textdomain("users"); + +our %TYPEINFO; + +# What client to call after authentication dialog during installation: +# could be "users","nis" or "ldap", for more see inst_auth.ycp +my $after_auth = "users"; + +# If kerberos configuration should be called after authentication +# during installation (F120214) +my $run_krb_config = 0; + +my $root_password = ""; + +my $root_password_written = 0; + +# data of user configured during installation +my %user = (); + + +# password encryption method +my $encryption_method = "md5"; + +# mail alias for root +my $root_alias = ""; + +my %min_pass_length = ( + "local" => 5, + "system" => 5 +); + +my %max_pass_length = ( + "local" => 8, + "system" => 8 +); + +# Number of sigificant characters in the password for given encryption method +my %max_lengths = ( + "des" => 8, + "md5" => 127, + "blowfish" => 72, +); + +# name of user that should be logged in automatically +my $autologin_user = ""; + +##------------------------------------ +##------------------- global imports + +YaST::YCP::Import ("Directory"); +YaST::YCP::Import ("SCR"); +YaST::YCP::Import ("UsersUI"); + +# check the boolean value, return 0 or 1 +sub bool { + + my $param = $_[0]; + if (!defined $param) { + return 0; + } + if (ref ($param) eq "YaST::YCP::Boolean") { + return $param->value(); + } + return $param; +} + +##------------------------------------ +# return the value of current encryption method +BEGIN { $TYPEINFO{EncryptionMethod} = ["function", "string"];} +sub EncryptionMethod { + return $encryption_method; +} + +##------------------------------------ +# set new encryption method +BEGIN { $TYPEINFO{SetEncryptionMethod} = ["function", "void", "string"];} +sub SetEncryptionMethod { + + my $self = shift; + my $method = shift; + if ($encryption_method ne $method) { + $encryption_method = $method; + if (defined $max_lengths{$encryption_method}) { + $max_pass_length{"local"} = $max_lengths{$encryption_method}; + } + } +} + +BEGIN { $TYPEINFO{GetAutologinUser} = ["function", "string"]; } +sub GetAutologinUser { + return $autologin_user; +} + +BEGIN { $TYPEINFO{AutologinUsed} = ["function", "boolean"]; } +sub AutologinUsed { + return bool ($autologin_user ne ""); +} + +BEGIN { $TYPEINFO{SetAutologinUser} = ["function", "void", "string"]; } +sub SetAutologinUser { + my $self = shift; + $autologin_user = shift; +} + +BEGIN { $TYPEINFO{GetRootAlias} = ["function", "string"]; } +sub GetRootAlias { + return $root_alias; +} + +BEGIN { $TYPEINFO{SetRootAlias} = ["function", "void", "string"]; } +sub SetRootAlias { + my $self = shift; + $root_alias = shift; +} + +BEGIN { $TYPEINFO{AfterAuth} = ["function", "string"];} +sub AfterAuth { + return $after_auth; +} + +BEGIN { $TYPEINFO{SetAfterAuth} = ["function", "void", "string"];} +sub SetAfterAuth { + my $self = shift; + $after_auth = $_[0]; +} + +# return the value of run_krb_config (should the kerberos config be run?) +BEGIN { $TYPEINFO{KerberosConfiguration} = ["function", "boolean"];} +sub KerberosConfiguration { + return bool ($run_krb_config); +} + +# set the new value for run_krb_config +BEGIN { $TYPEINFO{SetKerberosConfiguration} = ["function", "void", "boolean"];} +sub SetKerberosConfiguration { + my $self = shift; + my $krb = shift; + $run_krb_config = bool ($krb) if (defined $krb); +} + + + +##------------------------------------ +# Returns the map of user configured during installation +# @return the map of user +BEGIN { $TYPEINFO{GetUser} = [ "function", + ["map", "string", "any" ]]; +} +sub GetUser { + + return \%user; +} + +##------------------------------------ +# Saves the user data into the map +# @param data user initial data (could be an empty map) +BEGIN { $TYPEINFO{SetUser} = ["function", + "string", + ["map", "string", "any" ]]; # data to fill in +} +sub SetUser { + + my $self = shift; + my $data = shift; + if (defined $data && (ref ($data) eq "HASH")) { + %user = %{$data}; + } + return ""; +} + +# was root password written in 1st stage? +BEGIN { $TYPEINFO{RootPasswordWritten} = ["function", "boolean"];} +sub RootPasswordWritten { + return bool ($root_password_written); +} + +##------------------------------------ +# save the root password into variable +BEGIN { $TYPEINFO{SetRootPassword} = ["function", "void", "string"];} +sub SetRootPassword { + + my $self = shift; + $root_password = $_[0]; +} + +##------------------------------------ +# crypt given password +BEGIN { $TYPEINFO{CryptPassword} = ["function", + "string", "string"]; +} +sub CryptPassword { + + my $self = shift; + my $pw = shift; + + return $pw if (!defined $pw); + return UsersUI->HashPassword (lc ($encryption_method), $pw); +} + +##------------------------------------ +# Writes password of superuser +# This is called during install +# @return true on success +BEGIN { $TYPEINFO{WriteRootPassword} = ["function", "boolean"];} +sub WriteRootPassword { + + my $self = shift; + my $crypted = $self->CryptPassword ($root_password, "system"); + return SCR->Write (".target.passwd.root", $crypted); +} + +# "-" means range! -> at the begining or at the end! +# now CHARACTER_CLASS from /etc/login.defs is used +my $valid_logname_chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ._-"; + +my $valid_password_chars = "[-0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!@#\$%^&*() ,;:._+/|?{}=\['\"`~<>]|]";# the ']' is or-ed... + +# error popup +my $valid_password_message = __("The password may only contain the following characters: +0-9, a-z, A-Z, and any of \"`~!\@#\$%^&* ,.;:._-+/|\?='{[(<>)]}\\\". +Try again."); + +my $valid_home_chars = "[0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ/_.-]"; + +##------------------------------------ +BEGIN { $TYPEINFO{ValidLognameChars} = ["function", "string"]; } +sub ValidLognameChars { + return $valid_logname_chars; +} + +##------------------------------------ +BEGIN { $TYPEINFO{ValidPasswordChars} = ["function", "string"]; } +sub ValidPasswordChars { + return $valid_password_chars; +} + +##------------------------------------ +BEGIN { $TYPEINFO{ValidHomeChars} = ["function", "string"]; } +sub ValidHomeChars { + return $valid_home_chars; +} + +##------------------------------------ +BEGIN { $TYPEINFO{ValidPasswordMessage} = ["function", "string"]; } +sub ValidPasswordMessage { + return $valid_password_message; +} + +##------------------------------------ +# Return the part of help text about valid password characters +BEGIN { $TYPEINFO{ValidPasswordHelptext} = ["function", "string"]; } +sub ValidPasswordHelptext { + # help text (default part shown in more places) + return __(" +For the password, use only characters that can be found on an English keyboard +layout. In cases of system error, it may be necessary to log in without a +localized keyboard layout. +"); +} + +##------------------------------------ +BEGIN { $TYPEINFO{GetMinPasswordLength} = ["function", "integer", "string"]; } +sub GetMinPasswordLength { + + my $self = shift; + if (defined ($min_pass_length{$_[0]})) { + return $min_pass_length{$_[0]}; + } + else { return 5;} +} + +##------------------------------------ +BEGIN { $TYPEINFO{GetMaxPasswordLength} = ["function", "integer", "string"]; } +sub GetMaxPasswordLength { + my $self = shift; + if (defined ($max_pass_length{$_[0]})) { + return $max_pass_length{$_[0]}; + } + else { return 8; } +} + +# Writes the settings configured in 1st stage +BEGIN { $TYPEINFO{Write} = ["function", "boolean"];} +sub Write { + + my $self = shift; + if (defined $user{"userpassword"}) { + $user{"userpassword"} = $self->CryptPassword ($user{"userpassword"}); + $user{"encrypted"} = YaST::YCP::Integer (1); + } + my %data = ( + "after_auth" => $after_auth, + "run_krb_config" => YaST::YCP::Integer ($run_krb_config), + "user" => \%user, + "encryption_method" => $encryption_method, + "root_alias" => $root_alias, + "autologin_user" => $autologin_user + ); + if ($root_password) { + # indication to inst_root + $data{"root_password_written"} = YaST::YCP::Integer (1); + } + my $file = Directory->vardir()."/users_first_stage.ycp"; + my $ret = SCR->Write (".target.ycp", $file, \%data); + + y2milestone ("1st stage user information written: ", $ret); + + # make the file root only readable + SCR->Execute (".target.bash", "chmod 600 $file") if ($ret); + + # write root password now + $self->WriteRootPassword () if ($root_password); + + return $ret; +} + +# Read the settings configured in 1st stage +BEGIN { $TYPEINFO{Read} = ["function", "boolean"];} +sub Read { + + my $self = shift; + my $file = Directory->vardir()."/users_first_stage.ycp"; + my $ret = 0; + + if (FileUtils->Exists ($file)) { + my $data = SCR->Read (".target.ycp", $file); + if (defined $data && ref ($data) eq "HASH") { + + $autologin_user = $data->{"autologin_user"} || ""; + $root_alias = $data->{"root_alias"} || ""; + $after_auth = $data->{"after_auth"} || $after_auth; + $encryption_method = + $data->{"encryption_method"} || $encryption_method; + $run_krb_config = bool ($data->{"run_krb_config"}); + if (ref ($data->{"user"}) eq "HASH") { + %user = %{$data->{"user"}}; + } + $root_password_written = bool ($data->{"root_password_written"}); + $ret = 1; + } +# SCR->Execute (".target.remove", $file); TODO + } + return bool ($ret); +} +1 +# EOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-users-2.16.7/VERSION new/yast2-users-2.16.8/VERSION --- old/yast2-users-2.16.7/VERSION 2008-01-29 14:57:08.000000000 +0100 +++ new/yast2-users-2.16.8/VERSION 2008-01-31 16:11:25.000000000 +0100 @@ -1 +1 @@ -2.16.7 +2.16.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ncurses
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-ncurses checked in at Fri Feb 1 00:03:04 CET 2008. -------- --- yast2-ncurses/yast2-ncurses.changes 2008-01-29 20:10:23.000000000 +0100 +++ yast2-ncurses/yast2-ncurses.changes 2008-01-31 15:40:45.533460000 +0100 @@ -1,0 +2,12 @@ +Thu Jan 31 15:27:49 CET 2008 - sh(a)suse.de + +- Simplified dialog handling +- V 2.16.13 + +------------------------------------------------------------------- +Thu Jan 31 14:22:36 CET 2008 - kmachalkova(a)suse.cz + +- Align numbers in IntFields to the right margin of the label, not + to the right margin of the entire screen (bnc#309118) + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.16.12.tar.bz2 New: ---- yast2-ncurses-2.16.13.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.Wn1803/_old 2008-02-01 00:01:24.000000000 +0100 +++ /var/tmp/diff_new_pack.Wn1803/_new 2008-02-01 00:01:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.16.12) +# spec file for package yast2-ncurses (Version 2.16.13) # # Copyright (c) 2008 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.16.12 +Version: 2.16.13 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.16.12.tar.bz2 +Source0: yast2-ncurses-2.16.13.tar.bz2 Prefix: /usr BuildRequires: dejagnu doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel @@ -46,7 +46,7 @@ %prep -%setup -n yast2-ncurses-2.16.12 +%setup -n yast2-ncurses-2.16.13 %build %{prefix}/bin/y2tool y2autoconf @@ -81,6 +81,12 @@ /usr/share/YaST2/data/you_layout.ycp %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog +* Thu Jan 31 2008 sh(a)suse.de +- Simplified dialog handling +- V 2.16.13 +* Thu Jan 31 2008 kmachalkova(a)suse.cz +- Align numbers in IntFields to the right margin of the label, not + to the right margin of the entire screen (bnc#309118) * Tue Jan 29 2008 sh(a)suse.de - YCP-less event handling - V 2.16.12 ++++++ yast2-ncurses-2.16.12.tar.bz2 -> yast2-ncurses-2.16.13.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.12/configure new/yast2-ncurses-2.16.13/configure --- old/yast2-ncurses-2.16.12/configure 2008-01-29 20:08:38.000000000 +0100 +++ new/yast2-ncurses-2.16.13/configure 2008-01-31 15:31:49.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-ncurses 2.16.12. +# Generated by GNU Autoconf 2.60 for yast2-ncurses 2.16.13. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses' PACKAGE_TARNAME='yast2-ncurses' -PACKAGE_VERSION='2.16.12' -PACKAGE_STRING='yast2-ncurses 2.16.12' +PACKAGE_VERSION='2.16.13' +PACKAGE_STRING='yast2-ncurses 2.16.13' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1421,7 +1421,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.16.12 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses 2.16.13 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1492,7 +1492,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses 2.16.12:";; + short | recursive ) echo "Configuration of yast2-ncurses 2.16.13:";; esac cat <<\_ACEOF @@ -1600,7 +1600,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses configure 2.16.12 +yast2-ncurses configure 2.16.13 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1614,7 +1614,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.16.12, which was +It was created by yast2-ncurses $as_me 2.16.13, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2415,7 +2415,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses' - VERSION='2.16.12' + VERSION='2.16.13' cat >>confdefs.h <<_ACEOF @@ -2643,7 +2643,7 @@ -VERSION="2.16.12" +VERSION="2.16.13" RPMNAME="yast2-ncurses" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" @@ -21649,7 +21649,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ncurses $as_me 2.16.12, which was +This file was extended by yast2-ncurses $as_me 2.16.13, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21702,7 +21702,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-ncurses config.status 2.16.12 +yast2-ncurses config.status 2.16.13 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.12/configure.in new/yast2-ncurses-2.16.13/configure.in --- old/yast2-ncurses-2.16.12/configure.in 2008-01-29 20:08:23.000000000 +0100 +++ new/yast2-ncurses-2.16.13/configure.in 2008-01-31 15:31:28.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.16.12, http://bugs.opensuse.org/, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.16.13, http://bugs.opensuse.org/, yast2-ncurses) 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.16.12" +VERSION="2.16.13" RPMNAME="yast2-ncurses" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.12/src/NCDialog.cc new/yast2-ncurses-2.16.13/src/NCDialog.cc --- old/yast2-ncurses-2.16.12/src/NCDialog.cc 2008-01-29 11:57:10.000000000 +0100 +++ new/yast2-ncurses-2.16.13/src/NCDialog.cc 2008-01-31 15:22:14.000000000 +0100 @@ -247,6 +247,13 @@ } } + +void NCDialog::openInternal() +{ + showDialog(); +} + + /////////////////////////////////////////////////////////////////// // // @@ -324,6 +331,20 @@ } } + +/** + * Implementation of YDialog::activate(). + * + * This is called e.g. for the next-lower dialog in the dialog stack when the + * topmost dialog is destroyed: That next-lower dialog is now the active + * dialog. + **/ +void NCDialog::activate() +{ + activate( true ); // Forward to NCurses-specific activate() +} + + /////////////////////////////////////////////////////////////////// // // diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.12/src/NCDialog.h new/yast2-ncurses-2.16.13/src/NCDialog.h --- old/yast2-ncurses-2.16.12/src/NCDialog.h 2008-01-16 15:03:50.000000000 +0100 +++ new/yast2-ncurses-2.16.13/src/NCDialog.h 2008-01-31 15:11:32.000000000 +0100 @@ -119,6 +119,20 @@ virtual void startMultipleChanges(); virtual void doneMultipleChanges(); + + /** + * Internal open() method: Initialize what is left over to initialize after + * all dialog children have been created. + * YDialog::setInitialSize() is already called before this in + * YDailog::open(), so don't call it here again (very expensive!). + * + * This function is called (exactly once during the life time of the + * dialog) in YDialog::open(). + * + * Implemented from YDialog. + **/ + virtual void openInternal(); + public: @@ -148,6 +162,14 @@ **/ virtual void setSize( int newWidth, int newHeight ); + /** + * Activate this dialog: Make sure that it is shown as the topmost dialog + * of this application and that it can receive input. + * + * Implemented from YDialog. + **/ + virtual void activate(); + protected: enum NCDopts { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.12/src/NCIntField.cc new/yast2-ncurses-2.16.13/src/NCIntField.cc --- old/yast2-ncurses-2.16.12/src/NCIntField.cc 2007-11-21 16:06:15.000000000 +0100 +++ new/yast2-ncurses-2.16.13/src/NCIntField.cc 2008-01-31 14:51:15.000000000 +0100 @@ -175,7 +175,7 @@ trect.Sze.H, trect.Sze.W, trect.Pos.L, trect.Pos.C, 'r' ); - vstart = ( vlen + 2 < (unsigned)trect.Sze.W ) ? trect.Sze.W - vlen - 2 : 0; + vstart = ( vlen + 2 < (unsigned)trect.Sze.W ) ? label.width() - vlen - 2 : 0; } /////////////////////////////////////////////////////////////////// diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.12/src/YNCursesUI.cc new/yast2-ncurses-2.16.13/src/YNCursesUI.cc --- old/yast2-ncurses-2.16.12/src/YNCursesUI.cc 2008-01-29 20:01:09.000000000 +0100 +++ new/yast2-ncurses-2.16.13/src/YNCursesUI.cc 2008-01-31 15:16:41.000000000 +0100 @@ -307,28 +307,6 @@ return yevent; } -/////////////////////////////////////////////////////////////////// -// -// Dialog and widgets -// -/////////////////////////////////////////////////////////////////// - -void YNCursesUI::showDialog( YDialog * dialog ) { - NCDialog * dlg = dynamic_cast<NCDialog *>( dialog ); - UIDBG << dlg << endl; - if ( dlg ) - { - dlg->showDialog(); - //dlg->dumpWidgetTree(); - } -} - -void YNCursesUI::closeDialog( YDialog * dialog ) { - NCDialog * dlg = dynamic_cast<NCDialog *>( dialog ); - UIDBG << dlg << endl; - if ( dlg ) - dlg->closeDialog(); -} #define ONCREATE WIDDBG << endl //#define ONCREATE diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.12/src/YNCursesUI.h new/yast2-ncurses-2.16.13/src/YNCursesUI.h --- old/yast2-ncurses-2.16.12/src/YNCursesUI.h 2008-01-29 20:01:09.000000000 +0100 +++ new/yast2-ncurses-2.16.13/src/YNCursesUI.h 2008-01-31 15:15:38.000000000 +0100 @@ -122,16 +122,6 @@ virtual YEvent * pollInput(); /** - * Inherited from YUIInterpreter. Shows and activates a dialog - */ - virtual void showDialog( YDialog * dialog ); - - /** - * Inherited from YUIInterpreter. Decativates and closes a dialog - */ - virtual void closeDialog( YDialog * dialog ); - - /** * Fills the PackageSelector widget and runs package selection. */ virtual YEvent * runPkgSelection( YWidget * packageSelector ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ncurses-2.16.12/VERSION new/yast2-ncurses-2.16.13/VERSION --- old/yast2-ncurses-2.16.12/VERSION 2008-01-29 20:04:44.000000000 +0100 +++ new/yast2-ncurses-2.16.13/VERSION 2008-01-31 15:27:43.000000000 +0100 @@ -1 +1 @@ -2.16.12 +2.16.13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-gtk
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-gtk checked in at Fri Feb 1 00:01:12 CET 2008. -------- --- yast2-gtk/yast2-gtk.changes 2008-01-27 21:04:56.000000000 +0100 +++ yast2-gtk/yast2-gtk.changes 2008-01-31 20:11:55.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Jan 31 20:11:40 CET 2008 - coolo(a)suse.de + +- make it compile against latest yast2-core + +------------------------------------------------------------------- Old: ---- yast2-gtk-2.16.1.tar.bz2 New: ---- yast2-gtk-2.16.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-gtk.spec ++++++ --- /var/tmp/diff_new_pack.c31473/_old 2008-02-01 00:00:42.000000000 +0100 +++ /var/tmp/diff_new_pack.c31473/_new 2008-02-01 00:00:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-gtk (Version 2.16.1) +# spec file for package yast2-gtk (Version 2.16.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,17 +12,17 @@ Name: yast2-gtk Url: http://en.opensuse.org/YaST2-GTK -Version: 2.16.1 -Release: 6 +Version: 2.16.2 +Release: 1 License: LGPL v2.1 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-gtk-2.16.1.tar.bz2 +Source0: yast2-gtk-2.16.2.tar.bz2 Prefix: /usr Source2: yast2-gtk-rpmlintrc BuildRequires: blocxx-devel gcc-c++ gtk2-devel libxcrypt-devel libzypp-devel yast2-devtools -BuildRequires: yast2-core-devel >= 2.16.21 -Requires: yast2-core >= 2.16.21 +BuildRequires: yast2-core-devel >= 2.16.25 +Requires: yast2-core >= 2.16.25 Summary: YaST2 - Gtk Graphical User Interface Provides: yast2_ui @@ -38,7 +38,7 @@ Michael Meeks %prep -%setup -n yast2-gtk-2.16.1 +%setup -n yast2-gtk-2.16.2 %build %{prefix}/bin/y2tool y2autoconf @@ -67,15 +67,16 @@ %doc %{prefix}/share/doc/packages/yast2-gtk %{_libdir}/YaST2/plugin/libpy2gtk.so.* %{_libdir}/YaST2/plugin/libpy2gtk.so - %changelog +* Thu Jan 31 2008 coolo(a)suse.de +- make it compile against latest yast2-core * Sun Jan 27 2008 coolo(a)suse.de - fix changelog * Fri Jan 18 2008 coolo(a)suse.de - Ricardo fixed make test * Wed Jan 16 2008 coolo(a)suse.de - update to latest yast2-core API -* Fri Jan 11 2008 btimothy(a)suse.de +* Sat Jan 12 2008 btimothy(a)suse.de - Updating the tarball directly from SVN Trunk revision to be version 2.15.9r43566 so the package won't fail to build anymore. - Removed all the old patches since they are no longer necessary ++++++ yast2-gtk-2.16.1.tar.bz2 -> yast2-gtk-2.16.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/ChangeLog new/yast2-gtk-2.16.2/ChangeLog --- old/yast2-gtk-2.16.1/ChangeLog 2008-01-18 10:33:30.000000000 +0100 +++ new/yast2-gtk-2.16.2/ChangeLog 2008-01-27 21:04:06.000000000 +0100 @@ -1,3 +1,14 @@ +2008-01-24 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGDumbTab.cc: bug fix: honor tab default flag. + + * src/YGCheckBoxFrame.cc: bug fix: setEnabling() is now setEnabled(). + +2008-01-21 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkfindentry.c: bug fix: clear icon hidden on delete, and not shown + on some cases (see the selector). + 2008-01-17 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg-selector-help.h: added help to package selector. Thanks to diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGDialog.cc new/yast2-gtk-2.16.2/src/YGDialog.cc --- old/yast2-gtk-2.16.1/src/YGDialog.cc 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.2/src/YGDialog.cc 2008-01-31 20:10:18.000000000 +0100 @@ -421,3 +421,24 @@ return new YGDialog (dialogType, colorMode); } +void +YGDialog::openInternal() +{ +#if 0 + ensureOnlyOneDefaultButton(); + QWidget::show(); + QWidget::raise(); // FIXME: is this really necessary? + QWidget::update(); +#endif +} + + +void +YGDialog::activate() +{ +#if 0 + QWidget::raise(); + QWidget::update(); +#endif +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGDialog.h new/yast2-gtk-2.16.2/src/YGDialog.h --- old/yast2-gtk-2.16.1/src/YGDialog.h 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.2/src/YGDialog.h 2008-01-31 20:07:18.000000000 +0100 @@ -33,6 +33,9 @@ virtual int preferredWidth() { return 0; } virtual int preferredHeight() { return 0; } + virtual void activate(); + virtual void openInternal(); + YGWIDGET_IMPL_CHILD_ADDED (m_containee) YGWIDGET_IMPL_CHILD_REMOVED (m_containee) }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGDumbTab.cc new/yast2-gtk-2.16.2/src/YGDumbTab.cc --- old/yast2-gtk-2.16.1/src/YGDumbTab.cc 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.2/src/YGDumbTab.cc 2008-01-27 21:04:06.000000000 +0100 @@ -76,9 +76,7 @@ g_object_set_data (G_OBJECT (page), "yitem", item); gtk_notebook_append_page (notebook, page, tab_label); - - if (!m_last_tab) /*first tab*/ - syncTabPage(); + selectItem (item, item->selected() || !m_last_tab /*first tab*/); g_signal_handlers_unblock_by_func (notebook, (gpointer) changed_tab_cb, this); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGFrame.cc new/yast2-gtk-2.16.2/src/YGFrame.cc --- old/yast2-gtk-2.16.1/src/YGFrame.cc 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.2/src/YGFrame.cc 2008-01-27 21:04:06.000000000 +0100 @@ -51,21 +51,12 @@ virtual ~YGFrame() {} // YFrame - virtual void setLabel (const string &_str) + virtual void setLabel (const string &str) { IMPL - /* Get rid of mnemonics; makes no sense here. */ - size_t length = _str.length(); - string str; - str.reserve (length); - for (size_t i = 0; i < length; i++) - if (_str[i] != '&') - str += _str[i]; - GtkWidget *label = gtk_frame_get_label_widget (GTK_FRAME (getWidget())); gtk_label_set_text (GTK_LABEL (label), str.c_str()); - - YFrame::setLabel (_str); + YFrame::setLabel (str); } YGWIDGET_IMPL_COMMON @@ -126,8 +117,9 @@ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), value); } - virtual void setEnabling (bool enabled) + virtual void setEnabled (bool enabled) { + GtkWidget *frame = getWidget(); if (enabled) { gtk_widget_set_sensitive (frame, TRUE); @@ -137,6 +129,7 @@ gtk_widget_set_sensitive (frame, FALSE); YWidget::setChildrenEnabled (false); } + YWidget::setEnabled (enabled); } YGWIDGET_IMPL_CHILD_ADDED (m_containee) @@ -145,7 +138,7 @@ private: static void toggled_cb (GtkWidget *widget, YGCheckBoxFrame *pThis) { - pThis->setEnabling (true); + pThis->setEnabled (true); if (pThis->notify()) YGUI::ui()->sendEvent (new YWidgetEvent (pThis, YEvent::ValueChanged)); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGMultiLineEdit.cc new/yast2-gtk-2.16.2/src/YGMultiLineEdit.cc --- old/yast2-gtk-2.16.1/src/YGMultiLineEdit.cc 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.2/src/YGMultiLineEdit.cc 2008-01-31 20:07:57.000000000 +0100 @@ -216,7 +216,7 @@ static void link_clicked_cb (GtkWidget *widget, const char *url, YGRichText *pThis) { - YGUI::ui()->sendEvent (new YMenuEvent (YCPString (url))); + YGUI::ui()->sendEvent (new YMenuEvent (url)); } YGWIDGET_IMPL_COMMON diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGPackageSelector.cc new/yast2-gtk-2.16.2/src/YGPackageSelector.cc --- old/yast2-gtk-2.16.1/src/YGPackageSelector.cc 2008-01-18 10:33:30.000000000 +0100 +++ new/yast2-gtk-2.16.2/src/YGPackageSelector.cc 2008-01-31 20:08:37.000000000 +0100 @@ -1651,7 +1651,7 @@ if (!strcmp (action, "accept")) { y2milestone ("Closing PackageSelector with 'accept'"); - YGUI::ui()->sendEvent (new YMenuEvent (YCPSymbol ("accept"))); + YGUI::ui()->sendEvent (new YMenuEvent ("accept")); } else if (!strcmp (action, "cancel")) { y2milestone ("Closing PackageSelector with 'cancel'"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/ygtkfindentry.c new/yast2-gtk-2.16.2/src/ygtkfindentry.c --- old/yast2-gtk-2.16.1/src/ygtkfindentry.c 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.2/src/ygtkfindentry.c 2008-01-27 21:04:06.000000000 +0100 @@ -28,7 +28,6 @@ { if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget)) { GTK_WIDGET_CLASS (ygtk_ext_entry_parent_class)->map (widget); - YGtkExtEntry *entry = YGTK_EXT_ENTRY (widget); if (entry->left_window) gdk_window_show (entry->left_window); @@ -167,11 +166,13 @@ { GTK_WIDGET_CLASS (ygtk_ext_entry_parent_class)->size_request (widget, req); +#if 0 YGtkExtEntry *entry = YGTK_EXT_ENTRY (widget); req->width += ygtk_ext_entry_get_border_window_size (entry, YGTK_EXT_ENTRY_LEFT_WIN); req->width += ygtk_ext_entry_get_border_window_size (entry, YGTK_EXT_ENTRY_RIGHT_WIN); +#endif } static void ygtk_ext_entry_size_allocate (GtkWidget *widget, @@ -452,16 +453,26 @@ return TRUE; } +static gboolean ygtk_find_entry_is_empty (YGtkFindEntry *entry) +{ + return *gtk_entry_get_text (GTK_ENTRY (entry)) == '\0'; +} + static void ygtk_find_entry_insert_text (GtkEditable *editable, const gchar *new_text, gint new_text_len, gint *pos) { + YGtkFindEntry *fentry = YGTK_FIND_ENTRY (editable); + gboolean empty = ygtk_find_entry_is_empty (fentry); + GtkEditableClass *parent_editable_iface = g_type_interface_peek (ygtk_find_entry_parent_class, GTK_TYPE_EDITABLE); parent_editable_iface->insert_text (editable, new_text, new_text_len, pos); - GdkWindow *clear_win = YGTK_EXT_ENTRY (editable)->right_window; - if (clear_win) + GdkWindow *clear_win = YGTK_EXT_ENTRY (fentry)->right_window; + if (empty && clear_win) { gdk_window_show (clear_win); + gtk_widget_queue_resize (GTK_WIDGET (editable)); + } } static void ygtk_find_entry_delete_text (GtkEditable *editable, gint start_pos, @@ -471,9 +482,13 @@ (ygtk_find_entry_parent_class, GTK_TYPE_EDITABLE); parent_editable_iface->delete_text (editable, start_pos, end_pos); - GdkWindow *clear_win = YGTK_EXT_ENTRY (editable)->right_window; - if (clear_win) + YGtkFindEntry *fentry = YGTK_FIND_ENTRY (editable); + gboolean empty = ygtk_find_entry_is_empty (fentry); + GdkWindow *clear_win = YGTK_EXT_ENTRY (fentry)->right_window; + if (empty && clear_win) { gdk_window_hide (clear_win); + gtk_widget_queue_resize (GTK_WIDGET (editable)); + } } void ygtk_find_entry_attach_menu (YGtkFindEntry *entry, GtkMenu *menu) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGUI.cc new/yast2-gtk-2.16.2/src/YGUI.cc --- old/yast2-gtk-2.16.1/src/YGUI.cc 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.2/src/YGUI.cc 2008-01-31 20:06:29.000000000 +0100 @@ -297,13 +297,16 @@ dialog->normalCursor(); } -YCPValue YGUI::runPkgSelection (YWidget *packageSelector) +YEvent* YGUI::runPkgSelection (YWidget *packageSelector) { y2milestone( "Running package selection..." ); - YCPValue input = YCPVoid(); + YEvent *event = 0; try { - input = evaluateUserInput(); + do + { + event = filterInvalidEvents( userInput(0) ); + } while ( ! event ); } catch (const std::exception &e) { y2error ("UI::RunPkgSelection() error: %s", e.what()); y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); @@ -312,8 +315,8 @@ y2error( "This is a libzypp problem. Do not file a bug against the UI!" ); } - y2milestone ("Package selection done - returning %s", input->toString().c_str()); - return input; + // y2milestone ("Package selection done - returning %s", input->toString().c_str()); + return event; } void YGUI::makeScreenShot (string filename) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGUI.h new/yast2-gtk-2.16.2/src/YGUI.h --- old/yast2-gtk-2.16.1/src/YGUI.h 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.2/src/YGUI.h 2008-01-31 20:03:38.000000000 +0100 @@ -85,7 +85,7 @@ virtual void makeScreenShot (string filename); virtual void beep(); - virtual YCPValue runPkgSelection (YWidget *packageSelector); + virtual YEvent * runPkgSelection (YWidget *packageSelector); void toggleRecordMacro(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/src/YGUtils.cc new/yast2-gtk-2.16.2/src/YGUtils.cc --- old/yast2-gtk-2.16.1/src/YGUtils.cc 2008-01-16 14:36:27.000000000 +0100 +++ new/yast2-gtk-2.16.2/src/YGUtils.cc 2008-01-27 21:04:06.000000000 +0100 @@ -438,6 +438,7 @@ {"Abort", GTK_STOCK_CANCEL }, {"Accept", GTK_STOCK_APPLY }, {"Add", GTK_STOCK_ADD }, + {"Apply", GTK_STOCK_APPLY }, {"Back", GTK_STOCK_GO_BACK }, {"Cancel", GTK_STOCK_CANCEL }, {"Configure", GTK_STOCK_PREFERENCES }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-gtk-2.16.1/VERSION new/yast2-gtk-2.16.2/VERSION --- old/yast2-gtk-2.16.1/VERSION 2008-01-16 14:36:51.000000000 +0100 +++ new/yast2-gtk-2.16.2/VERSION 2008-01-31 20:12:09.000000000 +0100 @@ -1 +1 @@ -2.16.1 +2.16.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-bootloader
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-bootloader checked in at Thu Jan 31 23:59:18 CET 2008. -------- --- yast2-bootloader/yast2-bootloader.changes 2008-01-24 14:10:48.000000000 +0100 +++ yast2-bootloader/yast2-bootloader.changes 2008-01-31 13:08:06.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Jan 31 13:03:52 CET 2008 - locilka(a)suse.cz + +- Update::*version were moved to Installation::*version. +- 2.16.5 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.16.4.tar.bz2 New: ---- yast2-bootloader-2.16.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.i26078/_old 2008-01-31 23:57:51.000000000 +0100 +++ /var/tmp/diff_new_pack.i26078/_new 2008-01-31 23:57:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.16.4) +# spec file for package yast2-bootloader (Version 2.16.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.16.4 +Version: 2.16.5 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.16.4.tar.bz2 +Source0: yast2-bootloader-2.16.5.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-perl perl-Bootloader perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devtools yast2-installation yast2-perl-bindings yast2-storage yast2-testsuite # to eliminate a cyclic dependency in autobuild: @@ -51,7 +51,7 @@ Daniel Fiser %prep -%setup -n yast2-bootloader-2.16.4 +%setup -n yast2-bootloader-2.16.5 %build %{prefix}/bin/y2tool y2autoconf @@ -95,6 +95,9 @@ /var/adm/fillup-templates/* /usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %changelog +* Thu Jan 31 2008 locilka(a)suse.cz +- Update::*version were moved to Installation::*version. +- 2.16.5 * Thu Jan 24 2008 juhliarik(a)suse.cz - added patch for Bug#352020 - Graphical failsafe mode - added support for Fate#300779: Install diskless client (NFS-root) @@ -439,7 +442,7 @@ - 2.15.4 * Wed Jan 17 2007 jplack(a)suse.de - revise efi boot manager entry handling (#233537) -* Tue Jan 16 2007 jplack(a)suse.de +* Wed Jan 17 2007 jplack(a)suse.de - fix various zipl configuration problems (#235486) * Mon Jan 15 2007 jplack(a)suse.de - more stream lining in help messages @@ -889,7 +892,7 @@ - reorder code so that new function SetDiskInfo is formed and can be used in various places to fix #161755 - add proposed code change for virtual 'boot' mountpoints (#162242) -* Sat Apr 01 2006 od(a)suse.de +* Sun Apr 02 2006 od(a)suse.de - added TESTME comment: test parted partition activation with BSD slices - remove more old-style backticks @@ -919,7 +922,7 @@ - fixed #157939: iseries can boot even if no prep boot partition exists and/or is configured - 2.13.31 -* Mon Mar 20 2006 od(a)suse.de +* Tue Mar 21 2006 od(a)suse.de - package clients/print-product.ycp - 2.13.30 * Mon Mar 20 2006 od(a)suse.de @@ -938,7 +941,7 @@ - fix indentation/code style - print-product.ycp was wrong in modules, moved to clients - 2.13.28 -* Fri Mar 17 2006 od(a)suse.de +* Sat Mar 18 2006 od(a)suse.de - made text widget in error log message popup higher (#159264) - fix indentation - 2.13.27 @@ -1882,7 +1885,7 @@ * Fri Sep 19 2003 jsrain(a)suse.de - fixed testsuite (again) - 2.8.21 -* Thu Sep 18 2003 nashif(a)suse.de +* Fri Sep 19 2003 nashif(a)suse.de - Fixed testsuite - 2.8.20 * Thu Sep 18 2003 jsrain(a)suse.de @@ -2431,7 +2434,7 @@ - if no boot message exists not including in menu.lst (Bug #18381) - fixed ordering of list of kernel images / other partitions - 2.6.30 -* Mon Aug 26 2002 nashif(a)suse.de +* Tue Aug 27 2002 nashif(a)suse.de - do not reset location value in autoinst mode - if location is not empty, configure boot device in autoinst mode (Avoid calling ConfigureLocation) ++++++ yast2-bootloader-2.16.4.tar.bz2 -> yast2-bootloader-2.16.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.4/configure new/yast2-bootloader-2.16.5/configure --- old/yast2-bootloader-2.16.4/configure 2008-01-24 09:29:30.000000000 +0100 +++ new/yast2-bootloader-2.16.5/configure 2008-01-31 13:10:00.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-bootloader 2.16.4. +# Generated by GNU Autoconf 2.61 for yast2-bootloader 2.16.5. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -728,8 +728,8 @@ # Identity of this package. PACKAGE_NAME='yast2-bootloader' PACKAGE_TARNAME='yast2-bootloader' -PACKAGE_VERSION='2.16.4' -PACKAGE_STRING='yast2-bootloader 2.16.4' +PACKAGE_VERSION='2.16.5' +PACKAGE_STRING='yast2-bootloader 2.16.5' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1446,7 +1446,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-bootloader 2.16.4 to adapt to many kinds of systems. +\`configure' configures yast2-bootloader 2.16.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1517,7 +1517,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-bootloader 2.16.4:";; + short | recursive ) echo "Configuration of yast2-bootloader 2.16.5:";; esac cat <<\_ACEOF @@ -1623,7 +1623,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-bootloader configure 2.16.4 +yast2-bootloader configure 2.16.5 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1637,7 +1637,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-bootloader $as_me 2.16.4, which was +It was created by yast2-bootloader $as_me 2.16.5, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2458,7 +2458,7 @@ # Define the identity of the package. PACKAGE='yast2-bootloader' - VERSION='2.16.4' + VERSION='2.16.5' cat >>confdefs.h <<_ACEOF @@ -2686,7 +2686,7 @@ -VERSION="2.16.4" +VERSION="2.16.5" RPMNAME="yast2-bootloader" MAINTAINER="Olaf Dabrunz <od(a)suse.de>" @@ -21105,7 +21105,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-bootloader $as_me 2.16.4, which was +This file was extended by yast2-bootloader $as_me 2.16.5, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21158,7 +21158,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-bootloader config.status 2.16.4 +yast2-bootloader config.status 2.16.5 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.4/configure.in new/yast2-bootloader-2.16.5/configure.in --- old/yast2-bootloader-2.16.4/configure.in 2008-01-24 09:29:17.000000000 +0100 +++ new/yast2-bootloader-2.16.5/configure.in 2008-01-31 13:09:45.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-bootloader, 2.16.4, http://bugs.opensuse.org/, yast2-bootloader) +AC_INIT(yast2-bootloader, 2.16.5, http://bugs.opensuse.org/, yast2-bootloader) 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.16.4" +VERSION="2.16.5" RPMNAME="yast2-bootloader" MAINTAINER="Olaf Dabrunz <od(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.4/Makefile.in new/yast2-bootloader-2.16.5/Makefile.in --- old/yast2-bootloader-2.16.4/Makefile.in 2008-01-24 09:29:34.000000000 +0100 +++ new/yast2-bootloader-2.16.5/Makefile.in 2008-01-31 13:10:04.000000000 +0100 @@ -564,6 +564,10 @@ tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -590,6 +594,8 @@ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -747,20 +753,21 @@ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkgconfigDATA \ - install-pkgconfigdataDATA install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-pkgconfigDATA uninstall-pkgconfigdataDATA + dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-zip \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-pkgconfigDATA install-pkgconfigdataDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-pkgconfigDATA \ + uninstall-pkgconfigdataDATA Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.4/src/clients/bootloader_finish.ycp new/yast2-bootloader-2.16.5/src/clients/bootloader_finish.ycp --- old/yast2-bootloader-2.16.4/src/clients/bootloader_finish.ycp 2008-01-24 14:10:21.000000000 +0100 +++ new/yast2-bootloader-2.16.5/src/clients/bootloader_finish.ycp 2008-01-31 13:04:31.000000000 +0100 @@ -9,7 +9,7 @@ * Jiri Srain <jsrain(a)suse.cz> * Olaf Dabrunz <od(a)suse.de> * - * $Id: bootloader_finish.ycp 43872 2008-01-24 13:09:12Z juhliarik $ + * $Id: bootloader_finish.ycp 44050 2008-01-31 12:04:30Z locilka $ * */ @@ -165,8 +165,8 @@ else { retcode = Bootloader::Update ( - Update::installedVersion, - Update::updateVersion); + Installation::installedVersion, + Installation::updateVersion); } if (retcode) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.16.4/VERSION new/yast2-bootloader-2.16.5/VERSION --- old/yast2-bootloader-2.16.4/VERSION 2008-01-24 09:05:55.000000000 +0100 +++ new/yast2-bootloader-2.16.5/VERSION 2008-01-31 13:07:54.000000000 +0100 @@ -1 +1 @@ -2.16.4 +2.16.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation
by root＠Hilbert.suse.de 31 Jan '08

31 Jan '08

Hello community, here is the log from the commit of package yast2-installation checked in at Thu Jan 31 23:56:48 CET 2008. -------- --- yast2-installation/yast2-installation.changes 2008-01-31 12:59:12.000000000 +0100 +++ yast2-installation/yast2-installation.changes 2008-01-31 19:24:42.567970000 +0100 @@ -1,0 +2,11 @@ +Thu Jan 31 19:05:49 CET 2008 - aschnell(a)suse.de + +- reflect init-script rename from suse-blinux to sbl +- 2.16.15 + +------------------------------------------------------------------- +Thu Jan 31 15:02:56 CET 2008 - jsuchome(a)suse.cz + +- call users_finish.ycp from inst_finish.ycp (FATE #302980) + +------------------------------------------------------------------- Old: ---- yast2-installation-2.16.14.tar.bz2 New: ---- yast2-installation-2.16.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.B17299/_old 2008-01-31 23:53:27.000000000 +0100 +++ /var/tmp/diff_new_pack.B17299/_new 2008-01-31 23:53:27.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.16.14) +# spec file for package yast2-installation (Version 2.16.15) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-installation -Version: 2.16.14 +Version: 2.16.15 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.16.14.tar.bz2 +Source0: yast2-installation-2.16.15.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # Mode::live_installation @@ -71,12 +71,12 @@ Summary: YaST2 - Installation Parts %package devel-doc -Version: 2.16.14 +Version: 2.16.15 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.16.14.tar.bz2 +Source0: yast2-installation-2.16.15.tar.bz2 Prefix: /usr Requires: yast2-installation >= 2.15.34 PreReq: %fillup_prereq @@ -109,7 +109,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.16.14 +%setup -n yast2-installation-2.16.15 %build %{prefix}/bin/y2tool y2autoconf @@ -174,7 +174,13 @@ %doc %{prefix}/share/doc/packages/yast2-installation %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README + %changelog +* Thu Jan 31 2008 aschnell(a)suse.de +- reflect init-script rename from suse-blinux to sbl +- 2.16.15 +* Thu Jan 31 2008 jsuchome(a)suse.cz +- call users_finish.ycp from inst_finish.ycp (FATE #302980) * Thu Jan 31 2008 locilka(a)suse.cz - Fixed inst_restore_settings client: NetworkDevices are now NetworkInterfaces. ++++++ yast2-installation-2.16.14.tar.bz2 -> yast2-installation-2.16.15.tar.bz2 ++++++ ++++ 2629 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-installation-2.16.14/configure.in new/yast2-installation-2.16.15/configure.in --- old/yast2-installation-2.16.14/configure.in 2008-01-14 13:56:46.000000000 +0100 +++ new/yast2-installation-2.16.15/configure.in 2008-01-31 19:07:45.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-installation dnl -dnl -- This file is generated by y2autoconf 2.16.2 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.16.9, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.16.15, http://bugs.opensuse.org/, yast2-installation) 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.16.9" +VERSION="2.16.15" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" 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-installation-2.16.14/src/clients/inst_finish.ycp new/yast2-installation-2.16.15/src/clients/inst_finish.ycp --- old/yast2-installation-2.16.14/src/clients/inst_finish.ycp 2007-11-23 13:43:34.000000000 +0100 +++ new/yast2-installation-2.16.15/src/clients/inst_finish.ycp 2008-01-31 17:12:16.000000000 +0100 @@ -6,7 +6,7 @@ * Arvin Schnell <arvin(a)suse.de> * Jiri Srain <jsrain(a)suse.de> * - * $Id: inst_finish.ycp 42361 2007-11-23 12:43:34Z locilka $ + * $Id: inst_finish.ycp 44068 2008-01-31 14:03:59Z jsuchome $ * * Writes: * [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot @@ -82,6 +82,7 @@ "ntp-client", "ssh_settings", "save_hw_status", + "users", "autoinst_scripts2", ], ], 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-installation-2.16.14/startup/YaST2.call new/yast2-installation-2.16.15/startup/YaST2.call --- old/yast2-installation-2.16.14/startup/YaST2.call 2008-01-31 10:50:12.000000000 +0100 +++ new/yast2-installation-2.16.15/startup/YaST2.call 2008-01-31 19:07:42.000000000 +0100 @@ -21,7 +21,7 @@ # : which is the same as the NCURSES mode # : - VNC Installation via browser # : -# STATUS : $Id: YaST2.call 44017 2008-01-30 14:25:39Z aschnell $ +# STATUS : $Id: YaST2.call 44083 2008-01-31 18:07:41Z aschnell $ #---------------- # #set -x @@ -315,7 +315,7 @@ >/tmp/suse-blinux.conf mv -f /tmp/suse-blinux.conf /etc /etc/init.d/brld start - /etc/init.d/suse-blinux start + /etc/init.d/sbl start fi fi #============================================= 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-installation-2.16.14/VERSION new/yast2-installation-2.16.15/VERSION --- old/yast2-installation-2.16.14/VERSION 2008-01-31 12:58:32.000000000 +0100 +++ new/yast2-installation-2.16.15/VERSION 2008-01-31 19:07:12.000000000 +0100 @@ -1 +1 @@ -2.16.14 +2.16.15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0