October 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-qt
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package yast2-qt checked in at Tue Oct 31 18:16:16 CET 2006. -------- --- yast2-qt/yast2-qt.changes 2006-10-30 18:22:40.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-qt/yast2-qt.changes 2006-10-31 18:13:35.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Oct 31 17:32:00 CET 2006 - sh(a)suse.de + +- Improved bugfix for bug #183735 (display only relevant patches + by default): Also display patches that are satisfied, but + not installed yet + +- Fixed bug #189134: Show description of initial patch / pkg + +- Override patch category tooltips with "Dependencies broken" or + "Dependencies satisfied" in patch list + +- V 2.13.73 + +------------------------------------------------------------------- Old: ---- yast2-qt-2.13.72.tar.bz2 New: ---- yast2-qt-2.13.73.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-qt.spec ++++++ --- /var/tmp/diff_new_pack.LXEydR/_old 2006-10-31 18:16:08.000000000 +0100 +++ /var/tmp/diff_new_pack.LXEydR/_new 2006-10-31 18:16:08.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-qt (Version 2.13.72) +# spec file for package yast2-qt (Version 2.13.73) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-qt -Version: 2.13.72 +Version: 2.13.73 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-qt-2.13.72.tar.bz2 +Source0: yast2-qt-2.13.73.tar.bz2 prefix: /usr BuildRequires: boost-devel curl-devel dbus-1-devel docbook-xsl-stylesheets doxygen hal-devel libdrm-devel libjpeg-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer qt3-devel rpm-devel sgml-skel update-desktop-files yast2-core-devel yast2-devtools Summary: YaST2 - Graphical User Interface @@ -42,7 +42,7 @@ Stefan Hundhammer <sh(a)suse.de> %prep -%setup -n yast2-qt-2.13.72 +%setup -n yast2-qt-2.13.73 %build %{prefix}/bin/y2tool y2autoconf @@ -85,6 +85,14 @@ %doc %{prefix}/share/doc/packages/yast2-qt %changelog -n yast2-qt +* Tue Oct 31 2006 - sh(a)suse.de +- Improved bugfix for bug #183735 (display only relevant patches + by default): Also display patches that are satisfied, but + not installed yet +- Fixed bug #189134: Show description of initial patch / pkg +- Override patch category tooltips with "Dependencies broken" or + "Dependencies satisfied" in patch list +- V 2.13.73 * Mon Oct 30 2006 - sh(a)suse.de - Consistent handling of isSatisfied and isBroken for bug #173488 - Added real "isSatisfied" icon ++++++ yast2-qt-2.13.72.tar.bz2 -> yast2-qt-2.13.73.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.72/VERSION new/yast2-qt-2.13.73/VERSION --- old/yast2-qt-2.13.72/VERSION 2006-10-30 18:11:47.000000000 +0100 +++ new/yast2-qt-2.13.73/VERSION 2006-10-31 17:31:56.000000000 +0100 @@ -1 +1 @@ -2.13.72 +2.13.73 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.72/configure new/yast2-qt-2.13.73/configure --- old/yast2-qt-2.13.72/configure 2006-10-27 13:44:48.000000000 +0200 +++ new/yast2-qt-2.13.73/configure 2006-10-31 17:38:51.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2-qt 2.13.71. +# Generated by GNU Autoconf 2.59 for yast2-qt 2.13.73. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -423,8 +423,8 @@ # Identity of this package. PACKAGE_NAME='yast2-qt' PACKAGE_TARNAME='yast2-qt' -PACKAGE_VERSION='2.13.71' -PACKAGE_STRING='yast2-qt 2.13.71' +PACKAGE_VERSION='2.13.73' +PACKAGE_STRING='yast2-qt 2.13.73' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -971,7 +971,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-qt 2.13.71 to adapt to many kinds of systems. +\`configure' configures yast2-qt 2.13.73 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1042,7 +1042,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-qt 2.13.71:";; + short | recursive ) echo "Configuration of yast2-qt 2.13.73:";; esac cat <<\_ACEOF @@ -1191,7 +1191,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-qt configure 2.13.71 +yast2-qt configure 2.13.73 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1205,7 +1205,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-qt $as_me 2.13.71, which was +It was created by yast2-qt $as_me 2.13.73, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1935,7 +1935,7 @@ # Define the identity of the package. PACKAGE='yast2-qt' - VERSION='2.13.71' + VERSION='2.13.73' cat >>confdefs.h <<_ACEOF @@ -2146,7 +2146,7 @@ -VERSION="2.13.71" +VERSION="2.13.73" RPMNAME="yast2-qt" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" @@ -20508,7 +20508,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-qt $as_me 2.13.71, which was +This file was extended by yast2-qt $as_me 2.13.73, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20571,7 +20571,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-qt config.status 2.13.71 +yast2-qt config.status 2.13.73 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.72/configure.in new/yast2-qt-2.13.73/configure.in --- old/yast2-qt-2.13.72/configure.in 2006-10-27 13:44:33.000000000 +0200 +++ new/yast2-qt-2.13.73/configure.in 2006-10-31 17:38:36.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-qt, 2.13.71, http://bugs.opensuse.org/, yast2-qt) +AC_INIT(yast2-qt, 2.13.73, http://bugs.opensuse.org/, yast2-qt) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.71" +VERSION="2.13.73" RPMNAME="yast2-qt" MAINTAINER="Stefan Hundhammer <sh(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.72/src/YQPkgPatchList.cc new/yast2-qt-2.13.73/src/YQPkgPatchList.cc --- old/yast2-qt-2.13.72/src/YQPkgPatchList.cc 2006-10-26 18:55:56.000000000 +0200 +++ new/yast2-qt-2.13.73/src/YQPkgPatchList.cc 2006-10-31 17:15:47.000000000 +0100 @@ -71,7 +71,6 @@ setSorting( categoryCol() ); fillList(); - selectSomething(); y2debug( "Creating patch list done" ); } @@ -84,6 +83,18 @@ void +YQPkgPatchList::polish() +{ + // Delayed initialization after widget is fully created etc. + + // Only now send selectionChanged() signal so attached details views also + // display something if their showDetailsIfVisible() slot is connected to + // selectionChanged() signals. + selectSomething(); +} + + +void YQPkgPatchList::setFilterCriteria( FilterCriteria filterCriteria ) { _filterCriteria = filterCriteria; @@ -126,7 +137,10 @@ } else // not installed - display only if needed { - if ( selectable->candidatePoolItem().status().isNeeded() ) + zypp::ResStatus candidateStatus = selectable->candidatePoolItem().status(); + + if ( candidateStatus.isNeeded() || + candidateStatus.isSatisfied() ) { displayPatch = true; } @@ -147,7 +161,10 @@ } else // not installed - display only if needed { - if ( selectable->candidatePoolItem().status().isNeeded() ) + zypp::ResStatus candidateStatus = selectable->candidatePoolItem().status(); + + if ( candidateStatus.isNeeded() || + candidateStatus.isSatisfied() ) { displayPatch = true; } @@ -494,12 +511,20 @@ } else { - text = fromUTF8( zyppPatch()->category() ); + if ( ( col == brokenIconCol() && isBroken() ) || + ( col == satisfiedIconCol() && isSatisfied() ) ) + { + text = YQPkgObjListItem::toolTip( col ); + } + else + { + text = fromUTF8( zyppPatch()->category() ); - if ( ! text.isEmpty() ) - text += "\n"; + if ( ! text.isEmpty() ) + text += "\n"; - text += fromUTF8( zyppPatch()->size().asString().c_str() ); + text += fromUTF8( zyppPatch()->size().asString().c_str() ); + } } return text; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.72/src/include/YQPkgPatchList.h new/yast2-qt-2.13.73/src/include/YQPkgPatchList.h --- old/yast2-qt-2.13.72/src/include/YQPkgPatchList.h 2006-10-26 17:56:28.000000000 +0200 +++ new/yast2-qt-2.13.73/src/include/YQPkgPatchList.h 2006-10-31 17:16:42.000000000 +0100 @@ -140,6 +140,13 @@ **/ virtual QPopupMenu * addAllInListSubMenu( QPopupMenu * menu ); + /** + * Delayed initialization after the dialog is fully created. + * + * Reimplemented from QWidget. + **/ + virtual void polish(); + signals: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-qt-2.13.72/src/include/YQPkgProductDialog.h new/yast2-qt-2.13.73/src/include/YQPkgProductDialog.h --- old/yast2-qt-2.13.72/src/include/YQPkgProductDialog.h 2006-10-24 18:25:05.000000000 +0200 +++ new/yast2-qt-2.13.73/src/include/YQPkgProductDialog.h 2006-10-31 17:16:47.000000000 +0100 @@ -52,9 +52,9 @@ virtual QSize sizeHint () const; /** - * Delayed initialization after the dialog is fully created + * Delayed initialization after the dialog is fully created. * - * Reimplemented from QWidget + * Reimplemented from QWidget. **/ virtual void polish(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package yast2-core checked in at Tue Oct 31 18:15:58 CET 2006. -------- --- yast2-core/yast2-core.changes 2006-10-23 10:34:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2006-10-31 16:58:12.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Oct 31 16:50:39 CET 2006 - mvidner(a)suse.cz + +- ini-agent: use C locale when building regular expressions so that + A-Z works for Estonian (#177560). +- 2.14.4 + +------------------------------------------------------------------- Old: ---- yast2-core-2.14.3.tar.bz2 New: ---- yast2-core-2.14.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-core.spec ++++++ --- /var/tmp/diff_new_pack.E0Y6KA/_old 2006-10-31 18:15:35.000000000 +0100 +++ /var/tmp/diff_new_pack.E0Y6KA/_new 2006-10-31 18:15:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-core (Version 2.14.3) +# spec file for package yast2-core (Version 2.14.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-core -Version: 2.14.3 +Version: 2.14.4 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-core-2.14.3.tar.bz2 +Source0: yast2-core-2.14.4.tar.bz2 prefix: /usr # obviously BuildRequires: gcc-c++ @@ -114,7 +114,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-core-2.14.3 +%setup -n yast2-core-2.14.4 %build %{prefix}/bin/y2tool y2autoconf @@ -186,6 +186,10 @@ /usr/share/YaST2/data/devtools/bin/generateYCPWrappers %changelog -n yast2-core +* Tue Oct 31 2006 - mvidner(a)suse.cz +- ini-agent: use C locale when building regular expressions so that + A-Z works for Estonian (#177560). +- 2.14.4 * Mon Oct 23 2006 - mvidner(a)suse.cz - Worked around building with doxygen 1.5.0 by not including liby2util.tag. ++++++ yast2-core-2.14.3.tar.bz2 -> yast2-core-2.14.4.tar.bz2 ++++++ ++++ 1830 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-core-2.14.3/Makefile.am new/yast2-core-2.14.4/Makefile.am --- old/yast2-core-2.14.3/Makefile.am 2006-10-23 10:35:06.000000000 +0200 +++ new/yast2-core-2.14.4/Makefile.am 2006-10-31 16:58:36.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common 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-core-2.14.3/VERSION new/yast2-core-2.14.4/VERSION --- old/yast2-core-2.14.3/VERSION 2006-10-23 10:32:24.000000000 +0200 +++ new/yast2-core-2.14.4/VERSION 2006-10-31 16:49:26.000000000 +0100 @@ -1 +1 @@ -2.14.3 +2.14.4 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-core-2.14.3/agent-ini/src/IniParser.cc new/yast2-core-2.14.4/agent-ini/src/IniParser.cc --- old/yast2-core-2.14.3/agent-ini/src/IniParser.cc 2006-09-19 14:20:01.000000000 +0200 +++ new/yast2-core-2.14.4/agent-ini/src/IniParser.cc 2006-10-31 16:58:23.000000000 +0100 @@ -8,7 +8,7 @@ * Petr Blahos <pblahos(a)suse.cz> * Martin Vidner <mvidner(a)suse.cz> * - * $Id: IniParser.cc 32969 2006-09-19 12:21:30Z mvidner $ + * $Id: IniParser.cc 33951 2006-10-31 15:58:21Z mvidner $ */ #include "config.h" @@ -28,6 +28,30 @@ IMPL_BASE_POINTER (Regex_t); + +TemporaryLocale::TemporaryLocale (int category, const char * locale) { + _category = category; + _oldlocale = my_setlocale (_category, NULL); + if (_oldlocale != NULL) + _oldlocale = strdup (_oldlocale); + my_setlocale (_category, locale); +} + +TemporaryLocale::~TemporaryLocale () { + if (_oldlocale != NULL) { + my_setlocale (_category, _oldlocale); + free (_oldlocale); + } +} + +char * TemporaryLocale::my_setlocale(int category, const char *locale) { + // This string may be allocated in static storage. + char * ret = setlocale (category, locale); + if (ret == NULL) + y2error ("Cannot set locale category %d to %s.", category, locale); + return ret; +} + IniParser::~IniParser () { // regex deallocation used to be here 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-core-2.14.3/agent-ini/src/IniParser.h new/yast2-core-2.14.4/agent-ini/src/IniParser.h --- old/yast2-core-2.14.3/agent-ini/src/IniParser.h 2006-09-19 14:20:01.000000000 +0200 +++ new/yast2-core-2.14.4/agent-ini/src/IniParser.h 2006-10-31 16:58:23.000000000 +0100 @@ -7,7 +7,7 @@ * Authors: * Petr Blahos <pblahos(a)suse.cz> * - * $Id: IniParser.h 32969 2006-09-19 12:21:30Z mvidner $ + * $Id: IniParser.h 33951 2006-10-31 15:58:21Z mvidner $ */ #ifndef __IniParser_h__ @@ -17,6 +17,7 @@ #include <ctype.h> #include <stdio.h> #include <regex.h> +#include <locale.h> #include <y2util/RepDef.h> #include <YCP.h> @@ -37,6 +38,24 @@ DEFINE_BASE_POINTER (Regex_t); +#pragma GCC visibility push(hidden) + +//! Set and later restore a locale category. +// It is restored when we go out of scope. +class TemporaryLocale +{ +public: + TemporaryLocale (int category, const char * locale); + ~TemporaryLocale (); +private: + //! call setlocale but log errors + char *my_setlocale(int category, const char *locale); + + int _category; + char * _oldlocale; +}; +#pragma GCC visibility pop + /** * Wrapper to manage regex_t * * Must not be copied because regex_t is opaque @@ -74,6 +93,9 @@ } else { + // #177560: [A-Za-z] excludes some ASCII letters in Estonian + TemporaryLocale tl (LC_ALL, "C"); + ret = regcomp (&regex, pattern.c_str (), REG_EXTENDED | (ignore_case ? REG_ICASE : 0)); if (ret) 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-core-2.14.3/configure.in new/yast2-core-2.14.4/configure.in --- old/yast2-core-2.14.3/configure.in 2006-10-23 10:35:05.000000000 +0200 +++ new/yast2-core-2.14.4/configure.in 2006-10-31 16:58:35.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-core, 2.14.3, http://bugs.opensuse.org/, yast2-core) +AC_INIT(yast2-core, 2.14.4, http://bugs.opensuse.org/, yast2-core) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.14.3" +VERSION="2.14.4" RPMNAME="yast2-core" MAINTAINER="Martin Vidner <mvidner(a)suse.cz>" @@ -171,6 +171,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package yast2-bootloader checked in at Tue Oct 31 18:15:25 CET 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-10-31 02:54:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-bootloader/yast2-bootloader.changes 2006-10-31 17:25:37.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 31 17:08:26 CET 2006 - od(a)suse.de + +- autoyast Relax-NG Compact schema file added (#215263) +- 2.13.82 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.81.tar.bz2 New: ---- yast2-bootloader-2.13.82.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.uVWUxa/_old 2006-10-31 18:14:32.000000000 +0100 +++ /var/tmp/diff_new_pack.uVWUxa/_new 2006-10-31 18:14:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.81) +# spec file for package yast2-bootloader (Version 2.13.82) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.13.81 +Version: 2.13.82 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.81.tar.bz2 +Source0: yast2-bootloader-2.13.82.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.13.81 +%setup -n yast2-bootloader-2.13.82 %build %{prefix}/bin/y2tool y2autoconf @@ -102,6 +102,7 @@ /usr/lib/YaST2/servers_non_y2/ag_* /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/* +/usr/share/YaST2/schema/autoyast/rnc/bootloader.rnc %files -n yast2-bootfloppy %defattr(-,root,root) @@ -112,6 +113,9 @@ %changelog -n yast2-bootloader * Tue Oct 31 2006 - od(a)suse.de +- autoyast Relax-NG Compact schema file added (#215263) +- 2.13.82 +* Tue Oct 31 2006 - od(a)suse.de - fixed exporting the device map to autoyast (#211908) * Tue Oct 17 2006 - od(a)suse.de - packaged missing grub/help.ycp and generic/help.ycp ++++++ yast2-bootloader-2.13.81.tar.bz2 -> yast2-bootloader-2.13.82.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.81/VERSION new/yast2-bootloader-2.13.82/VERSION --- old/yast2-bootloader-2.13.81/VERSION 2006-10-31 02:51:22.000000000 +0100 +++ new/yast2-bootloader-2.13.82/VERSION 2006-10-31 17:08:13.000000000 +0100 @@ -1 +1 @@ -2.13.81 +2.13.82 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.81/src/config/Makefile.am new/yast2-bootloader-2.13.82/src/config/Makefile.am --- old/yast2-bootloader-2.13.81/src/config/Makefile.am 2005-12-01 16:34:18.000000000 +0100 +++ new/yast2-bootloader-2.13.82/src/config/Makefile.am 2006-10-31 16:21:56.000000000 +0100 @@ -21,5 +21,7 @@ endif +rncdir = $(schemadir)/autoyast/rnc +rnc_DATA = bootloader.rnc -EXTRA_DIST = bootloader.desktop bootfloppy.desktop +EXTRA_DIST = bootloader.desktop bootfloppy.desktop bootloader.rnc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.81/src/config/Makefile.in new/yast2-bootloader-2.13.82/src/config/Makefile.in --- old/yast2-bootloader-2.13.81/src/config/Makefile.in 2006-10-16 20:55:26.000000000 +0200 +++ new/yast2-bootloader-2.13.82/src/config/Makefile.in 2006-10-31 16:22:10.000000000 +0100 @@ -58,9 +58,10 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(desktopdir)" +am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(rncdir)" desktopDATA_INSTALL = $(INSTALL_DATA) -DATA = $(desktop_DATA) +rncDATA_INSTALL = $(INSTALL_DATA) +DATA = $(desktop_DATA) $(rnc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGENT_LIBADD = @AGENT_LIBADD@ @@ -222,7 +223,9 @@ @I386_OR_AMD64_TRUE@ bootloader.desktop \ @I386_OR_AMD64_TRUE@ bootfloppy.desktop -EXTRA_DIST = bootloader.desktop bootfloppy.desktop +rncdir = $(schemadir)/autoyast/rnc +rnc_DATA = bootloader.rnc +EXTRA_DIST = bootloader.desktop bootfloppy.desktop bootloader.rnc all: all-am .SUFFIXES: @@ -282,6 +285,23 @@ echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ done +install-rncDATA: $(rnc_DATA) + @$(NORMAL_INSTALL) + test -z "$(rncdir)" || $(mkdir_p) "$(DESTDIR)$(rncdir)" + @list='$(rnc_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(rncDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(rncdir)/$$f'"; \ + $(rncDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(rncdir)/$$f"; \ + done + +uninstall-rncDATA: + @$(NORMAL_UNINSTALL) + @list='$(rnc_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(rncdir)/$$f'"; \ + rm -f "$(DESTDIR)$(rncdir)/$$f"; \ + done tags: TAGS TAGS: @@ -320,7 +340,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(desktopdir)"; do \ + for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(rncdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -365,7 +385,7 @@ info-am: -install-data-am: install-desktopDATA +install-data-am: install-desktopDATA install-rncDATA install-exec-am: @@ -391,17 +411,19 @@ ps-am: -uninstall-am: uninstall-desktopDATA uninstall-info-am +uninstall-am: uninstall-desktopDATA uninstall-info-am \ + uninstall-rncDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-desktopDATA install-exec \ install-exec-am install-info install-info-am install-man \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-desktopDATA uninstall-info-am + install-rncDATA install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-am uninstall-desktopDATA \ + uninstall-info-am uninstall-rncDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.81/src/config/bootloader.desktop new/yast2-bootloader-2.13.82/src/config/bootloader.desktop --- old/yast2-bootloader-2.13.81/src/config/bootloader.desktop 2005-12-01 16:34:18.000000000 +0100 +++ new/yast2-bootloader-2.13.82/src/config/bootloader.desktop 2006-10-31 16:21:56.000000000 +0100 @@ -16,6 +16,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource= X-SuSE-YaST-AutoInstPath=install +X-SuSE-YaST-AutoInstSchema=bootloader.rnc Icon=yast-bootloader Exec=/sbin/yast2 bootloader diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.81/src/config/bootloader.rnc new/yast2-bootloader-2.13.82/src/config/bootloader.rnc --- old/yast2-bootloader-2.13.81/src/config/bootloader.rnc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-bootloader-2.13.82/src/config/bootloader.rnc 2006-10-31 16:21:56.000000000 +0100 @@ -0,0 +1,59 @@ +default namespace = "http://www.suse.com/1.0/yast2ns" +namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" +namespace config = "http://www.suse.com/1.0/configns" + +bootloader = + element bootloader { + activate? & + bl_global? & + initrd_modules? & + loader_device? & + loader_type? & + bl_location? & + repl_mbr? & + sections? + } +activate = + element activate { BOOLEAN } +repl_mbr = + element repl_mbr { BOOLEAN } +initrd_modules = + element initrd_modules { + LIST, + initrd_module+ + } +initrd_module = element initrd_module { bl_module, module_args? } +module_args = element module_args { text } +bl_module = element module { text } +loader_device = element loader_device { text } +loader_type = element loader_type { text } +bl_location = element location { text } +bl_global = + element global { + lines_cache_id? & + stage1_dev? + } +lines_cache_id = element lines_cache_id { text } +stage1_dev = element stage1_dev { text } + +sections = + element sections { + LIST, + section+ + } +section = + element section { + element append {text}? & + element initial {text}? & + element initrd {text}? & + element kernel {text}? & + element name {text}? & + element original_name {text}? & + element root {text}? & + element type {text}? & + element vga {text}? & + element chainloader {text}? & + element lines_cache_id {text}? & + element sectors {text}? + } +kernel_parameters = element kernel_parameters { text } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl-Bootloader
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package perl-Bootloader checked in at Tue Oct 31 16:56:28 CET 2006. -------- --- perl-Bootloader/perl-Bootloader.changes 2006-10-31 00:34:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/perl-Bootloader/perl-Bootloader.changes 2006-10-31 16:16:33.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Oct 31 15:47:35 CET 2006 - jplack(a)suse.de + +- fix typo in Library.pm (#215613) +- reduce build dependencies +- version bump 0.3.5 + +------------------------------------------------------------------- Old: ---- perl-Bootloader-0.3.4.tar.bz2 New: ---- perl-Bootloader-0.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Bootloader.spec ++++++ --- /var/tmp/diff_new_pack.vKd53c/_old 2006-10-31 16:56:18.000000000 +0100 +++ /var/tmp/diff_new_pack.vKd53c/_new 2006-10-31 16:56:18.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package perl-Bootloader (Version 0.3.4) +# spec file for package perl-Bootloader (Version 0.3.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,7 +11,7 @@ # norootforbuild Name: perl-Bootloader -Version: 0.3.4 +Version: 0.3.5 Release: 1 Requires: perl >= %{perl_version} Requires: perl-gettext @@ -25,6 +25,7 @@ Source1: update-bootloader Source2: bootloader_entry BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: -e2fsprogs -limal-bootloader -mdadm %description Perl modules for configuring various boot loaders. @@ -63,6 +64,10 @@ /usr/lib/bootloader %changelog -n perl-Bootloader +* Tue Oct 31 2006 - jplack(a)suse.de +- fix typo in Library.pm (#215613) +- reduce build dependencies +- version bump 0.3.5 * Tue Oct 31 2006 - od(a)suse.de - increase maximum timeout for grub to 3600 seconds (#214146) * Wed Oct 25 2006 - jplack(a)suse.de ++++++ perl-Bootloader-0.3.4.tar.bz2 -> perl-Bootloader-0.3.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/perl-Bootloader-0.3.4/lib/Bootloader/Library.pm new/perl-Bootloader-0.3.5/lib/Bootloader/Library.pm --- old/perl-Bootloader-0.3.4/lib/Bootloader/Library.pm 2006-10-25 10:31:45.000000000 +0200 +++ new/perl-Bootloader-0.3.5/lib/Bootloader/Library.pm 2006-10-31 16:16:33.000000000 +0100 @@ -541,7 +541,7 @@ my $self = shift; my $loader = $self->{"loader"}; - return defines $loader ? $loader->InitializeBootloader () : undef; + return defined $loader ? $loader->InitializeBootloader () : undef; } =item ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gdm
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package gdm checked in at Tue Oct 31 16:56:12 CET 2006. -------- --- GNOME/gdm/gdm.changes 2006-10-27 17:36:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2006-10-31 16:53:39.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 31 16:53:31 CET 2006 - sbrabec(a)suse.cz + +- Rewritten SuSEconfig.gdm to work better with new custom.conf + (#213037). + +------------------------------------------------------------------- New: ---- gdm-conf-custom-sysconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdm.spec ++++++ --- /var/tmp/diff_new_pack.sOi0GW/_old 2006-10-31 16:55:58.000000000 +0100 +++ /var/tmp/diff_new_pack.sOi0GW/_new 2006-10-31 16:55:58.000000000 +0100 @@ -22,7 +22,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.16.1 -Release: 15 +Release: 16 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -51,6 +51,7 @@ Patch27: gdm-autobuild-warning.patch Patch28: gdm-X_SERVER.patch Patch29: gdm-gdmsetup.patch +Patch30: gdm-conf-custom-sysconfig.patch URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Docdir: %{_defaultdocdir} @@ -99,6 +100,7 @@ %patch27 %patch28 %patch29 +%patch30 #gnome-patch-translation-update %build @@ -229,6 +231,9 @@ %dir /usr/share/xsessions %changelog -n gdm +* Tue Oct 31 2006 - sbrabec(a)suse.cz +- Rewritten SuSEconfig.gdm to work better with new custom.conf + (#213037). * Fri Oct 27 2006 - jhargadon(a)suse.de - changed TryExec to be the same as Exec in gdmsetup.desktop to resolve bug #210943 ++++++ SuSEconfig.gdm ++++++ --- GNOME/gdm/SuSEconfig.gdm 2006-09-20 22:02:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/gdm/SuSEconfig.gdm 2006-10-31 16:51:11.000000000 +0100 @@ -12,8 +12,14 @@ exit 0 } +# Read old values. We will need one for correct updating of +if test -f $r/etc/opt/gnome/gdm/gdm_sysconfig.conf ; then +. $r/etc/opt/gnome/gdm/gdm_sysconfig.conf +fi +export OLD_DISPLAYMANAGER_AUTOLOGIN="$DISPLAYMANAGER_AUTOLOGIN" + r=$ROOT -# Set default values. +# Set default values. (This overwrites all variables from gdm_sysconfig.conf.) DISPLAYMANAGER_REMOTE_ACCESS="no" DISPLAYMANAGER_ROOT_LOGIN_REMOTE="no" DISPLAYMANAGER_STARTS_XSERVER="yes" @@ -41,7 +47,14 @@ } . $r/lib/YaST/SuSEconfig.functions -export DISPLAYMANAGER_REMOTE_ACCESS DISPLAYMANAGER_ROOT_LOGIN_REMOTE DISPLAYMANAGER_STARTS_XSERVER DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN DISPLAYMANAGER_AUTOLOGIN DISPLAYMANAGER_PASSWORD_LESS_LOGIN DISPLAYMANAGER_AD_INTEGRATION +GDM_IS_RUNNING=false +if test -z "$r" ; then + if test "$DISPLAYMANAGER" = gdm ; then + if /etc/init.d/xdm status >/dev/null ; then + GDM_IS_RUNNING=false + fi + fi +fi # Write new set of monitore variables. echo -en "# custom.conf was last time updated with following sysconfig:\\nDISPLAYMANAGER_REMOTE_ACCESS=\"$DISPLAYMANAGER_REMOTE_ACCESS\"\\nDISPLAYMANAGER_ROOT_LOGIN_REMOTE=\"$DISPLAYMANAGER_ROOT_LOGIN_REMOTE\"\\nDISPLAYMANAGER_STARTS_XSERVER=\"$DISPLAYMANAGER_STARTS_XSERVER\"\\nDISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN=\"$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN\"\\nDISPLAYMANAGER_AUTOLOGIN=\"$DISPLAYMANAGER_AUTOLOGIN\"\\nDISPLAYMANAGER_PASSWORD_LESS_LOGIN=\"$DISPLAYMANAGER_PASSWORD_LESS_LOGIN\"\\nDISPLAYMANAGER_AD_INTEGRATION=\"$DISPLAYMANAGER_AD_INTEGRATION\"\\nDISPLAYMANAGER_SHUTDOWN=\"$DISPLAYMANAGER_SHUTDOWN\"\\nPERMISSION_SECURITY=\"$PERMISSION_SECURITY\"\\n" >$r/etc/opt/gnome/gdm/gdm_sysconfig.conf.new @@ -52,345 +65,231 @@ exit fi +function sysconfig_yesno_to_gdm { + eval local suseval=\$$1 + case "$suseval" in + yes ) + export $2=true + ;; + * ) + export $2=false + ;; + esac + export comment_$2="displaymanager:$1" +} + +sysconfig_yesno_to_gdm DISPLAYMANAGER_REMOTE_ACCESS xdmcp_enable + +sysconfig_yesno_to_gdm DISPLAYMANAGER_ROOT_LOGIN_REMOTE security_AllowRemoteRoot + +export comment_servers_0="displaymanager:DISPLAYMANAGER_STARTS_XSERVER" +case "$DISPLAYMANAGER_STARTS_XSERVER" in + "yes" ) + export servers_0=@SKIP@ + ;; + * ) + export servers_0=inactive + ;; +esac + +sysconfig_yesno_to_gdm DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN security_DisallowTCP + +sysconfig_yesno_to_gdm DISPLAYMANAGER_AD_INTEGRATION greeter_ShowDomain + +export comment_daemon_AutomaticLoginEnable="displaymanager:DISPLAYMANAGER_AUTOLOGIN" +export comment_daemon_AutomaticLogin="displaymanager:DISPLAYMANAGER_AUTOLOGIN" +case "$DISPLAYMANAGER_AUTOLOGIN" in + "" ) + export daemon_AutomaticLoginEnable=false + export daemon_AutomaticLogin=@SKIP@ + ;; + * ) + export daemon_AutomaticLoginEnable=true + export daemon_AutomaticLogin="$DISPLAYMANAGER_AUTOLOGIN" + ;; +esac + +export comment_greeter_AllowShutdown="displaymanager:DISPLAYMANAGER_SHUTDOWN" +export comment_greeter_SecureShutdown="displaymanager:DISPLAYMANAGER_SHUTDOWN" case "$DISPLAYMANAGER_SHUTDOWN" in root ) - GDM_ALLOW_SHUTDOWN=true - GDM_SECURE_SHUTDOWN=true + export greeter_AllowShutdown=true + export greeter_SecureShutdown=true ;; # Remote users can never shutdown in GDM. none ) - GDM_ALLOW_SHUTDOWN=false - GDM_SECURE_SHUTDOWN=true + export greeter_AllowShutdown=false + export greeter_SecureShutdown=true ;; all ) - GDM_ALLOW_SHUTDOWN=true - GDM_SECURE_SHUTDOWN=false + export greeter_AllowShutdown=true + export greeter_SecureShutdown=false ;; auto | * ) + export comment_greeter_AllowShutdown="displaymanager:DISPLAYMANAGER_SHUTDOWN, security:PERMISSION_SECURITY" + export comment_greeter_SecureShutdown="displaymanager:DISPLAYMANAGER_SHUTDOWN, security:PERMISSION_SECURITY" + export comment_security_AllowRemoteRoot="displaymanager:DISPLAYMANAGER_ROOT_LOGIN_REMOTE,DISPLAYMANAGER_SHUTDOWN, security:PERMISSION_SECURITY" case "$PERMISSION_SECURITY" in paranoid ) - GDM_ALLOW_SHUTDOWN=true - GDM_SECURE_SHUTDOWN=true - export DISPLAYMANAGER_ROOT_LOGIN_REMOTE="no" + export greeter_AllowShutdown=true + export greeter_SecureShutdown=true + export security_AllowRemoteRoot=false ;; "easy local" ) - GDM_ALLOW_SHUTDOWN=true - GDM_SECURE_SHUTDOWN=false + export greeter_AllowShutdown=true + export greeter_SecureShutdown=false ;; * ) - GDM_ALLOW_SHUTDOWN=true - GDM_SECURE_SHUTDOWN=true + export greeter_AllowShutdown=true + export greeter_SecureShutdown=true ;; esac ;; esac -# There are changes. Update gdm.conf. -## New change! There is no longer a gdm.conf file. It is now custom.conf. -if test -n "$(sed -n '/^\[servers\]$/,/^\[/{/^[0-9][0-9]*=/p}' <$r/etc/opt/gnome/gdm/custom.conf)" ; then - GDM_SERVER_DEFINED=1 -else - GDM_SERVER_DEFINED=0 -fi - -export GDM_ALLOW_SHUTDOWN GDM_SECURE_SHUTDOWN GDM_SERVER_DEFINED +unset unset ${!last_of_*} ${!custom_conf_*} -awk <$r/etc/opt/gnome/gdm/custom.conf >$r/etc/opt/gnome/gdm/custom.conf.new ' +# Parse configuration file and record all items to environment values. +eval "$( +awk <$r/etc/opt/gnome/gdm/custom.conf ' BEGIN { - server_seen=ENVIRON["GDM_SERVER_DEFINED"]; - expecting_disallow_tcp=0; - expecting_allowshutdown=0; - expecting_secureshutdown=0; + section="BEGIN"; + section_last_line=0; + after_empty_line=0; } -!/^DisallowTCP=.*/ { - if (expecting_disallow_tcp == 1) { - expecting_disallow_tcp = 0; - if (ENVIRON["DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN"] == "yes") { - print "DisallowTCP=false"; - } - } -} - -/^\[.*\]/ { - if (expecting_showdomain == 1) { - if (ENVIRON["DISPLAYMANAGER_AD_INTEGRATION"] == "yes") { - print "ShowDomain=true"; - } - expecting_showdomain=0; - } - if (expecting_allowshutdown == 1) { - if (ENVIRON["GDM_ALLOW_SHUTDOWN"] == "false") { - print "AllowShutdown=false"; - } - expecting_allowshutdown=0; - } - if (expecting_secureshutdown == 1) { - if (ENVIRON["GDM_SECURE_SHUTDOWN"] == "true") { - print "SecureShutdown=true"; - } - expecting_secureshutdown=0; - } - print; - gsub ("[][]", ""); - section = $0; - if (section == "greeter") { - expecting_showdomain=1; - } - if (section == "security") { - expecting_allowshutdown=1; - expecting_secureshutdown=1; - } +# Do not set last_of_ initial comments of a new section. +/^#/ { + if (after_empty_line == 0) + section_last_line=NR; + else next; } -/^Enable=.*/ { - line="$0"; - gsub ("^Enable=", "", line); - if (section == "xdmcp") { - if (ENVIRON["DISPLAYMANAGER_REMOTE_ACCESS"] == "yes") { - print "Enable=true"; - } else { - print "Enable=false"; - } - } else - print $line; +/^\[.*\]/ { + print "export last_of_"section"="section_last_line; + section=$0; + gsub ("[][]", "", section); + section_last_line=NR; + after_empty_line=0; next; } -/^#ShowDomain=.*/ { - line="$0"; - gsub ("^#ShowDomain=", "", line); - if (section == "greeter") { - if (ENVIRON["DISPLAYMANAGER_AD_INTEGRATION"] == "yes") { - print "ShowDomain=true"; - } else { - print $line; - } - expecting_showdomain=0; - } else - print $line; +/^[a-zA-Z0-9_]*=/ { + item=$0; + gsub ("=.*", "", item); + value=$0; + gsub ("^[a-zA-Z0-9_]*=", "", value); + gsub ("'\''", "'\''\\'\'''\''", value); + section_last_line=NR; + after_empty_line=0; + print "export custom_conf_"section"_"item"_seen=true"; +# print "export custom_conf_"section"_"item"='\''"value"'\''"; next; } -/^ShowDomain=.*/ { - line="$0"; - gsub ("^(#|)ShowDomain=", "", line); - if (section == "greeter") { - if (ENVIRON["DISPLAYMANAGER_AD_INTEGRATION"] == "yes") { - print "ShowDomain=true"; - } else { - print "#ShowDomain=false"; - } - expecting_showdomain=0; - } else - print $line; +# Do not set last_of_ for empty lines - we want to add missing stuff before the final empty line. +/^$/ { + after_empty_line=1; next; } -/^# The chooser is what/ { - if (expecting_showdomain == 1) { - if (ENVIRON["DISPLAYMANAGER_AD_INTEGRATION"] == "yes") { - print "ShowDomain=true"; - print ""; - } - expecting_showdomain=0; - } - print; - next; +/.*/ { + section_last_line=NR; + after_empty_line=0; } -/^#AllowShutdown=.*/ { - line="$0"; - gsub ("^#AllowShutdown=", "", line); - if (section == "security") { - if (ENVIRON["GDM_ALLOW_SHUTDOWN"] == "false") { - print "AllowShutdown=false"; - } else { - print $line; - } - expecting_allowshutdown=0; - } else - print $line; - next; +END { + print "export last_of_"section"="section_last_line; } +' +)" -/^AllowShutdown=.*/ { - line="$0"; - gsub ("^(#|)AllowShutdown=", "", line); - if (section == "security") { - if (ENVIRON["GDM_ALLOW_SHUTDOWN"] == "false") { - print "AllowShutdown=false"; - } else { - print "#AllowShutdown=true"; +# And now set what is required. +awk <$r/etc/opt/gnome/gdm/custom.conf >$r/etc/opt/gnome/gdm/custom.conf.new ' +# Prepare array from variable. +function gdm_prepare_var(var) { + gdm_conf_var[var]=ENVIRON[var]; +} + +# Update configuration from gdm_conf_var array. +function update_item(section, item) { + if (gdm_conf_var[section"_"item] != "@SKIP@") { + print "# SuSEconfig: "ENVIRON["comment_"section"_"item]; + print item"="gdm_conf_var[section"_"item]; + if (ENVIRON["GDM_IS_RUNNING"] == "true") + system("$r/opt/gnome/bin/gdmflexiserver --command=\"UPDATE_CONFIG "section"/"item"\"") + return "DONE"; + } else + return "KEEP_ORIG"; +} + +function process_unseen() { + # Print all items not seen in the section. + if (ENVIRON["last_of_"section] == NR) + for (item in gdm_conf_var) { + item_section = item; + gsub ("_.*", "", item_section); + gsub ("[^_]*_", "", item); + if (item_section == section && ENVIRON["custom_conf_"section"_"item"_seen"] != "true") + update_item(section, item); } - expecting_allowshutdown=0; - } else - print $line; - next; } -/^#SecureShutdown=.*/ { - line="$0"; - gsub ("^#SecureShutdown=", "", line); - if (section == "security") { - if (ENVIRON["GDM_SECURE_SHUTDOWN"] == "true") { - print "SecureShutdown=true"; - } else { - print $line; - } - expecting_secureshutdown=0; - } else - print $line; - next; +BEGIN { + section="BEGIN"; + gdm_prepare_var("daemon_AutomaticLoginEnable"); + gdm_prepare_var("daemon_AutomaticLogin"); + gdm_prepare_var("security_AllowRemoteRoot"); + gdm_prepare_var("security_DisallowTCP"); + gdm_prepare_var("xdmcp_enable"); + gdm_prepare_var("greeter_AllowShutdown"); + gdm_prepare_var("greeter_SecureShutdown"); + gdm_prepare_var("greeter_ShowDomain"); + gdm_prepare_var("servers_0"); } -/^SecureShutdown=.*/ { - line="$0"; - gsub ("^(#|)SecureShutdown=", "", line); - if (section == "security") { - if (ENVIRON["GDM_SECURE_SHUTDOWN"] == "true") { - print "SecureShutdown=true"; - } else { - print "#SecureShutdown=false"; - } - expecting_secureshutdown=0; - } else - print $line; +/^# SuSEconfig:/ { + process_unseen(); next; } -/^# XDMCP is the protocol/ { - if (expecting_allowshutdown == 1) { - if (ENVIRON["GDM_ALLOW_SHUTDOWN"] == "false") { - print "AllowShutdown=false"; - print ""; - } - expecting_allowshutdown=0; - } - if (expecting_secureshutdown == 1) { - if (ENVIRON["GDM_SECURE_SHUTDOWN"] == "true") { - print "SecureShutdown=true"; - print ""; - } - expecting_secureshutdown=0; - } +/^\[.*\]/ { + section=$0; + gsub ("[][]", "", section); print; + process_unseen(); next; } -/^AllowRemoteRoot=.*/ { - line="$0"; - gsub ("AllowRemoteRoot=", "", line); - if (section == "security") { - if (ENVIRON["DISPLAYMANAGER_ROOT_LOGIN_REMOTE"] == "yes") { - print "AllowRemoteRoot=true"; - } else { - print "AllowRemoteRoot=false"; - } +/^[a-zA-Z0-9_]*=/ { + item=$0; + gsub ("=.*", "", item); + value=$0; + gsub ("^[a-zA-Z0-9_]*=", "", value); + # Update value of item. + if (section"_"item in gdm_conf_var) { + if (update_item(section, item) == "KEEP_ORIG") + # This is actually used only for daemon_AutomaticLogin and servers_0: + if (item == "servers_0") { + if (value != "inactive") + print; + } else { + if (value != ENVIRON["OLD_DISPLAYMANAGER_AUTOLOGIN"]) + print; + } } else - print $line; - next; -} - -/^#[0-9][0-9]*=(Standard|Chooser)$/ { - if (server_seen != 0) { print; - next; - } - if (section == "servers") { - if (ENVIRON["DISPLAYMANAGER_STARTS_XSERVER"] == "yes") { - server_seen = 1; - gsub ("^#", ""); - } - } - print; - next; -} - -/^[0-9][0-9]*=(Standard|Chooser)$/ { - if (section == "servers") { - server_seen = 1; - if (ENVIRON["DISPLAYMANAGER_STARTS_XSERVER"] != "yes") { - server_seen = 1; - print "#"$0; - next; - } - } - print; - next; -} - -/^DisallowTCP=.*/ { - expecting_disallow_tcp = 0; - line="$0"; - gsub ("DisallowTCP=", "", line); - if (section == "security") { - if (ENVIRON["DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN"] == "yes") { - print "DisallowTCP=false"; - } else { - print "DisallowTCP=true"; - } - } else - print $line; - next; -} - -/^#DisallowTCP=.*/ { - expecting_disallow_tcp = 1; - print; - next; -} - -/^AutomaticLoginEnable=.*/ { - line="$0"; - gsub ("AutomaticLoginEnable=", "", line); - if (section == "daemon") { - if (ENVIRON["DISPLAYMANAGER_AUTOLOGIN"] == "") { - print "AutomaticLoginEnable=false"; - } else { - print "AutomaticLoginEnable=true"; - } - } else - print $line; - next; -} - -/^AutomaticLogin=.*/ { - line="$0"; - gsub ("AutomaticLogin=", "", line); - if (section == "daemon") { - if (ENVIRON["DISPLAYMANAGER_AUTOLOGIN"] == "") { - print "AutomaticLogin="; - } else { - print "AutomaticLogin="ENVIRON["DISPLAYMANAGER_AUTOLOGIN"]; - } - } else - print $line; + process_unseen(); next; } /.*/ { print; + process_unseen(); + next; } ' - mv $r/etc/opt/gnome/gdm/custom.conf.new $r/etc/opt/gnome/gdm/custom.conf mv $r/etc/opt/gnome/gdm/gdm_sysconfig.conf.new $r/etc/opt/gnome/gdm/gdm_sysconfig.conf - -# Password-less login is implemented by PAM. Do the required change. -if [ "$DISPLAYMANAGER_PASSWORD_LESS_LOGIN" = "yes" ] ; then - sed 's/^auth[[:space:]][[:space:]]*include[[:space:]][[:space:]]*common-auth/#&/' <$r/etc/pam.d/gdm-autologin >$r/etc/pam.d/gdm-autologin.new -else - sed 's/#$auth[[:space:]][[:space:]]*include[[:space:]][[:space:]]*common-auth$/\1/' <$r/etc/pam.d/gdm-autologin >$r/etc/pam.d/gdm-autologin.new -fi -if cmp -s $r/etc/pam.d/gdm-autologin $r/etc/pam.d/gdm-autologin.new ; then - rm $r/etc/pam.d/gdm-autologin.new -else - mv $r/etc/pam.d/gdm-autologin.new $r/etc/pam.d/gdm-autologin -fi - -# -# end -# ++++++ gdm-conf-custom-sysconfig.patch ++++++ --- config/gdm.conf-custom +++ config/gdm.conf-custom @@ -37,6 +37,12 @@ # # NOTE: Lines that begin with "#" are considered comments. # +# SuSEconfig comments: Some of entries in this file are updated by SuSEconfig, +# whenever sysconfig entry change. To edit these entries, please use sysconfig +# (or never touch these sysconfig variables). +# Comment for each of this entry contains related /etc/sysconfig file and +# variable. +# # Have fun! [daemon] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package yast2-ncurses checked in at Tue Oct 31 16:55:48 CET 2006. -------- --- yast2-ncurses/yast2-ncurses.changes 2006-10-31 12:47:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2006-10-31 16:48:24.000000000 +0100 @@ -2 +2,9 @@ -Mon Oct 30 12:48:44 CET 2006 - gs(a)suse.de +Tue Oct 31 16:43:37 CET 2006 - kmachalkova(a)suse.cz + +- (Temporary) fix for refreshing screen during the installation + (#199256) +- Adjusted spec to require libzypp >=2.7.0 (zypp::ui::PatternContent) +- 2.14.0 + +------------------------------------------------------------------- +Sun Oct 29 12:48:44 CET 2006 - gs(a)suse.de Old: ---- yast2-ncurses-2.13.47.tar.bz2 New: ---- yast2-ncurses-2.14.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.a4a2BD/_old 2006-10-31 16:55:41.000000000 +0100 +++ /var/tmp/diff_new_pack.a4a2BD/_new 2006-10-31 16:55:41.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.13.47) +# spec file for package yast2-ncurses (Version 2.14.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-ncurses -Version: 2.13.47 +Version: 2.14.0 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.13.47.tar.bz2 +Source0: yast2-ncurses-2.14.0.tar.bz2 prefix: /usr BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel @@ -32,7 +32,8 @@ Provides: y2curses Obsoletes: y2curses Requires: glibc-locale -Requires: libzypp >= 1.0.0 +#zypp::ui::PatternContents +Requires: libzypp >= 2.7.0 %description This package contains the character based (ncurses) user interface @@ -41,7 +42,7 @@ %prep -%setup -n yast2-ncurses-2.13.47 +%setup -n yast2-ncurses-2.14.0 %build %{prefix}/bin/y2tool y2autoconf @@ -74,7 +75,12 @@ %doc %{prefix}/share/doc/packages/yast2-ncurses %changelog -n yast2-ncurses -* Mon Oct 30 2006 - gs(a)suse.de +* Tue Oct 31 2006 - kmachalkova(a)suse.cz +- (Temporary) fix for refreshing screen during the installation + (#199256) +- Adjusted spec to require libzypp >=2.7.0 (zypp::ui::PatternContent) +- 2.14.0 +* Sun Oct 29 2006 - gs(a)suse.de - Package Installation: Fold hidden patterns into parents (Fate #301229) - Online Update: show list of installable (relevant) patches (bug # 168758) ++++++ yast2-ncurses-2.13.47.tar.bz2 -> yast2-ncurses-2.14.0.tar.bz2 ++++++ ++++ 12745 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.47/Makefile.am new/yast2-ncurses-2.14.0/Makefile.am --- old/yast2-ncurses-2.13.47/Makefile.am 2006-10-29 11:02:35.000000000 +0100 +++ new/yast2-ncurses-2.14.0/Makefile.am 2006-10-31 16:19:45.000000000 +0100 @@ -7,7 +7,8 @@ # #where devtools are -Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool +PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) +Y2TOOL = $(PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -19,7 +20,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -33,7 +34,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.47/VERSION new/yast2-ncurses-2.14.0/VERSION --- old/yast2-ncurses-2.13.47/VERSION 2006-10-31 09:55:54.000000000 +0100 +++ new/yast2-ncurses-2.14.0/VERSION 2006-10-31 16:19:08.000000000 +0100 @@ -1 +1 @@ -2.13.47 +2.14.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.47/config.h.in new/yast2-ncurses-2.14.0/config.h.in --- old/yast2-ncurses-2.13.47/config.h.in 2006-10-29 11:02:58.000000000 +0100 +++ new/yast2-ncurses-2.14.0/config.h.in 2006-10-31 16:19:59.000000000 +0100 @@ -65,7 +65,7 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.47/configure.in new/yast2-ncurses-2.14.0/configure.in --- old/yast2-ncurses-2.13.47/configure.in 2006-10-29 11:02:35.000000000 +0100 +++ new/yast2-ncurses-2.14.0/configure.in 2006-10-31 16:19:45.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ncurses dnl -dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.27 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.13.46, http://bugs.opensuse.org/, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.14.0, http://bugs.opensuse.org/, yast2-ncurses) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.46" +VERSION="2.14.0" RPMNAME="yast2-ncurses" MAINTAINER="Katarina Machalkova <kmachalkova(a)suse.cz>" @@ -110,8 +110,6 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi -Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.47/src/NCurses.cc new/yast2-ncurses-2.14.0/src/NCurses.cc --- old/yast2-ncurses-2.13.47/src/NCurses.cc 2006-07-25 09:16:28.000000000 +0200 +++ new/yast2-ncurses-2.14.0/src/NCurses.cc 2006-10-31 16:14:23.000000000 +0100 @@ -432,7 +432,7 @@ UIMIL << "start refresh ..." << endl; SetTitle( myself->title_t ); ::clearok( ::stdscr, true ); - myself->stdpan->refresh(); + myself->stdpan->noutrefresh(); UIMIL << "done refresh ..." << endl; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.47/src/ncursesp.cc new/yast2-ncurses-2.14.0/src/ncursesp.cc --- old/yast2-ncurses-2.13.47/src/ncursesp.cc 2006-07-25 09:16:28.000000000 +0200 +++ new/yast2-ncurses-2.14.0/src/ncursesp.cc 2006-10-31 16:14:10.000000000 +0100 @@ -97,7 +97,7 @@ int NCursesPanel::refresh() { ::update_panels(); - return doupdate(); + return ::doupdate(); } int diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.47/src/pkg_layout.ycp new/yast2-ncurses-2.14.0/src/pkg_layout.ycp --- old/yast2-ncurses-2.13.47/src/pkg_layout.ycp 2006-10-11 11:30:42.000000000 +0200 +++ new/yast2-ncurses-2.14.0/src/pkg_layout.ycp 2006-10-31 16:13:42.000000000 +0100 @@ -7,7 +7,7 @@ * * ncurses layout for package selection * - * $Id: pkg_layout.ycp 33324 2006-10-11 09:30:39Z gs $ + * $Id: pkg_layout.ycp 33944 2006-10-31 15:13:35Z kmachalkova $ */ { textdomain "packages"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 upx
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package upx checked in at Tue Oct 31 16:55:35 CET 2006. -------- --- upx/upx.changes 2006-10-06 18:24:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/upx/upx.changes 2006-10-31 16:15:04.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 31 16:14:57 CET 2006 - meissner(a)suse.de + +- build with RPM_OPT_FLAGS + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ upx.spec ++++++ --- /var/tmp/diff_new_pack.8gTLtf/_old 2006-10-31 16:55:30.000000000 +0100 +++ /var/tmp/diff_new_pack.8gTLtf/_new 2006-10-31 16:55:30.000000000 +0100 @@ -12,11 +12,11 @@ Name: upx BuildRequires: gcc-c++ ucl -License: GPL +License: GNU General Public License (GPL) - all versions Group: Development/Tools/Other Autoreqprov: on Version: 2.02 -Release: 1 +Release: 7 Source0: %{name}-%{version}-src.tar.bz2 URL: http://upx.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -41,7 +41,7 @@ %build export UCLDIR=%{_prefix} -make -C src +make -C src CXXFLAGS="$RPM_OPT_FLAGS" make -C doc %install @@ -60,6 +60,8 @@ %{_prefix}/bin/* %changelog -n upx +* Tue Oct 31 2006 - meissner(a)suse.de +- build with RPM_OPT_FLAGS * Thu Oct 05 2006 - anicka(a)suse.cz - update to 2.02 * support for many new formats ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 tuxtype
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package tuxtype checked in at Tue Oct 31 16:55:25 CET 2006. -------- --- tuxtype/tuxtype.changes 2006-06-15 00:07:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/tuxtype/tuxtype.changes 2006-10-31 16:19:36.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 31 16:19:32 CET 2006 - meissner(a)suse.de + +- use RPM_OPT_FLAGS + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tuxtype.spec ++++++ --- /var/tmp/diff_new_pack.aZO57c/_old 2006-10-31 16:55:20.000000000 +0100 +++ /var/tmp/diff_new_pack.aZO57c/_new 2006-10-31 16:55:20.000000000 +0100 @@ -12,11 +12,11 @@ Name: tuxtype BuildRequires: SDL_image-devel SDL_mixer-devel SDL_ttf dialog gcc-c++ gtk -License: GPL +License: GNU General Public License (GPL) - all versions Group: Amusements/Games/Action/Other Autoreqprov: on Version: 1.5.3 -Release: 16 +Release: 33 Source: tuxtype2-%{version}.tar.bz2 URL: http://tuxtype.sf.net Summary: Typing tutor for children @@ -34,6 +34,7 @@ %build %{suse_update_config -f} autoreconf --force --install +CFLAGS="$RPM_OPT_FLAGS" \ ./configure --prefix=%{_prefix} \ --bindir=%{_prefix}/bin \ --datadir=%{_prefix}/share/tuxtype2 @@ -67,6 +68,8 @@ %{_prefix}/share/tuxtype2/data/scripts %changelog -n tuxtype +* Tue Oct 31 2006 - meissner(a)suse.de +- use RPM_OPT_FLAGS * Thu Jun 15 2006 - dmueller(a)suse.de - build parallel * Wed Mar 29 2006 - aj(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sysconfig
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package sysconfig checked in at Tue Oct 31 16:55:15 CET 2006. -------- --- sysconfig/sysconfig.changes 2006-10-27 16:44:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2006-10-31 16:28:51.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Oct 31 12:04:05 CET 2006 - zoz(a)suse.de + +- new version 0.60.2 +- rcnetwork: consider also bridge ports as mandatory interfaces and + wait for them (Bug 193216) +- ifcfg-bridge.5: Recommend increasing DHCLIENT_WAIT_AT_BOOT if + BOOTPROTO=dhcp (Bug 193216) +- bonding: + + don't initialize bonding interface a second time (which results + in wrong error messages) when dhcp client calls ifup for POST_UP + stuff. (Bug 190093) + + set interface options twice, because some must be set before and + some after enslaving devices. (Bug 190377) + +------------------------------------------------------------------- Old: ---- sysconfig-0.60.1.tar.bz2 New: ---- sysconfig-0.60.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.K3DgLt/_old 2006-10-31 16:54:58.000000000 +0100 +++ /var/tmp/diff_new_pack.K3DgLt/_new 2006-10-31 16:54:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sysconfig (Version 0.60.1) +# spec file for package sysconfig (Version 0.60.2) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,7 +12,7 @@ Name: sysconfig BuildRequires: autofs portmap sysfsutils ypbind -Version: 0.60.1 +Version: 0.60.2 Release: 1 Summary: The sysconfig scheme Group: System/Base @@ -208,6 +208,18 @@ %{insserv_cleanup} %changelog -n sysconfig +* Tue Oct 31 2006 - zoz(a)suse.de +- new version 0.60.2 +- rcnetwork: consider also bridge ports as mandatory interfaces and + wait for them (Bug 193216) +- ifcfg-bridge.5: Recommend increasing DHCLIENT_WAIT_AT_BOOT if + BOOTPROTO=dhcp (Bug 193216) +- bonding: + + don't initialize bonding interface a second time (which results + in wrong error messages) when dhcp client calls ifup for POST_UP + stuff. (Bug 190093) + + set interface options twice, because some must be set before and + some after enslaving devices. (Bug 190377) * Fri Oct 27 2006 - jg(a)suse.de - new version 0.60.1 - ifup-wireless: using wext driver back-end for madwifi now ++++++ sysconfig-0.60.1.tar.bz2 -> sysconfig-0.60.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/ChangeLog new/sysconfig-0.60.2/ChangeLog --- old/sysconfig-0.60.1/ChangeLog 2006-10-27 16:24:27.000000000 +0200 +++ new/sysconfig-0.60.2/ChangeLog 2006-10-31 16:27:36.000000000 +0100 @@ -1,4 +1,45 @@ ------------------------------------------------------------------------ +r1515 | zoz | 2006-10-31 16:26:50 +0100 (Di, 31 Okt 2006) | 2 lines +Geänderte Pfade: + M /trunk/VERSION + M /trunk/package/sysconfig.changes + +0.60.2 + +------------------------------------------------------------------------ +r1514 | zoz | 2006-10-31 16:18:52 +0100 (Di, 31 Okt 2006) | 3 lines +Geänderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/functions + M /trunk/scripts/ifup + +set interface options twice, because some must be set before and +some after enslaving devices. (Bug 190377) + +------------------------------------------------------------------------ +r1513 | zoz | 2006-10-31 15:41:57 +0100 (Di, 31 Okt 2006) | 5 lines +Geänderte Pfade: + M /trunk/package/sysconfig.changes + M /trunk/scripts/ifup + +don't initialize bonding interface a second time (which results +in wrong error messages) when dhcp client calls ifup for POST_UP +stuff. (Bug 190093) + + +------------------------------------------------------------------------ +r1512 | zoz | 2006-10-31 12:09:03 +0100 (Di, 31 Okt 2006) | 5 lines +Geänderte Pfade: + M /trunk/doc/ifcfg-bridge.5 + M /trunk/package/sysconfig.changes + M /trunk/scripts/functions + +- rcnetwork: consider also bridge ports as mandatory interfaces and + wait for them (Bug 193216) +- ifcfg-bridge.5: Recommend increasing DHCLIENT_WAIT_AT_BOOT if + BOOTPROTO=dhcp (Bug 193216) + +------------------------------------------------------------------------ r1511 | zoz | 2006-10-27 16:23:34 +0200 (Fr, 27 Okt 2006) | 2 lines Geänderte Pfade: M /trunk/VERSION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/VERSION new/sysconfig-0.60.2/VERSION --- old/sysconfig-0.60.1/VERSION 2006-10-27 16:23:24.000000000 +0200 +++ new/sysconfig-0.60.2/VERSION 2006-10-31 16:26:50.000000000 +0100 @@ -1 +1 @@ -0.60.1 +0.60.2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/configure new/sysconfig-0.60.2/configure --- old/sysconfig-0.60.1/configure 2006-10-27 16:23:54.000000000 +0200 +++ new/sysconfig-0.60.2/configure 2006-10-31 16:27:03.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for sysconfig 0.60.1. +# Generated by GNU Autoconf 2.59 for sysconfig 0.60.2. # # Report bugs to <http://www.suse.de/feedback/>. # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.60.1' -PACKAGE_STRING='sysconfig 0.60.1' +PACKAGE_VERSION='0.60.2' +PACKAGE_STRING='sysconfig 0.60.2' PACKAGE_BUGREPORT='http://www.suse.de/feedback/' ac_unique_file="scripts/ifup" @@ -955,7 +955,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 sysconfig 0.60.1 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.60.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.60.1:";; + short | recursive ) echo "Configuration of sysconfig 0.60.2:";; esac cat <<\_ACEOF @@ -1161,7 +1161,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.60.1 +sysconfig configure 0.60.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1175,7 +1175,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysconfig $as_me 0.60.1, which was +It was created by sysconfig $as_me 0.60.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19992,7 +19992,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by sysconfig $as_me 0.60.1, which was +This file was extended by sysconfig $as_me 0.60.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20050,7 +20050,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -sysconfig config.status 0.60.1 +sysconfig config.status 0.60.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/doc/ifcfg-bridge.5 new/sysconfig-0.60.2/doc/ifcfg-bridge.5 --- old/sysconfig-0.60.1/doc/ifcfg-bridge.5 2005-12-09 08:52:53.000000000 +0100 +++ new/sysconfig-0.60.2/doc/ifcfg-bridge.5 2006-10-31 16:25:43.000000000 +0100 @@ -70,6 +70,13 @@ where it just doesn't make sense, for example when this linux box is the only bridge on the LAN, or when you know that there are no loops in the topology.) +.TP +.B DHCLIENT_WAIT_AT_BOOT <time in seconds> +The scripts wait at least this time for a lease before dhcp client proceeds in +background. It is normally set in the +.I dhcp +configuration file. But since bridges need some time first to initialize it is +recommended to set it to 30 or higher only for this interface. .SH EXAMPLE Minimal example for a bridge interface on eth0 and eth1, the bridge interface itself @@ -82,6 +89,7 @@ BRIDGE='yes' BRIDGE_PORTS='eth0 eth-id-11:de:ad:be:ef:99' BRIDGE_PORTPRIORITIES='50 20' + DHCLIENT_WAIT_AT_BOOT=30 .fi .SH ADDITIONAL INFORMATION diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/scripts/functions new/sysconfig-0.60.2/scripts/functions --- old/sysconfig-0.60.1/scripts/functions 2006-10-27 16:23:24.000000000 +0200 +++ new/sysconfig-0.60.2/scripts/functions 2006-10-31 16:25:56.000000000 +0100 @@ -22,7 +22,7 @@ # Authors: Michal Svec <msvec(a)suse.cz> # Mads Martin Joergensen <mmj(a)suse.de> # -# $Id: functions 1506 2006-10-24 11:48:41Z zoz $ +# $Id: functions 1514 2006-10-31 15:18:52Z zoz $ # . /etc/sysconfig/network/scripts/functions.common @@ -151,8 +151,15 @@ # Usage: load_bond $INTERFACE $BONDING_MODULE_OPTIONS # Module option 'max_bonds' will be ignored. Use one configuration file per # bonding interface instead. +# If first argument is '_no_fail_' then failures in setting interface options +# will not return an error. load_bond() { - local NIF OPT OPT_NAME OPT_VALUE IF=$1 + local NIF OPT OPT_NAME OPT_VALUE OLD_OPT_VALUE OLD_OPT_VALUE_2 IF NOFAIL + if [ "$1" == _no_fail_ ] ; then + NOFAIL=1 + shift + fi + IF=$1 test -z "$IF" && return 0 shift if [ -d /sys/class/net/$IF -a ! -d /sys/class/net/$IF/bonding ] ; then @@ -194,11 +201,31 @@ echo "-$IF" > /sys/class/net/bonding_masters return 1 # or continue? I guess its better to fail completely fi - if ! echo "$OPT_VALUE" > /sys/class/net/$IF/bonding/$OPT_NAME ; then + # Some options may only be changed if the interface is up and slaves are + # already assigned. Others may only be changed if it is down. To avoid + # unneccessary error messages or warnings we check first if the option + # already has the specified value. + # Special case for option 'mode': this sysfs attribute contains two + # words. A string describing the mode and the corresponding number. We + # have to compare both. + read OLD_OPT_VALUE OLD_OPT_VALUE_2 < /sys/class/net/$IF/bonding/$OPT_NAME + if [ "$OLD_OPT_VALUE" == "$OPT_VALUE" \ + -o $ "$OPT_NAME" == mode -a "$OLD_OPT_VALUE_2" == "$OPT_VALUE" $ \ + ] ; then + info_mesg "Bonding interface '$IF':" \ + "option '$OPT_NAME' is already set to '$OPT_VALUE'" + continue + fi + info_mesg "Bonding interface '$IF':" \ + "Setting option '$OPT_NAME' to '$OPT_VALUE'" + if ! echo "$OPT_VALUE" > /sys/class/net/$IF/bonding/$OPT_NAME \ + 2>/dev/null ; then err_mesg "Option '$OPT_NAME' of interface '$IF' cannot be set to" \ "'$OPT_VALUE'." + # Should we continue? Its better to fail if not requested differently + test "$NOFAIL" == 1 && continue echo "-$IF" > /sys/class/net/bonding_masters - return 1 # or continue? I guess its better to fail completely + return 1 fi done return 0 @@ -234,7 +261,7 @@ get_slaves () { local ret=1 for v in BONDING_SLAVE ETHERDEVICE TUNNEL_DEVICE \ - TUNNEL_LOCAL_INTERFACE; do + TUNNEL_LOCAL_INTERFACE BRIDGE_PORTS; do get_variable $v $1 for vv in `eval echo \$\{\!$v\*\}`; do if [ -n "${!vv}" ] ; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig-0.60.1/scripts/ifup new/sysconfig-0.60.2/scripts/ifup --- old/sysconfig-0.60.1/scripts/ifup 2006-10-27 16:23:24.000000000 +0200 +++ new/sysconfig-0.60.2/scripts/ifup 2006-10-31 16:25:56.000000000 +0100 @@ -25,7 +25,7 @@ # Bjoern Jacke # Michal Ludvig <mludvig(a)suse.cz> # -# $Id: ifup 1507 2006-10-24 14:16:40Z zoz $ +# $Id: ifup 1514 2006-10-31 15:18:52Z zoz $ # usage () { @@ -890,7 +890,7 @@ # Prepare Bonding # if [ "$BONDING_MASTER" = yes ] ; then - if [ "$SCRIPTNAME" = ifup ] ; then + if [ "$SCRIPTNAME" = ifup -a ! "$DHCP" = yes ] ; then if [ ! -x /sbin/ifenslave ] ; then logerror "Bonding: /sbin/ifenslave not found" exit $R_INTERNAL @@ -931,6 +931,9 @@ "correctly\n$MESSAGE" exit $R_ERROR fi + # Some option have to be changed after ifenslave (e.g. primary) + # Therefore we call load_bond() a second time + load_bond $INTERFACE $BONDING_MODULE_OPTS fi fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 portmap
by root＠suse.de 31 Oct '06

31 Oct '06

Hello community, here is the log from the commit of package portmap checked in at Tue Oct 31 16:54:48 CET 2006. -------- --- portmap/portmap.changes 2006-01-25 21:40:29.000000000 +0100 +++ /mounts/work_src_done/STABLE/portmap/portmap.changes 2006-10-31 15:56:50.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Oct 25 15:53:27 CEST 2006 - mkoenig(a)suse.de + +- Add sysconfig parameter to set startup options [#211034] + +------------------------------------------------------------------- New: ---- sysconfig.portmap ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ portmap.spec ++++++ --- /var/tmp/diff_new_pack.gT3pM9/_old 2006-10-31 16:54:31.000000000 +0100 +++ /var/tmp/diff_new_pack.gT3pM9/_new 2006-10-31 16:54:31.000000000 +0100 @@ -5,7 +5,7 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,17 +13,18 @@ Name: portmap BuildRequires: tcpd-devel URL: ftp://ftp.porcupine.org/pub/security/index.html -License: BSD +License: BSD License and BSD-like Group: Productivity/Networking/System Requires: netcfg, syslog Provides: nkitb:/sbin/portmap Autoreqprov: on Version: 5beta -Release: 738 +Release: 761 Summary: A program that manages RPC connections BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: portmap_5beta.tar.gz Source1: portmap.init +Source2: sysconfig.portmap Patch: portmap_5beta.dif Patch1: portmap-nobodynogroup.diff Patch2: portmap5-chroot-i-pmapdump.diff @@ -62,6 +63,8 @@ install -m 644 portmap.8 pmap_dump.8 pmap_set.8 $RPM_BUILD_ROOT%{_mandir}/man8/ install -m 744 %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/portmap ln -sf ../etc/init.d/portmap $RPM_BUILD_ROOT/sbin/rcportmap +mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates +install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.portmap %clean rm -rf $RPM_BUILD_ROOT @@ -83,8 +86,11 @@ /sbin/* /usr/sbin/* %doc %{_mandir}/man8/* +/var/adm/fillup-templates/sysconfig.portmap %changelog -n portmap +* Wed Oct 25 2006 - mkoenig(a)suse.de +- Add sysconfig parameter to set startup options [#211034] * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Thu Jan 19 2006 - schwab(a)suse.de ++++++ portmap.init ++++++ --- portmap/portmap.init 2006-01-19 00:56:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/portmap/portmap.init 2006-10-25 15:19:06.000000000 +0200 @@ -33,6 +33,9 @@ # rc_exit exit appropriate to overall rc status . /etc/rc.status +PORTMAP_OPTIONS= +. /etc/sysconfig/portmap + # First reset status of this service rc_reset @@ -54,7 +57,7 @@ case "$1" in start) echo -n "Starting RPC portmap daemon" - startproc $PORTMAP_BIN + startproc $PORTMAP_BIN $PORTMAP_OPTIONS rc_status -v ;; stop) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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