November 2006 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-update
by root＠suse.de 01 Nov '06

01 Nov '06

Hello community, here is the log from the commit of package yast2-update checked in at Wed Nov 1 18:12:31 CET 2006. -------- --- yast2-update/yast2-update.changes 2006-10-26 13:35:59.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-update/yast2-update.changes 2006-11-01 17:05:31.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Nov 1 16:54:14 CET 2006 - locilka(a)suse.cz + +- Fixed regexp to distinguish "major" and "minor" version that + should have fixed bug #153576. Minor version "3" could have been + ignored (bug #217013). +- Adding testsuite for Update::GetProductName() function (#153576). +- 2.14.3 + +------------------------------------------------------------------- Old: ---- yast2-update-2.14.2.tar.bz2 New: ---- yast2-update-2.14.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.mgkbQ0/_old 2006-11-01 18:12:10.000000000 +0100 +++ /var/tmp/diff_new_pack.mgkbQ0/_new 2006-11-01 18:12:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-update (Version 2.14.2) +# spec file for package yast2-update (Version 2.14.3) # # 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-update -Version: 2.14.2 +Version: 2.14.3 Release: 1 License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-update-2.14.2.tar.bz2 +Source0: yast2-update-2.14.3.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-mouse yast2-packager yast2-testsuite yast2-xml Requires: yast2 yast2-installation yast2-storage yast2-packager @@ -40,7 +40,7 @@ Jiri Srain <jsrain(a)suse.cz> %prep -%setup -n yast2-update-2.14.2 +%setup -n yast2-update-2.14.3 %build %{prefix}/bin/y2tool y2autoconf @@ -75,6 +75,12 @@ %doc %{prefix}/share/doc/packages/yast2-update %changelog -n yast2-update +* Wed Nov 01 2006 - locilka(a)suse.cz +- Fixed regexp to distinguish "major" and "minor" version that + should have fixed bug #153576. Minor version "3" could have been + ignored (bug #217013). +- Adding testsuite for Update::GetProductName() function (#153576). +- 2.14.3 * Thu Oct 26 2006 - locilka(a)suse.cz - Adding "major" and "minor" keys into the update map including information From and To which system it is going to update. ++++++ yast2-update-2.14.2.tar.bz2 -> yast2-update-2.14.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.2/Makefile.am new/yast2-update-2.14.3/Makefile.am --- old/yast2-update-2.14.2/Makefile.am 2006-10-09 17:09:12.000000000 +0200 +++ new/yast2-update-2.14.3/Makefile.am 2006-11-01 10:26:52.000000000 +0100 @@ -215,4 +215,4 @@ # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = doc src +SUBDIRS = doc src testsuite diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.2/Makefile.in new/yast2-update-2.14.3/Makefile.in --- old/yast2-update-2.14.2/Makefile.in 2006-10-09 17:09:18.000000000 +0200 +++ new/yast2-update-2.14.3/Makefile.in 2006-11-01 10:26:58.000000000 +0100 @@ -232,7 +232,7 @@ # test ! -d $(srcdir)/po \ # || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am -SUBDIRS = doc src +SUBDIRS = doc src testsuite all: all-recursive .SUFFIXES: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.2/VERSION new/yast2-update-2.14.3/VERSION --- old/yast2-update-2.14.2/VERSION 2006-10-26 13:36:04.000000000 +0200 +++ new/yast2-update-2.14.3/VERSION 2006-11-01 16:50:40.000000000 +0100 @@ -1 +1 @@ -2.14.2 +2.14.3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.2/configure new/yast2-update-2.14.3/configure --- old/yast2-update-2.14.2/configure 2006-10-09 17:09:16.000000000 +0200 +++ new/yast2-update-2.14.3/configure 2006-11-01 10:26:57.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-update 2.14.0. +# Generated by GNU Autoconf 2.59 for yast2-update 2.14.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2-update' PACKAGE_TARNAME='yast2-update' -PACKAGE_VERSION='2.14.0' -PACKAGE_STRING='yast2-update 2.14.0' +PACKAGE_VERSION='2.14.2' +PACKAGE_STRING='yast2-update 2.14.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -728,7 +728,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-update 2.14.0 to adapt to many kinds of systems. +\`configure' configures yast2-update 2.14.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -795,7 +795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-update 2.14.0:";; + short | recursive ) echo "Configuration of yast2-update 2.14.2:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2-update configure 2.14.0 +yast2-update configure 2.14.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -922,7 +922,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-update $as_me 2.14.0, which was +It was created by yast2-update $as_me 2.14.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='yast2-update' - VERSION='2.14.0' + VERSION='2.14.2' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.14.0" +VERSION="2.14.2" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -2286,7 +2286,7 @@ ( cd src/config; ln -sf update.xml update.glade ) - ac_config_files="$ac_config_files Makefile doc/autodocs/Makefile doc/Makefile src/modules/Makefile src/clients/Makefile src/config/Makefile src/scripts/Makefile src/include/Makefile src/Makefile" + ac_config_files="$ac_config_files Makefile doc/autodocs/Makefile doc/Makefile src/modules/Makefile src/clients/Makefile src/config/Makefile src/scripts/Makefile src/include/Makefile src/Makefile testsuite/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -2695,7 +2695,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2-update $as_me 2.14.0, which was +This file was extended by yast2-update $as_me 2.14.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2750,7 +2750,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-update config.status 2.14.0 +yast2-update config.status 2.14.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -2862,6 +2862,7 @@ "src/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/scripts/Makefile" ;; "src/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.2/configure.in new/yast2-update-2.14.3/configure.in --- old/yast2-update-2.14.2/configure.in 2006-10-09 17:09:12.000000000 +0200 +++ new/yast2-update-2.14.3/configure.in 2006-11-01 10:26:52.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-update, 2.14.0, http://bugs.opensuse.org/, yast2-update) +AC_INIT(yast2-update, 2.14.2, http://bugs.opensuse.org/, yast2-update) 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.0" +VERSION="2.14.2" RPMNAME="yast2-update" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -153,6 +153,7 @@ src/config/Makefile src/scripts/Makefile src/include/Makefile -src/Makefile) +src/Makefile +testsuite/Makefile) AC_OUTPUT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.2/src/modules/Update.ycp new/yast2-update-2.14.3/src/modules/Update.ycp --- old/yast2-update-2.14.2/src/modules/Update.ycp 2006-10-26 13:37:23.000000000 +0200 +++ new/yast2-update-2.14.3/src/modules/Update.ycp 2006-11-01 17:07:00.000000000 +0100 @@ -6,7 +6,7 @@ * * Purpose: Update module * - * $Id: Update.ycp 33682 2006-10-26 11:37:22Z locilka $ + * $Id: Update.ycp 33975 2006-11-01 16:06:57Z locilka $ */ { module "Update"; @@ -16,6 +16,7 @@ import "ProductFeatures"; import "Stage"; import "SuSERelease"; + import "Mode"; // number of packages to install global integer packages_to_install = 0; @@ -249,6 +250,29 @@ fill_version_map (installedVersion); } + // "minor" and "major" version keys + // bug #153576, "version" == "9" or "10.1" or ... + string inst_ver = installedVersion["version"]:""; + if (inst_ver != "" && inst_ver != nil) { + // SLE, SLD, OES... + if (regexpmatch (inst_ver, "^[0123456789]+$")) { + installedVersion["major"] = tointeger (inst_ver); + // openSUSE + } else if (regexpmatch (inst_ver, "^[0123456789]+\.[0123456789]+$")) { + installedVersion["major"] = tointeger (regexpsub (inst_ver, "^([0123456789]+)\.[0123456789]+$", "\\1")); + installedVersion["minor"] = tointeger (regexpsub (inst_ver, "^[0123456789]+\.([0123456789]+)$", "\\1")); + } else { + y2error("Cannot find out major/minor from >%1<", inst_ver); + } + } else { + y2error("Cannot find out version: %1", installedVersion); + } + + if (Mode::test()) { + y2error ("Skipping detection of new system"); + return true; + } + // get new product name integer num = size (Packages::theSources); @@ -276,33 +300,15 @@ updateVersion["version"] = new_product["productversion"]:"?"; fill_version_map (updateVersion); - // "minor" and "major" version keys - // bug #153576, "version" == "9" or "10.1" or ... - string inst_ver = installedVersion["version"]:""; - if (inst_ver != "" && inst_ver != nil) { - // SLE, SLD, OES... - if (regexpmatch (inst_ver, "^[0123456789]+$")) { - installedVersion["major"] = tointeger (inst_ver); - // openSUSE - } else if (regexpmatch (inst_ver, "^[0123456789]+\.[012456789]$")) { - installedVersion["major"] = tointeger (regexpsub (inst_ver, "^([0123456789]+)\.[012456789]$", "\\1")); - installedVersion["minor"] = tointeger (regexpsub (inst_ver, "^[0123456789]+\.([012456789])$", "\\1")); - } else { - y2error("Cannot find out major/minor from %1", inst_ver); - } - } else { - y2error("Cannot find out version: %1", installedVersion); - } - string new_ver = updateVersion["version"]:""; if (new_ver != "" && new_ver != nil) { // SLE, SLD, OES... if (regexpmatch (new_ver, "^[0123456789]+$")) { updateVersion["major"] = tointeger (new_ver); // openSUSE - } else if (regexpmatch (new_ver, "^[0123456789]+\.[012456789]$")) { - updateVersion["major"] = tointeger (regexpsub (new_ver, "^([0123456789]+)\.[012456789]$", "\\1")); - updateVersion["minor"] = tointeger (regexpsub (new_ver, "^[0123456789]+\.([012456789])$", "\\1")); + } else if (regexpmatch (new_ver, "^[0123456789]+\.[0123456789]$")) { + updateVersion["major"] = tointeger (regexpsub (new_ver, "^([0123456789]+)\.[0123456789]$", "\\1")); + updateVersion["minor"] = tointeger (regexpsub (new_ver, "^[0123456789]+\.([0123456789])$", "\\1")); } else { y2error("Cannot find out major/minor from %1", new_ver); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.2/testsuite/Makefile.am new/yast2-update-2.14.3/testsuite/Makefile.am --- old/yast2-update-2.14.2/testsuite/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-2.14.3/testsuite/Makefile.am 2006-10-09 16:09:05.000000000 +0200 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.2/testsuite/Makefile.in new/yast2-update-2.14.3/testsuite/Makefile.in --- old/yast2-update-2.14.2/testsuite/Makefile.in 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-2.14.3/testsuite/Makefile.in 2006-11-01 10:26:58.000000000 +0100 @@ -0,0 +1,369 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = testsuite +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DEJATOOL = $(PACKAGE) +RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir +EXPECT = expect +RUNTEST = runtest +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CREATE_PKGCONFIG_FALSE = @CREATE_PKGCONFIG_FALSE@ +CREATE_PKGCONFIG_NOARCH_FALSE = @CREATE_PKGCONFIG_NOARCH_FALSE@ +CREATE_PKGCONFIG_NOARCH_TRUE = @CREATE_PKGCONFIG_NOARCH_TRUE@ +CREATE_PKGCONFIG_TRUE = @CREATE_PKGCONFIG_TRUE@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINTAINER = @MAINTAINER@ +MAKEINFO = @MAKEINFO@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RPMNAME = @RPMNAME@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +STYLESHEET_CSS = @STYLESHEET_CSS@ +STYLESHEET_HTML = @STYLESHEET_HTML@ +STYLESHEET_PDF = @STYLESHEET_PDF@ +STYLESHEET_YCPDOC = @STYLESHEET_YCPDOC@ +STYLESHEET_YDOC = @STYLESHEET_YDOC@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +YCPC = @YCPC@ +YCPDOC = @YCPDOC@ +YCPMAKEDEP = @YCPMAKEDEP@ +ac_ct_STRIP = @ac_ct_STRIP@ +agentdir = @agentdir@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +clientdir = @clientdir@ +datadir = @datadir@ +desktopdir = @desktopdir@ +docdir = @docdir@ +exec_prefix = @exec_prefix@ +execcompdir = @execcompdir@ +fillupdir = @fillupdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +imagedir = @imagedir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +moduledir = @moduledir@ +oldincludedir = @oldincludedir@ +pkgconfigdatadir = @pkgconfigdatadir@ +pkgconfigdir = @pkgconfigdir@ +plugindir = @plugindir@ +potdir = @potdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +schemadir = @schemadir@ +scrconfdir = @scrconfdir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +themedir = @themedir@ +yast2dir = @yast2dir@ +ybindir = @ybindir@ +ydatadir = @ydatadir@ +yncludedir = @yncludedir@ +ystartupdir = @ystartupdir@ +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu testsuite/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +check-DEJAGNU: site.exp + srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ + EXPECT=$(EXPECT); export EXPECT; \ + runtest=$(RUNTEST); \ + if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ + l='$(DEJATOOL)'; for tool in $$l; do \ + $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \ + done; \ + else echo "WARNING: could not find \`runtest'" 1>&2; :;\ + fi +site.exp: Makefile + @echo 'Making a new site.exp file...' + @echo '## these variables are automatically generated by make ##' >site.tmp + @echo '# Do not edit here. If you wish to override these values' >>site.tmp + @echo '# edit the last section' >>site.tmp + @echo 'set srcdir $(srcdir)' >>site.tmp + @echo "set objdir `pwd`" >>site.tmp + @echo 'set build_alias "$(build_alias)"' >>site.tmp + @echo 'set build_triplet $(build_triplet)' >>site.tmp + @echo 'set host_alias "$(host_alias)"' >>site.tmp + @echo 'set host_triplet $(host_triplet)' >>site.tmp + @echo 'set target_alias "$(target_alias)"' >>site.tmp + @echo 'set target_triplet $(target_triplet)' >>site.tmp + @echo '## All variables above are generated by configure. Do Not Edit ##' >>site.tmp + @test ! -f site.exp || \ + sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp + @-rm -f site.bak + @test ! -f site.exp || mv site.exp site.bak + @mv site.tmp site.exp + +distclean-DEJAGNU: + -rm -f site.exp site.bak + -l='$(DEJATOOL)'; for tool in $$l; do \ + rm -f $$tool.sum $$tool.log; \ + done + +distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/tests + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check-local +check: check-am +all-am: Makefile all-local +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-DEJAGNU distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am all-local check check-DEJAGNU check-am check-local \ + clean clean-generic clean-local distclean distclean-DEJAGNU \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am 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 pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF +# 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. +.NOEXPORT: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.2/testsuite/tests/Update_GetProductName.out new/yast2-update-2.14.3/testsuite/tests/Update_GetProductName.out --- old/yast2-update-2.14.2/testsuite/tests/Update_GetProductName.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-2.14.3/testsuite/tests/Update_GetProductName.out 2006-11-01 16:50:14.000000000 +0100 @@ -0,0 +1,43 @@ +Dump This test should actually log "Skipping detection of new system" && "true" because it fails to initialize installation source +Dump ------------------------------------------------------------ +Log Skipping detection of new system +Return true +Dump SUSE LINUX 10.1 (X86-64) +Dump VERSION = 10.1 +Dump +Dump $["major":10, "minor":1, "name":"SUSE LINUX", "nameandversion":"SUSE LINUX 10.1", "version":"10.1"] +Dump ------------------------------------------------------------ +Log Skipping detection of new system +Return true +Dump openSUSE 10.2 (i586) Beta1 +Dump VERSION = 10.2 +Dump +Dump $["major":10, "minor":2, "name":"openSUSE", "nameandversion":"openSUSE 10.2", "version":"10.2"] +Dump ------------------------------------------------------------ +Log Skipping detection of new system +Return true +Dump SuSE Linux 9.3 (i586) +Dump VERSION = 9.3 +Dump +Dump $["major":9, "minor":3, "name":"SuSE Linux", "nameandversion":"SuSE Linux 9.3", "version":"9.3"] +Dump ------------------------------------------------------------ +Log Skipping detection of new system +Return true +Dump SUSE Linux Enterprise 10 (i586) +Dump VERSION = 10 +Dump +Dump $["major":10, "name":"SUSE Linux Enterprise", "nameandversion":"SUSE Linux Enterprise 10", "version":"10"] +Dump ------------------------------------------------------------ +Log Skipping detection of new system +Return true +Dump SUSE LINUX Enterprise Server 9 (ia64) +Dump VERSION = 9 +Dump PATCHLEVEL = 3 +Dump $["major":9, "name":"SUSE LINUX Enterprise Server", "nameandversion":"SUSE LINUX Enterprise Server 9", "version":"9"] +Dump ------------------------------------------------------------ +Log Skipping detection of new system +Return true +Dump SUSE Linux Enterprise 11 (X86-64) Aplha4 +Dump VERSION = 11 +Dump +Dump $["major":11, "name":"SUSE Linux Enterprise", "nameandversion":"SUSE Linux Enterprise 11", "version":"11"] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.14.2/testsuite/tests/Update_GetProductName.ycp new/yast2-update-2.14.3/testsuite/tests/Update_GetProductName.ycp --- old/yast2-update-2.14.2/testsuite/tests/Update_GetProductName.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-update-2.14.3/testsuite/tests/Update_GetProductName.ycp 2006-11-01 16:50:26.000000000 +0100 @@ -0,0 +1,49 @@ +{ + + //testedfiles: Update.ycp + + include "testsuite.ycp"; + + map READ = $[ + "target" : $[ + "size" : 0, + ], + ]; + + list <string> prd_strings = [ + "SUSE LINUX 10.1 (X86-64)\nVERSION = 10.1\n", + "openSUSE 10.2 (i586) Beta1\nVERSION = 10.2\n", + "SuSE Linux 9.3 (i586)\nVERSION = 9.3\n", + "SUSE Linux Enterprise 10 (i586)\nVERSION = 10\n", + "SUSE LINUX Enterprise Server 9 (ia64)\nVERSION = 9\nPATCHLEVEL = 3", + "SUSE Linux Enterprise 11 (X86-64) Aplha4\nVERSION = 11\n", + ]; + + map WRITE = $[]; + + map EXEC = $[ + "target" : $[ + "bash_output" : $["exit" : 0, "stdout" : "", "stderr" : ""], + ], + ]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "Update"; + import "Mode"; + + Mode::SetTest("testsuite"); + + DUMP ("This test should actually log \"Skipping detection of new system\" && \"true\" because it fails to initialize installation source"); + + // this tests only the old system + // not the new system because it would need to initialize sources + foreach (string prd_string, prd_strings, { + READ["target","string"] = prd_string; + DUMP ("------------------------------------------------------------"); + TEST (``(Update::GetProductName()), [READ, WRITE, EXEC], nil); + DUMP (prd_string); + DUMP (Update::installedVersion); + }); + +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-firstboot
by root＠suse.de 01 Nov '06

01 Nov '06

Hello community, here is the log from the commit of package yast2-firstboot checked in at Wed Nov 1 18:11:45 CET 2006. -------- --- yast2-firstboot/yast2-firstboot.changes 2006-08-31 09:28:44.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-firstboot/yast2-firstboot.changes 2006-11-01 16:07:55.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Nov 1 15:07:16 CET 2006 - lslezak(a)suse.cz + +- removed SLES9 license (#207283, #206540), removed other + useless message files +- added firstboot_license client to display he license, + updated documentation (#206549) +- halt the system if the license is not accepted and the action + is set to "halt" (#211118) +- added firstboot_welcome client to display a welcome message +- 2.13.4 + +------------------------------------------------------------------- +Mon Sep 25 13:44:07 CEST 2006 - jsrain(a)suse.cz + +- don't redirect stdout of YaST firstboot to /dev/null (#190287) + +------------------------------------------------------------------- Old: ---- yast2-firstboot-2.13.3.tar.bz2 New: ---- yast2-firstboot-2.13.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.mU43Sx/_old 2006-11-01 18:11:33.000000000 +0100 +++ /var/tmp/diff_new_pack.mU43Sx/_new 2006-11-01 18:11:33.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-firstboot (Version 2.13.3) +# spec file for package yast2-firstboot (Version 2.13.4) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-firstboot URL: http://www.suse.com/ -Version: 2.13.3 +Version: 2.13.4 Release: 1 -License: X11/MIT, GPL +License: GNU General Public License (GPL) - all versions, X11/MIT Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firstboot-2.13.3.tar.bz2 +Source0: yast2-firstboot-2.13.4.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-devtools yast2-network yast2-testsuite yast2-xml Requires: yast2 @@ -43,7 +43,7 @@ Anas Nashif<nashif(a)suse.de> %prep -%setup -n yast2-firstboot-2.13.3 +%setup -n yast2-firstboot-2.13.4 %build %{prefix}/bin/y2tool y2autoconf @@ -83,7 +83,6 @@ %dir /usr/share/YaST2/include/firstboot /usr/share/YaST2/include/firstboot/*.ycp /usr/share/YaST2/modules/Firstboot.* -/usr/share/YaST2/data/* /usr/share/YaST2/scrconf/*.scr /etc/init.d/firstboot /var/adm/fillup-templates/sysconfig.firstboot @@ -92,6 +91,17 @@ /etc/YaST2/*.xml %changelog -n yast2-firstboot +* Wed Nov 01 2006 - lslezak(a)suse.cz +- removed SLES9 license (#207283, #206540), removed other + useless message files +- added firstboot_license client to display he license, + updated documentation (#206549) +- halt the system if the license is not accepted and the action + is set to "halt" (#211118) +- added firstboot_welcome client to display a welcome message +- 2.13.4 +* Mon Sep 25 2006 - jsrain(a)suse.cz +- don't redirect stdout of YaST firstboot to /dev/null (#190287) * Thu Aug 31 2006 - lslezak(a)suse.cz - the control file has been updated to the default workflow (#200718) ++++++ yast2-firstboot-2.13.3.tar.bz2 -> yast2-firstboot-2.13.4.tar.bz2 ++++++ ++++ 6021 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-firstboot-2.13.3/Makefile.am new/yast2-firstboot-2.13.4/Makefile.am --- old/yast2-firstboot-2.13.3/Makefile.am 2006-08-31 09:12:21.000000000 +0200 +++ new/yast2-firstboot-2.13.4/Makefile.am 2006-11-01 15:33:30.000000000 +0100 @@ -67,7 +67,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --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-firstboot-2.13.3/Makefile.am.common new/yast2-firstboot-2.13.4/Makefile.am.common --- old/yast2-firstboot-2.13.3/Makefile.am.common 2006-08-31 09:12:21.000000000 +0200 +++ new/yast2-firstboot-2.13.4/Makefile.am.common 2006-11-01 15:33:30.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep 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-firstboot-2.13.3/VERSION new/yast2-firstboot-2.13.4/VERSION --- old/yast2-firstboot-2.13.3/VERSION 2006-08-31 09:12:17.000000000 +0200 +++ new/yast2-firstboot-2.13.4/VERSION 2006-11-01 15:46:24.000000000 +0100 @@ -1 +1 @@ -2.13.3 +2.13.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-firstboot-2.13.3/configure.in new/yast2-firstboot-2.13.4/configure.in --- old/yast2-firstboot-2.13.3/configure.in 2006-08-31 09:12:21.000000000 +0200 +++ new/yast2-firstboot-2.13.4/configure.in 2006-11-01 15:33:30.000000000 +0100 @@ -1,6 +1,6 @@ dnl configure.in for yast2-firstboot dnl -dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-firstboot, 2.13.3, http://bugs.opensuse.org/, yast2-firstboot) 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-firstboot-2.13.3/doc/firstboot-section_mod.xml new/yast2-firstboot-2.13.4/doc/firstboot-section_mod.xml --- old/yast2-firstboot-2.13.3/doc/firstboot-section_mod.xml 2006-08-31 08:44:22.000000000 +0200 +++ new/yast2-firstboot-2.13.4/doc/firstboot-section_mod.xml 2006-11-01 15:30:19.000000000 +0100 @@ -133,16 +133,20 @@ </listitem> </itemizedlist> <para>To do this, change the values of the respective variables - (FIRSTBOOT_WELCOME_FILE,FIRSTBOOT_LICENSE_FILE , and - FIRSTBOOT_FINISH_FILE) to the full path of a plain or rich text - formatted text file. This will give you dialogs with customized + (FIRSTBOOT_WELCOME_DIR, FIRSTBOOT_WELCOME_PATTERNS, FIRSTBOOT_LICENSE_DIR, and + FIRSTBOOT_FINISH_FILE). This will give you dialogs with customized text. If the references files are in plain text, they will be shown as such automatically. If they contain any markup language, they will be formatted as rich text.</para> - <para>The default license text shown is taken from the file - <filename>/var/lib/YaST2/info.txt</filename> which is the EULA of the - product being installed.</para> + <para> + Variable FIRSTBOOT_WELCOME_DIR is path to the directory from which is the welcome message read, + FIRSTBOOT_WELCOME_PATTERNS is a list of patterns or filenames which contains the message. + </para> + + <para> + The license is read from file 'license.txt' or from 'license_<locale>.txt'. + </para> </section> <section> 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-firstboot-2.13.3/scripts/firstboot new/yast2-firstboot-2.13.4/scripts/firstboot --- old/yast2-firstboot-2.13.3/scripts/firstboot 2006-06-29 08:54:09.000000000 +0200 +++ new/yast2-firstboot-2.13.4/scripts/firstboot 2006-09-27 14:22:47.000000000 +0200 @@ -52,7 +52,7 @@ echo -n "Configuring System for the first time.. " ## Start daemon with startproc(8). If this fails ## the return value is set appropriately by startproc. - /usr/lib/YaST2/startup/YaST2.Firstboot > /dev/null 2>&1 + /usr/lib/YaST2/startup/YaST2.Firstboot 2>/dev/null # Remember status and be verbose rc_status -v 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-firstboot-2.13.3/src/Makefile.am new/yast2-firstboot-2.13.4/src/Makefile.am --- old/yast2-firstboot-2.13.3/src/Makefile.am 2006-08-30 12:55:57.000000000 +0200 +++ new/yast2-firstboot-2.13.4/src/Makefile.am 2006-11-01 14:42:18.000000000 +0100 @@ -8,6 +8,8 @@ firstboot_desktop.ycp \ firstboot_language.ycp \ firstboot_timezone.ycp \ + firstboot_license.ycp \ + firstboot_welcome.ycp \ firstboot.ycp ynclude_DATA = \ 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-firstboot-2.13.3/src/control/firstboot.xml new/yast2-firstboot-2.13.4/src/control/firstboot.xml --- old/yast2-firstboot-2.13.3/src/control/firstboot.xml 2006-08-31 09:25:28.000000000 +0200 +++ new/yast2-firstboot-2.13.4/src/control/firstboot.xml 2006-11-01 16:01:26.000000000 +0100 @@ -4,17 +4,13 @@ xmlns:config="http://www.suse.com/1.0/configns">  <textdomain>firstboot</textdomain> - <custom> - <license_action>abort</license_action> - <license_file>/usr/lib/YaST2/info.txt</license_file> - </custom> <proposals config:type="list"> <proposal> <name>firstboot_hardware</name> @@ -53,11 +49,11 @@ </module> <module> <label>Welcome</label> - <name>inst_welcome</name> + <name>firstboot_welcome</name> </module> <module> <label>License Agreement</label> - <name>inst_license</name> + <name>firstboot_license</name> </module> <module> <label>Network</label> 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-firstboot-2.13.3/src/data/Makefile.am new/yast2-firstboot-2.13.4/src/data/Makefile.am --- old/yast2-firstboot-2.13.3/src/data/Makefile.am 2006-06-29 08:54:09.000000000 +0200 +++ new/yast2-firstboot-2.13.4/src/data/Makefile.am 2006-11-01 14:33:20.000000000 +0100 @@ -1,17 +1,9 @@ # Makefile.am for firstboot/src/data -ydata_DATA = firstboot_license.txt \ - firstboot_welcome.txt \ - firstboot_finish.txt - - fillupdir = /var/adm/fillup-templates/ fillup_DATA = sysconfig.firstboot - - - -EXTRA_DIST = $(ydata_DATA) $(fillup_DATA) +EXTRA_DIST = $(fillup_DATA) include $(top_srcdir)/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-firstboot-2.13.3/src/data/firstboot_finish.txt new/yast2-firstboot-2.13.4/src/data/firstboot_finish.txt --- old/yast2-firstboot-2.13.3/src/data/firstboot_finish.txt 2006-06-29 08:54:09.000000000 +0200 +++ new/yast2-firstboot-2.13.4/src/data/firstboot_finish.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -<html> -<h1>Enjoy The Novell Linux Desktop</h1> -<p>Some more usefull text should come in here</p> -<p>This text can be changes by editing the file -<em>/usr/share/YaST2/data/firstboot_finish.txt</em></p> -<p>If no markup language is detected, it will be shown as plain text, otherwise -the page will be formatted according to the markup tags used. -</p> -</html> - 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-firstboot-2.13.3/src/data/firstboot_license.txt new/yast2-firstboot-2.13.4/src/data/firstboot_license.txt --- old/yast2-firstboot-2.13.3/src/data/firstboot_license.txt 2006-06-29 08:54:09.000000000 +0200 +++ new/yast2-firstboot-2.13.4/src/data/firstboot_license.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,275 +0,0 @@ -SUSE LINUX Enterprise Server (SLES) 9 -Novell Software License Agreement - -PLEASE READ THIS AGREEMENT CAREFULLY. BY INSTALLING OR -OTHERWISE USING THE SOFTWARE (INCLUDING ITS COMPONENTS), YOU -AGREE TO THE TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE -WITH THESE TERMS, DO NOT DOWNLOAD, INSTALL OR USE THE -SOFTWARE AND, IF APPLICABLE, RETURN THE ENTIRE UNUSED -PACKAGE TO THE RESELLER WITH YOUR RECEIPT FOR A REFUND. THE -SOFTWARE MAY NOT BE SOLD, TRANSFERRED, OR FURTHER -DISTRIBUTED WITHOUT PRIOR WRITTEN AUTHORIZATION FROM NOVELL. - -RIGHTS AND LICENSES - -This Novell Software License Agreement ("Agreement") is a -legal agreement between You (an entity or a person) and -Novell, Inc. ("Novell") with respect to the software -product identified in the title of this Agreement, media (if -any) and accompanying documentation (collectively the -"Software"). - -The Software is a collective work of Novell. You may make -and use unlimited copies of the Software for Your -distribution and use within Your Organization. The term -"Organization" means a legal entity, excluding subsidiaries -and affiliates with a separate existence for tax purposes or -for legal personality purposes. An example of an -Organization in the private sector would be a corporation, -partnership, or trust, excluding any subsidiaries or -affiliates of the organization with a separate tax -identification number or company registration number. In the -public sector, an example of Organization would be a -specific goverment body or local goverment authority. - -The Software is a modular operating system. Most of the -components are open source packages, developed -independently, and accompanied by separate license terms. -Your license rights with respect to individual components -accompanied by separate license terms are defined by those -terms; nothing in this Agreement shall restrict, limit, or -otherwise affect any rights or obligations You may have, or -conditions to which You may be subject, under such license -terms. - -While the license terms for a component may authorize You to -distribute the component, You may not use any Novell marks -(e.g., SUSE and SUSE LINUX) in distributing the component, -whether or not the component contains Novell marks. - -OTHER LICENSE TERMS AND RESTRICTIONS - -The Software is protected by the copyright laws and treaties -of the United States ("U.S.") and other countries and is -subject to the terms of this Agreement. The Software is -licensed to You, not sold. - -The Software may be bundled with other software programs -("Bundled Programs"). Your license rights with respect to -Bundled Programs accompanied by separate license terms are -defined by those terms; nothing in this Agreement shall -restrict, limit, or otherwise affect any rights or -obligations You may have, or conditions to which You may be -subject, under such license terms. - -Novell reserves all rights not expressly granted to You. You -may not: (1) reverse engineer, decompile, or disassemble the -Software except and only to the extent it is expressly -permitted by applicable law or the license terms -accompanying a component of the Software; or (2) transfer -the Software or Your license rights under this Agreement, in -whole or in part. - -MAINTENANCE AND SUPPORT - -Your rights with respect to updates, patches, or other -materials received under a subscription to a Novell -maintenance program for the Software are defined by the -relevant maintenance program terms. - -Novell has no obligation under this Agreement to provide -maintenance or support for the Software. Depending on how -You acquired the Software, You may have also acquired a -maintenance subscription for the Software. For more -information on Novell's current maintenance and support -offerings, see http://support.novell.com. - -OWNERSHIP RIGHTS - -No title to or ownership of the Software is transferred to -You. Novell and/or its licensors owns and retains all title -and ownership of all intellectual property rights in the -Software, including any adaptations or copies. You acquire -only a license to use the Software. - -LIMITED WARRANTY - -For ninety (90) days from Your date of purchase, Novell -warrants that (1) any media on which the Software is -delivered is free from physical defects; and (2) the -Software will substantially conform to the documentation -accompanying the Software. If the defective items are -returned to Novell or if You report the nonconformity to -Novell within ninety (90) days from the date of purchase, -Novell will at its sole discretion either resolve the -nonconformity or refund the license fees You paid for the -Software. Any misuse or unauthorized modification of the -Software voids this warranty. THE FOREGOING WARRANTY IS YOUR -SOLE AND EXCLUSIVE REMEDY AND IS IN LIEU OF ALL OTHER -WARRANTIES, EXPRESS OR IMPLIED. (The foregoing warranty does -not apply to Software provided free of charge. SUCH SOFTWARE -IS PROVIDED "AS IS" WITHOUT ANY WARRANTIES OF ANY KIND.) - -THE SOFTWARE IS NOT DESIGNED, MANUFACTURED OR INTENDED FOR -USE OR DISTRIBUTION WITH ON-LINE CONTROL EQUIPMENT IN -HAZARDOUS ENVIRONMENTS REQUIRING FAIL-SAFE PERFORMANCE, SUCH -AS IN THE OPERATION OF NUCLEAR FACILITIES, AIRCRAFT -NAVIGATION, COMMUNICATION, OR CONTROL SYSTEMS, DIRECT LIFE -SUPPORT MACHINES, WEAPONS SYSTEMS, OR OTHER USES IN WHICH -FAILURE OF THE SOFTWARE COULD LEAD DIRECTLY TO DEATH, -PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE. - -THE SOFTWARE IS ONLY COMPATIBLE WITH CERTAIN COMPUTERS AND -OPERATING SYSTEMS. THE SOFTWARE IS NOT WARRANTED FOR -NON-COMPATIBLE SYSTEMS. Call Novell or Your dealer for -information about compatibility. - -Non-Novell Products. The Software may include or be bundled -with hardware or other software programs licensed or sold by -a licensor other than Novell. NOVELL DOES NOT WARRANT -NON-NOVELL PRODUCTS. ANY SUCH PRODUCTS ARE PROVIDED ON AN -"AS IS" BASIS. ANY WARRANTY SERVICE FOR NON-NOVELL PRODUCTS -IS PROVIDED BY THE PRODUCT LICENSOR IN ACCORDANCE WITH THE -APPLICABLE LICENSOR WARRANTY. - -EXCEPT AS OTHERWISE RESTRICTED BY LAW, NOVELL DISCLAIMS AND -EXCLUDES ANY AND ALL IMPLIED WARRANTIES INCLUDING ANY -WARRANTIES OF MERCHANTABILITY, TITLE, NON-INFRINGEMENT, OR -FITNESS FOR A PARTICULAR PURPOSE. NOVELL MAKES NO WARRANTY, -REPRESENTATION OR PROMISE NOT EXPRESSLY SET FORTH IN THIS -LIMITED WARRANTY. NOVELL DOES NOT WARRANT THAT THE SOFTWARE -WILL SATISFY YOUR REQUIREMENTS OR THAT THE OPERATION OF THE -SOFTWARE WILL BE UNINTERRUPTED. Some jurisdictions do not -allow certain disclaimers and limitations of warranties, so -portions of the above limitations may not apply to You. This -limited warranty gives You specific rights and You may also -have other rights which vary from state to state. - -LIMITATION OF LIABILITY - -(a) Consequential Losses. NEITHER NOVELL NOR ANY OF ITS -LICENSORS, SUBSIDIARIES, OR EMPLOYEES WILL IN ANY CASE BE -LIABLE FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT, -TORT, ECONOMIC OR PUNITIVE DAMAGES ARISING OUT OF THE USE OF -OR INABILITY TO USE THE SOFTWARE, INCLUDING WITHOUT -LIMITATION LOSS OF PROFITS, BUSINESS OR DATA, EVEN IF -ADVISED OF THE POSSIBILITY OF THOSE DAMAGES. - -(b) Direct Damages. IN NO EVENT WILL NOVELL'S AGGREGATE -LIABILITY FOR DIRECT DAMAGES TO PROPERTY OR PERSON (WHETHER -IN ONE INSTANCE OR A SERIES OF INSTANCES) EXCEED 1.25 TIMES -THE AMOUNT PAID BY YOU FOR THE SOFTWARE OUT OF WHICH SUCH -CLAIM AROSE [OR $50 (U.S.) IF YOU RECEIVED THE SOFTWARE FREE -OF CHARGE]. The above exclusions and limitations will not -apply to claims relating to death or personal injury. In -those jurisdictions that do not allow the exclusion or -limitation of damages, Novell's liability shall be limited -or excluded to the maximum extent allowed within those -jurisdictions. - -GENERAL TERMS - -Term. This Agreement becomes effective on the date You -legally acquire the Software and will automatically -terminate if You breach any of its terms. Upon termination -of this Agreement, You must destroy the original and all -copies of the Software or return them to Novell and delete -the Software from Your systems. - -Benchmark Testing. This benchmark testing restriction -applies to You if You are a software vendor or if You are -performing testing on the Software at the direction of or on -behalf of a software vendor. You may not, without Novell's -prior written consent not to be unreasonably withheld, -publish or disclose to any third party the results of any -benchmark test of the Software. If You are a vendor of -products that are functionally similar to or compete with -the Software ("Similar Products"), or are acting on behalf -of such a vendor, and You publish or disclose benchmark -information on the Software in violation of this -restriction, then notwithstanding anything to the contrary -in the Similar Product's end user license agreement, and in -addition to any other remedies Novell may have, Novell shall -have the right to perform benchmark testing on Similar -Products and to disclose and publish that benchmark -information and You hereby represent that You have authority -to grant such right to Novell. - -Transfer. This Agreement may not be transferred or assigned -without the prior written approval of Novell. - -Law and Jurisdiction. This Agreement is governed by the laws -of the State of Utah, U.S. Any action at law relating to -this Agreement may only be brought before the courts of -competent jurisdiction of the State of Utah. If, however, -Your country of principal residence is a member state of the -European Union or the European Free Trade Association, this -Agreement is governed by the laws of that country, and any -action at law may only be brought before a court of -competent jurisdiction of that country. - -Entire Agreement. This Agreement and the Upgrade/Additive -Agreement (if applicable) sets forth the entire -understanding and agreement between You and Novell and may -be amended only in a writing signed by both parties. NO -LICENSOR, DISTRIBUTOR, DEALER, RETAILER, RESELLER, SALES -PERSON, OR EMPLOYEE IS AUTHORIZED TO MODIFY THIS AGREEMENT -OR TO MAKE ANY REPRESENTATION OR PROMISE THAT IS DIFFERENT -FROM, OR IN ADDITION TO, THE TERMS OF THIS AGREEMENT. - -Waiver. No waiver of any right under this Agreement will be -effective unless in writing, signed by a duly authorized -representative of the party to be bound. No waiver of any -past or present right arising from any breach or failure to -perform will be deemed to be a waiver of any future right -arising under this Agreement. - -Severability. If any provision in this Agreement is invalid -or unenforceable, that provision will be construed, limited, -modified or, if necessary, severed, to the extent necessary, -to eliminate its invalidity or unenforceability, and the -other provisions of this Agreement will remain unaffected. - -Export Compliance. Any person or entity exporting or -re-exporting Novell products directly or indirectly and via -any means, including electronic transfer, is wholly -responsible for doing so in accordance with the U.S. Export -Administration Regulations and the laws of host countries. -Novell assumes no responsibility or liability for your -failure to obtain any necessary export approvals. Approvals -are dependent upon an item's technical characteristics, the -destination, end-use and end-user, as well as other -activities of the end user. Specifically, no Novell product -may be exported to embargoed or otherwise restricted -countries or end users. Please consult the Bureau of -Industry and Security web page and other sources before -exporting Novell products from the U.S. and familiarize -yourself with the laws of destination countries before -re-exporting Novell products. This provision shall survive -the expiration or earlier termination of this Agreement. -Please refer to the export matrix for Novell products for -more information on exporting Novell Software. You can -download a copy from http://www.novell.com/info/exports/ or -obtain a copy from your local Novell office. - -U.S. Government Restricted Rights. Use, duplication, or -disclosure by the U.S. Government is subject to the -restrictions in FAR 52.227-14 (June 1987) Alternate III -(June 1987), FAR 52.227-19 (June 1987), or DFARS -252.227-7013 (b)(3) (Nov 1995), or applicable successor -clauses. Contractor/ Manufacturer is Novell, Inc., 1800 -South Novell Place, Provo, Utah 84606. - -Other. The application of the United Nations Convention of -Contracts for the International Sale of Goods is expressly -excluded. - -Copyright 1993, 2000-2004 Novell, Inc. All Rights Reserved. - -Novell is a registered trademark, and SUSE LINUX is -registered trademark, and the SUSE logo is a trademark, of -SUSE LINUX AG, a Novell company, in the United States and -other countries. Linux is a registered trademark of Linus -Torvalds. - -06/22/04 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-firstboot-2.13.3/src/data/firstboot_welcome.txt new/yast2-firstboot-2.13.4/src/data/firstboot_welcome.txt --- old/yast2-firstboot-2.13.3/src/data/firstboot_welcome.txt 2006-06-29 08:54:09.000000000 +0200 +++ new/yast2-firstboot-2.13.4/src/data/firstboot_welcome.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -<html> -<h1>Finish System Configuration</h1> -<p>Some more usefull text should come in here...</p> - -<h2>Novell Linux Desktop</h2> -<ul> -<li>A Linux desktop hardened in the Novell SuperLab -<li>Builds on the combined strengths of SUSE LINUX, Ximian Desktop and Novell -<li>Offers choice and flexibility, without sacrificing usability -<li>Serviced and supported by Novell's world-class support and consulting -operations -<li>With tools for efficient deployment in corporate environments -</ul> - -p>This text can be changes by editing the file -<em>/usr/share/YaST2/data/firstboot_welcome.txt</em></p> -<p>If no markup language is detected, it will be shown as plain text, otherwise -the page will be formatted according to the markup tags used. -</p> - -</html> - 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-firstboot-2.13.3/src/data/sysconfig.firstboot new/yast2-firstboot-2.13.4/src/data/sysconfig.firstboot --- old/yast2-firstboot-2.13.3/src/data/sysconfig.firstboot 2006-06-29 08:54:09.000000000 +0200 +++ new/yast2-firstboot-2.13.4/src/data/sysconfig.firstboot 2006-11-01 15:05:00.000000000 +0100 @@ -10,14 +10,21 @@ ## Type: string ## Default: "" # -# Welcome text file -FIRSTBOOT_WELCOME_FILE="" +# Directory from which 'welcome.txt' and 'welcome_<locale>.txt' are read +FIRSTBOOT_WELCOME_DIR="" ## Type: string -## Default: "/usr/share/YaST2/data/firstboot_license.txt" +## Default: "" +# +# Pattern for the welcome message, if not set welcome.txt and welcome_<locale>.txt files are read +# Use a comma (,) character as a separator if more than one pattern is required +FIRSTBOOT_WELCOME_PATTERNS="" + +## Type: string +## Default: "" # -# license text file -FIRSTBOOT_LICENSE_FILE="/var/lib/YaST2/info.txt" +# Directory from which 'license.txt' and 'license_<locale>.txt' are read +FIRSTBOOT_LICENSE_DIR="" ## Type: string ## Default: "" 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-firstboot-2.13.3/src/firstboot_license.ycp new/yast2-firstboot-2.13.4/src/firstboot_license.ycp --- old/yast2-firstboot-2.13.3/src/firstboot_license.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-firstboot-2.13.4/src/firstboot_license.ycp 2006-11-01 14:53:14.000000000 +0100 @@ -0,0 +1,46 @@ +/* + * + * Module: firstboot_timezone.ycp + * + * Author: Ladislav Slezak <lslezak(a)suse.cz> + * + * Submodules: + * + * + * Purpose: display a license in running system + * + * + * + * $Id:$ + */ + +{ + textdomain "firstboot"; + + import "Misc"; + import "GetInstArgs"; + + + any result = nil; + + map args = GetInstArgs::argmap(); + args["directory"] = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_LICENSE_DIR, "/etc/YaST2"); + args["action"] = Misc::SysconfigRead(.sysconfig.firstboot.LICENSE_REFUSAL_ACTION, "abort"); + + y2milestone("inst_license options: %1", args); + +// currently the pattern is hardcoded in ProductLicense::AskLicenseAgreement() function to license.txt and license_%1.txt +// args["patterns"] = [Misc::SysconfigRead(.sysconfig.firstboot.directory, "eula.txt")]; + + result = WFM::CallFunction( "inst_license", [ args ] ); + + if (result == `halt) + { + UI::CloseDialog(); + y2milestone("Halting the system..."); + SCR::Execute(.target.bash, "/sbin/halt"); + } + + return result; + +} 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-firstboot-2.13.3/src/firstboot_welcome.ycp new/yast2-firstboot-2.13.4/src/firstboot_welcome.ycp --- old/yast2-firstboot-2.13.3/src/firstboot_welcome.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-firstboot-2.13.4/src/firstboot_welcome.ycp 2006-11-01 14:54:17.000000000 +0100 @@ -0,0 +1,48 @@ +/* + * + * Module: firstboot_welcome.ycp + * + * Author: Ladislav Slezak <lslezak(a)suse.cz> + * + * Submodules: + * + * + * Purpose: display a welcome message in running system + * + * + * + * $Id:$ + */ + +{ + textdomain "firstboot"; + + import "Misc"; + import "GetInstArgs"; + import "Directory"; + + + any result = nil; + + map args = GetInstArgs::argmap(); + + string directory = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_WELCOME_DIR, ""); + if (directory != "") + { + // set the prefix to root + Directory::custom_workflow_dir = "/"; + args["directory"] = directory; + } + + string patterns = Misc::SysconfigRead(.sysconfig.firstboot.FIRSTBOOT_WELCOME_PATTERNS, ""); + if (patterns != "") + { + args["patterns"] = splitstring(patterns, ","); + } + + y2milestone("inst_welcome options: %1", args); + + result = WFM::CallFunction( "inst_welcome", [ args ] ); + + return result; +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 lilo
by root＠suse.de 01 Nov '06

01 Nov '06

Hello community, here is the log from the commit of package lilo checked in at Wed Nov 1 18:11:24 CET 2006. -------- --- arch/ppc/lilo/lilo.changes 2006-10-30 15:08:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/lilo/lilo.changes 2006-11-01 13:29:30.000000000 +0100 @@ -1,0 +2,46 @@ +Wed Nov 1 13:28:36 CET 2006 - olh(a)suse.de + +- set the os-chooser timeout from 3 to 5 seconds to fix slow monitors + +------------------------------------------------------------------- +Wed Nov 1 13:19:25 CET 2006 - olh(a)suse.de + +- use new Forth script for all Macs + +------------------------------------------------------------------- +Wed Nov 1 13:15:19 CET 2006 - olh(a)suse.de + +- set the color map also in the new Forth script + +------------------------------------------------------------------- +Tue Oct 31 23:14:50 CET 2006 - olh(a)suse.de + +- open output-device in yaboot and remove yaboot,do-open-screen handling + leave the output-device alone if yaboot,do-not-open-screen exists + +------------------------------------------------------------------- +Tue Oct 31 22:14:37 CET 2006 - olh(a)suse.de + +- use the stdout ihandle in yaboot to setup the color map + +------------------------------------------------------------------- +Tue Oct 31 15:31:23 CET 2006 - olh(a)suse.de + +- use a different Forth script for MacRISC[34] to open the screen + +------------------------------------------------------------------- +Mon Oct 30 23:04:02 CET 2006 - olh(a)suse.de + +- use load/go in os-chooser instead of boot eval in linux only config + +------------------------------------------------------------------- +Mon Oct 30 23:02:08 CET 2006 - olh(a)suse.de + +- encode foreground-color in hex in os-chooser + +------------------------------------------------------------------- +Mon Oct 30 22:59:40 CET 2006 - olh(a)suse.de + +- handle no monitor connected on G5 with nvidia card in os-chooser + +------------------------------------------------------------------- Old: ---- lilo-10.1.18.tar.bz2 yaboot-10.1.18-r849.tar.bz2 New: ---- lilo-10.1.19.tar.bz2 yaboot-10.1.19-r858.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilo.spec ++++++ --- /var/tmp/diff_new_pack.OMTTO7/_old 2006-11-01 18:07:40.000000000 +0100 +++ /var/tmp/diff_new_pack.OMTTO7/_new 2006-11-01 18:07:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package lilo (Version 10.1.18) +# spec file for package lilo (Version 10.1.19) # # 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: lilo -%define yaboot_vers 10.1.18-r849 +%define yaboot_vers 10.1.19-r858 Group: System/Boot License: BSD License and BSD-like, Other License(s), see package Summary: The Linux Loader, a Boot Menu @@ -23,7 +23,7 @@ Requires: powerpc-utils Requires: binutils Requires: parted -Version: 10.1.18 +Version: 10.1.19 Release: 1 Source0: lilo-%{version}.tar.bz2 Source1: http://penguinppc.org/projects/yaboot/yaboot-%{yaboot_vers}.tar.bz2 @@ -161,6 +161,25 @@ %doc %{_mandir}/*/* %changelog -n lilo +* Wed Nov 01 2006 - olh(a)suse.de +- set the os-chooser timeout from 3 to 5 seconds to fix slow monitors +* Wed Nov 01 2006 - olh(a)suse.de +- use new Forth script for all Macs +* Wed Nov 01 2006 - olh(a)suse.de +- set the color map also in the new Forth script +* Tue Oct 31 2006 - olh(a)suse.de +- open output-device in yaboot and remove yaboot,do-open-screen handling + leave the output-device alone if yaboot,do-not-open-screen exists +* Tue Oct 31 2006 - olh(a)suse.de +- use the stdout ihandle in yaboot to setup the color map +* Tue Oct 31 2006 - olh(a)suse.de +- use a different Forth script for MacRISC[34] to open the screen +* Mon Oct 30 2006 - olh(a)suse.de +- use load/go in os-chooser instead of boot eval in linux only config +* Mon Oct 30 2006 - olh(a)suse.de +- encode foreground-color in hex in os-chooser +* Mon Oct 30 2006 - olh(a)suse.de +- handle no monitor connected on G5 with nvidia card in os-chooser * Mon Oct 30 2006 - olh(a)suse.de - let yaboot run 'output-device output' if no yaboot,do-not-open-screen exists, or if yaboot,do-open-screen property exists in /chosen ++++++ lilo-10.1.18.tar.bz2 -> lilo-10.1.19.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.18/lilo-pmac.lib new/lilo-10.1.19/lilo-pmac.lib --- old/lilo-10.1.18/lilo-pmac.lib 2006-10-30 15:08:18.000000000 +0100 +++ new/lilo-10.1.19/lilo-pmac.lib 2006-11-01 13:29:30.000000000 +0100 @@ -1,4 +1,4 @@ -# $Id: lilo-pmac.lib 848 2006-10-30 14:08:18Z olh $ +# $Id: lilo-pmac.lib 862 2006-11-01 12:29:30Z olh $ # vim: syntax=sh # # library for PowerMac routings @@ -171,13 +171,38 @@ if [ "$OPTION_USE_OS_CHOOSER" = "yes" ] ; then cat <<-EOF dev /chosen 0 0 " yaboot,do-not-open-screen" property device-end - " screen" output - dev screen - " "(0000000000aa00aa0000aaaaaa0000aa00aaaa5500aaaaaa)" drop 0 7 set-colors - " "(5555555555ff55ff5555ffffff5555ff55ffffff55ffffff)" drop 8 15 set-colors - device-end - f to foreground-color - 0 to background-color + output-device find-device? + if + " device_type" active-package get-package-property + not + if + decode-string + 2swap + 2drop + " display" $= + if + " display-cfg" active-package get-package-property + dup + not + if + drop + decode-int + 2rot + 2drop + -1 = + not + then + if + output-device output + output-device select-dev + " "(0000000000aa00aa0000aaaaaa0000aa00aaaa5500aaaaaa)" drop 0 7 " set-colors" my-self \$call-method + " "(5555555555ff55ff5555ffffff5555ff55ffffff55ffffff)" drop 8 15 " set-colors" my-self \$call-method + h#f to foreground-color + 0 to background-color + then + then + then + then EOF if [ "$CONFIG_PARSE_HASOTHER" = "true" ] ; then @@ -204,7 +229,7 @@ MY_STRING_WITHOUT_SPACE_BAR=$MY_YABOOT_STRING SPACE_BAR_HINT="MacOS" fi - # 1 is the timeout + # 5 is the timeout cat <<-EOF " "(0C)" fb8-write drop " "(0d 0a)" fb8-write drop @@ -218,7 +243,7 @@ " "(0d 0a)" fb8-write drop " "(0d 0a)" fb8-write drop " "(09) press space to boot $SPACE_BAR_HINT ... " fb8-write drop - get-msecs d# 3 3E8 * + + get-msecs d# 5 3E8 * + begin key? if key case @@ -229,12 +254,11 @@ until drop $MY_STRING_WITHOUT_SPACE_BAR - echo EOF else cat <<-EOF - " "(0d 0a)" fb8-write drop - " Booting Yaboot ..." cr " boot $BOOT_DEVICEPATH,\\\\yaboot" eval + load $BOOT_DEVICEPATH,\\\\yaboot + go EOF fi else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/lilo-10.1.18/lilo.new new/lilo-10.1.19/lilo.new --- old/lilo-10.1.18/lilo.new 2006-10-30 14:07:26.000000000 +0100 +++ new/lilo-10.1.19/lilo.new 2006-10-30 14:07:26.000000000 +0100 @@ -66,7 +66,7 @@ function Usage() { cat <<EOHELP -lilo for PowerPC 10.1.18 +lilo for PowerPC 10.1.19 configures the Linux Loader on a few different PowerPC board types, based on the configuration file /etc/lilo.conf. This includes IBM RS/6000 and pSeries models, IBM legacy iSeries, @@ -463,7 +463,7 @@ get_arch=1 ;; --version|-v) - echo "lilo for PowerPC 10.1.18" + echo "lilo for PowerPC 10.1.19" exit 0 ;; --help) ++++++ yaboot-10.1.18-r849.tar.bz2 -> yaboot-10.1.19-r858.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.18-r849/Changelog.SuSE new/yaboot-10.1.19-r858/Changelog.SuSE --- old/yaboot-10.1.18-r849/Changelog.SuSE 2006-10-30 16:57:10.000000000 +0100 +++ new/yaboot-10.1.19-r858/Changelog.SuSE 2006-11-01 13:30:48.000000000 +0100 @@ -1,4 +1,33 @@ ------------------------------------------------------------------------ +r858 | olh | 2006-10-31 22:16:53 +0000 (Tue, 31 Oct 2006) | 3 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/prom.c + ++- open output-device in yaboot and remove yaboot,do-open-screen handling ++ leave the output-device alone if yaboot,do-not-open-screen exists + +------------------------------------------------------------------------ +r857 | olh | 2006-10-31 21:15:28 +0000 (Tue, 31 Oct 2006) | 2 lines +Changed paths: + M /trunk/lilo.changes + M /trunk/yaboot/second/yaboot.c + ++- use the stdout ihandle in yaboot to setup the color map + +------------------------------------------------------------------------ +r856 | olh | 2006-10-31 14:38:38 +0000 (Tue, 31 Oct 2006) | 1 line +Changed paths: + M /trunk/yaboot/second/yaboot.c + +remove unneeded braces in setup_display +------------------------------------------------------------------------ +r855 | olh | 2006-10-31 14:36:11 +0000 (Tue, 31 Oct 2006) | 1 line +Changed paths: + M /trunk/yaboot/second/yaboot.c + +fix printf typo in setup_display +------------------------------------------------------------------------ r849 | olh | 2006-10-30 15:53:10 +0000 (Mon, 30 Oct 2006) | 1 line Changed paths: M /trunk/yaboot/include/prom.h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.18-r849/Makefile new/yaboot-10.1.19-r858/Makefile --- old/yaboot-10.1.18-r849/Makefile 2006-10-30 16:57:11.000000000 +0100 +++ new/yaboot-10.1.19-r858/Makefile 2006-11-01 13:30:48.000000000 +0100 @@ -6,7 +6,7 @@ include Config -VERSION = 10.1.18-r849 +VERSION = 10.1.19-r858 # Debug mode (spam/verbose) DEBUG = 0 # make install vars diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.18-r849/second/prom.c new/yaboot-10.1.19-r858/second/prom.c --- old/yaboot-10.1.18-r849/second/prom.c 2006-10-30 16:53:10.000000000 +0100 +++ new/yaboot-10.1.19-r858/second/prom.c 2006-10-31 23:16:53.000000000 +0100 @@ -244,17 +244,45 @@ } } -static int open_output_device(void) +/* G5 with nvidia card crash when no monitor is connected */ +static void open_output_device(void) { int ret; - - ret = prom_get_chosen("yaboot,do-open-screen", &ret, sizeof(ret)); - if (ret >= 0) - return 1; - ret = prom_get_chosen("yaboot,do-not-open-screen", &ret, sizeof(ret)); - if (ret >= 0) - return 0; - return 1; + if (prom_get_chosen("yaboot,do-not-open-screen", &ret, sizeof(ret)) >= 0) + return; + /* *INDENT-OFF* */ + prom_interpret( + " output-device find-device?" + " if" + " \" device_type\" active-package get-package-property" + " not" + " if" + " decode-string" + " 2swap" + " 2drop" + " \" display\" $=" + " if" + " \" display-cfg\" active-package get-package-property" + " dup" + " not" + " if" + " drop" + " decode-int" + " 2rot" + " 2drop" + " -1 =" + " not" + " then" + " if" + " output-device output" + " h#f to foreground-color" + " 0 to background-color" + " then" + " then" + " then" + " then" + ); + /* *INDENT-ON* */ } void prom_init(prom_entry pp) @@ -276,9 +304,8 @@ if (!cmptbl[len]) cmptbl[len] = ' '; } - /* G5 with nvidia card crash when no monitor is connected */ - if (strstr(cmptbl, "MacRISC") && open_output_device()) - prom_interpret("output-device output"); + if (strstr(cmptbl, "MacRISC")) + open_output_device(); } prom_openprom = prom_finddevice("/openprom"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yaboot-10.1.18-r849/second/yaboot.c new/yaboot-10.1.19-r858/second/yaboot.c --- old/yaboot-10.1.18-r849/second/yaboot.c 2006-10-27 13:12:28.000000000 +0200 +++ new/yaboot-10.1.19-r858/second/yaboot.c 2006-10-31 22:15:28.000000000 +0100 @@ -592,35 +592,10 @@ 0xff, 0xff, 0x55, 0xff, 0xff, 0xff }; - int i, result; - prom_handle scrn = PROM_INVALID_HANDLE; - - /* Try Apple's mac-boot screen ihandle */ - result = (int)call_prom_return("interpret", 1, 2, "\" _screen-ihandle\" $find if execute else 0 then", &scrn); - DEBUG_F("Trying to get screen ihandle, result: %d, scrn: %p\n", result, scrn); - - if (scrn == 0 || scrn == PROM_INVALID_HANDLE) { - char type[32]; - /* Hrm... check to see if stdout is a display */ - scrn = call_prom("instance-to-package", 1, 1, prom_stdout); - DEBUG_F("instance-to-package of stdout is: %p\n", scrn); - if (prom_getprop(scrn, "device_type", type, 32) > 0 && !strncmp(type, "display", 7)) { - DEBUG_F("got it ! stdout is a screen\n"); - scrn = prom_stdout; - } else { - /* Else, we try to open the package */ - scrn = (prom_handle) call_prom("open", 1, 1, "screen"); - DEBUG_F("Open screen result: %p\n", scrn); - } - } + int i; + for (i = 0; i < 16; i++) + prom_set_color(prom_stdout, i, default_colors[i * 3], default_colors[i * 3 + 1], default_colors[i * 3 + 2]); - if (scrn == PROM_INVALID_HANDLE) { - prom_printf("No screen device found !/n"); - return; - } - for (i = 0; i < 16; i++) { - prom_set_color(scrn, i, default_colors[i * 3], default_colors[i * 3 + 1], default_colors[i * 3 + 2]); - } prom_printf("\x1b[1;37m\x1b[2;40m"); #ifdef COLOR_TEST for (i = 0; i < 16; i++) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-phone-manager
by root＠suse.de 01 Nov '06

01 Nov '06

Hello community, here is the log from the commit of package gnome-phone-manager checked in at Wed Nov 1 18:03:05 CET 2006. -------- --- GNOME/gnome-phone-manager/gnome-phone-manager.changes 2006-10-13 18:04:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-phone-manager/gnome-phone-manager.changes 2006-11-01 17:18:51.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 1 17:18:10 CET 2006 - danw(a)suse.de + +- Add gnome-phone-manager-bgo-368920-no-c++.patch to fix the build + +------------------------------------------------------------------- New: ---- gnome-phone-manager-bgo-368920-no-c++.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-phone-manager.spec ++++++ --- /var/tmp/diff_new_pack.uw6zLa/_old 2006-11-01 18:02:52.000000000 +0100 +++ /var/tmp/diff_new_pack.uw6zLa/_new 2006-11-01 18:02:52.000000000 +0100 @@ -13,15 +13,16 @@ Name: gnome-phone-manager BuildRequires: evolution-data-server-devel gnokii-devel gnome-bluetooth-devel intltool libgnomeprintui-devel librsvg-devel libwnck-devel mDNSResponder-devel mozilla-nss-devel perl-XML-Parser update-desktop-files Version: 0.8 -Release: 6 +Release: 16 URL: http://usefulinc.com/software/phonemgr Group: Hardware/Mobile -License: GPL +License: GNU General Public License (GPL) - all versions Summary: Phone Manager for GNOME Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-phone-manager/0.6/%{name}-%{ver… Patch1: %name-desktop.patch Patch2: %name-openobex.patch Patch3: %name-pixmaps.patch +Patch4: %name-bgo-368920-no-c++.patch PreReq: filesystem gconf2 Autoreqprov: on Obsoletes: phonemgr @@ -47,6 +48,7 @@ %patch1 -p1 %patch2 %patch3 +%patch4 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -83,6 +85,8 @@ /opt/gnome/share/pixmaps/cellphone.png %changelog -n gnome-phone-manager +* Wed Nov 01 2006 - danw(a)suse.de +- Add gnome-phone-manager-bgo-368920-no-c++.patch to fix the build * Fri Oct 13 2006 - danw(a)suse.de - Remove dead patch * Thu Sep 21 2006 - jhargadon(a)suse.de ++++++ gnome-phone-manager-bgo-368920-no-c++.patch ++++++ --- configure.in +++ configure.in @@ -18,9 +18,7 @@ AC_PROG_INTLTOOL([0.18]) AC_PROG_CC -AC_PROG_CXX AC_PROG_INSTALL -AC_LANG(C++) AC_ISC_POSIX dnl Check for the "check" unit test framework dnl AC_CHECK_LIB(check,suite_create) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gnome-applets
by root＠suse.de 01 Nov '06

01 Nov '06

Hello community, here is the log from the commit of package gnome-applets checked in at Wed Nov 1 18:02:46 CET 2006. -------- --- GNOME/gnome-applets/gnome-applets.changes 2006-10-16 22:31:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-applets/gnome-applets.changes 2006-10-31 19:08:38.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 31 19:06:44 CET 2006 - jhargadon(a)suse.de + +- added --enable-mini-commander as a configure option in the + specfile to add the mini-commandline applet (#216537) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-applets.spec ++++++ --- /var/tmp/diff_new_pack.62q8fA/_old 2006-11-01 18:01:43.000000000 +0100 +++ /var/tmp/diff_new_pack.62q8fA/_new 2006-11-01 18:01:43.000000000 +0100 @@ -17,7 +17,7 @@ %endif %define prefix /opt/gnome %define sysconfdir /etc%{prefix} -License: GPL, LGPL +License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/GUI/GNOME Provides: gnome-applets2 gswitchit Obsoletes: gnome-applets2 gswitchit @@ -27,7 +27,7 @@ %endif Autoreqprov: on Version: 2.16.1 -Release: 6 +Release: 18 Summary: A Collection of Useful Programs for the GNOME 2.x Desktop Panel Source: %{name}-%{version}.tar.bz2 Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2 @@ -143,6 +143,7 @@ --libexecdir=%{prefix}/lib/gnome-applets \ --datadir=%prefix/share \ --localstatedir=/var/lib \ + --enable-mini-commander \ --with-kde-datadir=/opt/kde3/share \ %if %suse_version > 900 %ifnarch s390 s390x @@ -151,7 +152,7 @@ %endif --enable-platform-gnome2 \ --disable-scrollkeeper -make +make %{?jobs:-j %jobs} %install export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 @@ -211,6 +212,8 @@ %{sysconfdir}/gconf/schemas/modemlights.schemas %{sysconfdir}/gconf/schemas/multiload.schemas %{sysconfdir}/gconf/schemas/stickynotes.schemas +%{sysconfdir}/gconf/schemas/mini-commander-global.schemas +%{sysconfdir}/gconf/schemas/mini-commander.schemas %{sysconfdir}/sound/events/*.soundlist %{prefix}/share/pixmaps/* %{prefix}/share/gnome/help/* @@ -229,6 +232,7 @@ %{prefix}/share/icons/hicolor/*/apps/gnome-cpu-frequency-applet.svg %{prefix}/share/icons/hicolor/*/apps/gnome-eyes-applet.svg %{prefix}/share/icons/hicolor/*/apps/gnome-sticky-notes-applet.svg +%{prefix}/share/icons/hicolor/*/apps/gnome-mini-commander.png %{prefix}/share/xmodmap %{prefix}/%{_lib}/libgweather.so %{prefix}/%{_lib}/*.so.* @@ -252,6 +256,9 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n gnome-applets +* Tue Oct 31 2006 - jhargadon(a)suse.de +- added --enable-mini-commander as a configure option in the + specfile to add the mini-commandline applet (#216537) * Mon Oct 16 2006 - danw(a)suse.de - Remove dead patches. - Remove all battstat-related patches, since it's been deprecated @@ -533,7 +540,7 @@ [#86756] * add Prince Edward Island - bug #87343 * fix setting location in the gweather prefs dialog -- bugs #86631, #88182, and #79787 + - bugs #86631, #88182, and #79787 * error dialog if can't start mixer * gconf sanity checks - fixes crash #84922, #82759 * Thu Jun 27 2002 - hhetter(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 bayonne2
by root＠suse.de 01 Nov '06

01 Nov '06

Hello community, here is the log from the commit of package bayonne2 checked in at Wed Nov 1 18:01:37 CET 2006. -------- --- bayonne2/bayonne2.changes 2006-07-18 21:26:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/bayonne2/bayonne2.changes 2006-11-01 17:44:51.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 1 17:44:47 CET 2006 - meissner(a)suse.de + +- use RPM_OPT_FLAGS + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bayonne2.spec ++++++ --- /var/tmp/diff_new_pack.EKsa42/_old 2006-11-01 18:01:28.000000000 +0100 +++ /var/tmp/diff_new_pack.EKsa42/_new 2006-11-01 18:01:28.000000000 +0100 @@ -16,10 +16,10 @@ BuildRequires: capi4linux %endif Version: 1.5.19 -Release: 1 +Release: 19 Summary: the telephony server of the GNU project URL: http://www.gnu.org/software/bayonne -License: GPL +License: GNU General Public License (GPL) - all versions Group: Productivity/Telephony/Servers Autoreqprov: on PreReq: %insserv_prereq %fillup_prereq @@ -85,6 +85,7 @@ %build %{?suse_update_config:%{suse_update_config -f}} autoreconf --force --install +CXXFLAGS="$RPM_OPT_FLAGS" \ ./configure \ --disable-static \ --prefix=%{_prefix} \ @@ -154,6 +155,8 @@ %{_datadir}/phrasebook/* %changelog -n bayonne2 +* Wed Nov 01 2006 - meissner(a)suse.de +- use RPM_OPT_FLAGS * Tue Jul 18 2006 - kkaempf(a)suse.de - update to 1.5.9 - use given init script, patched for lsb compatibility ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pam_keyring
by root＠suse.de 01 Nov '06

01 Nov '06

Hello community, here is the log from the commit of package pam_keyring checked in at Wed Nov 1 01:40:11 CET 2006. -------- --- pam_keyring/pam_keyring.changes 2006-06-19 10:17:15.000000000 +0200 +++ /mounts/work_src_done/STABLE/pam_keyring/pam_keyring.changes 2006-10-31 19:18:34.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Oct 31 19:16:15 CET 2006 - sbrabec(a)suse.cz + +- Added PAM policy editing scriptlets (#186189). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam_keyring.spec ++++++ --- /var/tmp/diff_new_pack.RXiXeh/_old 2006-11-01 01:39:30.000000000 +0100 +++ /var/tmp/diff_new_pack.RXiXeh/_new 2006-11-01 01:39:30.000000000 +0100 @@ -12,19 +12,20 @@ Name: pam_keyring Version: 0.0.8 -Release: 1 +Release: 16 URL: http://www.hekanetworks.com/pam_keyring Group: System/GUI/GNOME -License: GPL +License: GNU General Public License (GPL) - all versions Summary: Unlocks a Keyring Using the Login Password Source: %{name}-%{version}.tar.bz2 Autoreqprov: on -BuildRequires: glib2-devel gnome-keyring-devel pam-devel +BuildRequires: gdm glib2-devel gnome-keyring-devel pam-devel +Prereq: sed grep gdm BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -pam_keyring is a pam module that launches the gnome-keyring-daemon and -then tries to unlock a keyring using your login password. +pam_keyring is a pam module that launches the gnome-keyring-daemon then +tries to unlock a keyring using your login password. @@ -54,6 +55,25 @@ %clean rm -rf $RPM_BUILD_ROOT +%triggerin -- gdm +if ! fgrep -q pam_keyring.so etc/pam.d/gdm ; then + sed -i '/ pam_keyring\.so/d +$aauth optional pam_keyring.so try_first_pass\ +session optional pam_keyring.so' etc/pam.d/gdm +fi + +%post +if ! fgrep -q pam_keyring.so etc/pam.d/gdm ; then + sed -i '/ pam_keyring\.so/d +$aauth optional pam_keyring.so try_first_pass\ +session optional pam_keyring.so' etc/pam.d/gdm +fi + +%postun +if ! test -f %{_lib}/security/pam_keyring.so ; then + sed -i '/ pam_keyring\.so/d' etc/pam.d/gdm +fi + %files %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog FAQ NEWS README TODO @@ -62,5 +82,7 @@ /%{_lib}/security/*.so %changelog -n pam_keyring +* Tue Oct 31 2006 - sbrabec(a)suse.cz +- Added PAM policy editing scriptlets (#186189). * Mon Jun 19 2006 - sbrabec(a)suse.cz - New SuSE package, version 0.0.8 (feature #300590). ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 qt3
by root＠suse.de 01 Nov '06

01 Nov '06

Hello community, here is the log from the commit of package qt3 checked in at Wed Nov 1 01:40:02 CET 2006. -------- --- KDE/qt3/qt3-devel-doc.changes 2006-10-22 23:39:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/qt3/qt3-devel-doc.changes 2006-11-01 01:39:30.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Oct 31 13:18:44 CET 2006 - dmueller(a)suse.de + +- add patch to fix han localisation issue (#216183) +- update qt-debug-timer patch to output more verbose debug +- add patch to fix xinerama issue with popupmenus (#216235) + +------------------------------------------------------------------- qt3-extensions.changes: same change qt3-static.changes: same change qt3.changes: same change New: ---- fix-han-localisation.diff xinerama-qpopupmenu.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.sQANHz/_old 2006-11-01 01:39:38.000000000 +0100 +++ /var/tmp/diff_new_pack.sQANHz/_new 2006-11-01 01:39:38.000000000 +0100 @@ -13,12 +13,12 @@ Name: qt3-devel-doc BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libmng-devel libpng-devel pkgconfig qt3-devel update-desktop-files Url: http://www.trolltech.com/ -License: Other License(s), see package +License: GNU General Public License (GPL) - all versions, THE Q PUBLIC LICENSE (QPL) Autoreqprov: on Summary: Qt 3 Development Kit Group: Documentation/HTML Version: 3.3.7 -Release: 1 +Release: 3 PreReq: /bin/grep BuildArch: noarch Provides: qt3-devel-tutorial @@ -83,6 +83,8 @@ Patch115: restore-qtextedit-performance.diff Patch116: pedantic-headers.diff Patch117: qtimer-debug.diff +Patch118: fix-han-localisation.diff +Patch119: xinerama-qpopupmenu.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -144,6 +146,8 @@ %patch115 %patch116 %patch117 +%patch118 +%patch119 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -227,6 +231,10 @@ /usr/share/pixmaps/assistant3.png %changelog -n qt3-devel-doc +* Tue Oct 31 2006 - dmueller(a)suse.de +- add patch to fix han localisation issue (#216183) +- update qt-debug-timer patch to output more verbose debug +- add patch to fix xinerama issue with popupmenus (#216235) * Fri Oct 20 2006 - dmueller(a)suse.de - update to 3.3.7: * include CVE-2006-4811 patch ++++++ qt3-extensions.spec ++++++ --- /var/tmp/diff_new_pack.sQANHz/_old 2006-11-01 01:39:38.000000000 +0100 +++ /var/tmp/diff_new_pack.sQANHz/_new 2006-11-01 01:39:38.000000000 +0100 @@ -14,7 +14,7 @@ BuildRequires: cups-devel krb5-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files License: GNU General Public License (GPL) - all versions, THE Q PUBLIC LICENSE (QPL) Version: 3.3.7 -Release: 1 +Release: 3 Autoreqprov: on Requires: qt3 = %version Group: Development/Tools/Other @@ -78,6 +78,8 @@ Patch115: restore-qtextedit-performance.diff Patch116: pedantic-headers.diff Patch117: qtimer-debug.diff +Patch118: fix-han-localisation.diff +Patch119: xinerama-qpopupmenu.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -137,6 +139,8 @@ %patch115 %patch116 %patch117 +%patch118 +%patch119 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -471,6 +475,10 @@ %{_mandir}/man*/* %changelog -n qt3-extensions +* Tue Oct 31 2006 - dmueller(a)suse.de +- add patch to fix han localisation issue (#216183) +- update qt-debug-timer patch to output more verbose debug +- add patch to fix xinerama issue with popupmenus (#216235) * Fri Oct 20 2006 - dmueller(a)suse.de - update to 3.3.7: * include CVE-2006-4811 patch ++++++ qt3-static.spec ++++++ --- /var/tmp/diff_new_pack.sQANHz/_old 2006-11-01 01:39:38.000000000 +0100 +++ /var/tmp/diff_new_pack.sQANHz/_new 2006-11-01 01:39:38.000000000 +0100 @@ -12,12 +12,12 @@ Name: qt3-static BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libdrm-devel libjpeg-devel libmng-devel libpng-devel -License: Other License(s), see package +License: GNU General Public License (GPL) - all versions, Other License(s), see package Group: Development/Libraries/X11 Autoreqprov: on Summary: static program library for developing applications with graphical user interfaces Version: 3.3.7 -Release: 1 +Release: 4 %define x11_free -x11-free- %define rversion %version # COMMON-BEGIN @@ -77,6 +77,8 @@ Patch115: restore-qtextedit-performance.diff Patch116: pedantic-headers.diff Patch117: qtimer-debug.diff +Patch118: fix-han-localisation.diff +Patch119: xinerama-qpopupmenu.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -147,6 +149,8 @@ %patch115 %patch116 %patch117 +%patch118 +%patch119 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -236,6 +240,10 @@ #/usr/lib/qt3/%{_lib}/libqt-mini.a %changelog -n qt3-static +* Tue Oct 31 2006 - dmueller(a)suse.de +- add patch to fix han localisation issue (#216183) +- update qt-debug-timer patch to output more verbose debug +- add patch to fix xinerama issue with popupmenus (#216235) * Fri Oct 20 2006 - dmueller(a)suse.de - update to 3.3.7: * include CVE-2006-4811 patch ++++++ qt3.spec ++++++ --- /var/tmp/diff_new_pack.sQANHz/_old 2006-11-01 01:39:38.000000000 +0100 +++ /var/tmp/diff_new_pack.sQANHz/_new 2006-11-01 01:39:38.000000000 +0100 @@ -14,12 +14,12 @@ #Remember also to modify Requires in -devel package BuildRequires: Mesa-devel c++_compiler cups-devel freetype2-devel libjpeg-devel libmng-devel libpng-devel pkgconfig update-desktop-files xorg-x11-devel URL: http://www.trolltech.com/ -License: Other License(s), see package, GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) - all versions, Other License(s), see package Group: System/Libraries Autoreqprov: on Summary: A library for developing applications with graphical user interfaces Version: 3.3.7 -Release: 1 +Release: 3 Provides: qt_library_%version PreReq: /bin/grep %define x11_free -x11-free- @@ -80,6 +80,8 @@ Patch115: restore-qtextedit-performance.diff Patch116: pedantic-headers.diff Patch117: qtimer-debug.diff +Patch118: fix-han-localisation.diff +Patch119: xinerama-qpopupmenu.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -148,6 +150,8 @@ %patch115 %patch116 %patch117 +%patch118 +%patch119 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/ ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/ ln -sf $PWD/src/kernel/qinputcontext.h include/ @@ -367,6 +371,10 @@ /etc/profile.d/qt3.* %changelog -n qt3 +* Tue Oct 31 2006 - dmueller(a)suse.de +- add patch to fix han localisation issue (#216183) +- update qt-debug-timer patch to output more verbose debug +- add patch to fix xinerama issue with popupmenus (#216235) * Fri Oct 20 2006 - dmueller(a)suse.de - update to 3.3.7: * include CVE-2006-4811 patch ++++++ fix-han-localisation.diff ++++++ --- src/kernel/qfontdatabase.cpp +++ src/kernel/qfontdatabase.cpp @@ -957,7 +957,7 @@ parseFontName( request.family, foundry_name, family_name ); #ifdef Q_WS_X11 - if (family_name.isEmpty() && script == QFont::Han) { + if (script == QFont::Han) { // modify script according to locale static QFont::Script defaultHan = QFont::UnknownScript; if (defaultHan == QFont::UnknownScript) { ++++++ qtimer-debug.diff ++++++ --- /var/tmp/diff_new_pack.sQANHz/_old 2006-11-01 01:39:39.000000000 +0100 +++ /var/tmp/diff_new_pack.sQANHz/_new 2006-11-01 01:39:39.000000000 +0100 @@ -1,8 +1,38 @@ -Index: src/kernel/qeventloop_unix.cpp -=================================================================== ---- src/kernel/qeventloop_unix.cpp (revision 594273) -+++ src/kernel/qeventloop_unix.cpp (working copy) -@@ -552,6 +552,14 @@ int QEventLoop::activateTimers() +--- src/kernel/qeventloop_unix.cpp ++++ src/kernel/qeventloop_unix.cpp +@@ -514,6 +528,17 @@ + return (tm->tv_sec*1000) + (tm->tv_usec/1000); + } + ++static QString fullName(QObject* obj) ++{ ++ QString oname; ++ if (obj && obj->name()) ++ oname = obj->name(); ++ ++ if (obj && obj->parent()) ++ return fullName(obj->parent()) + "/" + oname; ++ return oname; ++} ++ + int QEventLoop::activateTimers() + { + if ( !timerList || !timerList->count() ) // no timers +@@ -549,9 +574,27 @@ + t->timeout += t->interval; + if ( t->timeout < currentTime ) + t->timeout = currentTime + t->interval; ++ // prefer system clock ticks for low resolution timers ++ // to save cpu power ++ if (t->interval.tv_sec * 1000 + t->interval.tv_usec / 1000 >= 1000) { ++ timeval drift; ++ drift.tv_sec = 0; ++ drift.tv_usec = (t->interval.tv_usec / 8) + (t->interval.tv_sec % 8) * 1000 * 1000 / 8; ++ timeval synced = t->timeout + drift; ++ if (synced.tv_usec < 2 * drift.tv_usec) ++ synced.tv_usec = 0; ++ t->timeout = synced; ++ } insertTimer( t ); // relink timer if ( t->interval.tv_usec > 0 || t->interval.tv_sec > 0 ) n_act++; @@ -11,8 +41,7 @@ + qDebug("qtimer: %d/%s %d ms for %p/%s %s", + getpid(), qApp && qApp->name() ? qApp->name() : "", + t->interval.tv_sec * 1000 + t->interval.tv_usec / 1000, -+ t->obj, t->obj && t->obj->name() ? t->obj->name() : -+ "", t->obj->className()); ++ t->obj, fullName(t->obj).latin1(), t->obj->className()); + QTimerEvent e( t->id ); QApplication::sendEvent( t->obj, &e ); // send event ++++++ xinerama-qpopupmenu.diff ++++++ --- src/widgets/qpopupmenu.cpp.sav +++ src/widgets/qpopupmenu.cpp @@ -457,6 +457,15 @@ menuContentsChanged(); } +QRect QPopupMenu::screenRect( const QPoint& pos ) +{ + int screen_num = QApplication::desktop()->screenNumber( pos ); +#ifdef Q_WS_MAC + return QApplication::desktop()->availableGeometry( screen_num ); +#else + return QApplication::desktop()->screenGeometry( screen_num ); +#endif +} /*! Displays the popup menu so that the item number \a indexAtPoint will be at the specified \e global position \a pos. To translate a @@ -501,6 +510,15 @@ // point. #endif + QRect screen = screenRect( geometry().center()); + QRect screen2 = screenRect( QApplication::reverseLayout() + ? pos+QPoint(width(),0) : pos ); + // if the widget is not in the screen given by the position, move it + // there, so that updateSize() uses the right size of the screen + if( screen != screen2 ) { + screen = screen2; + move( screen.x(), screen.y()); + } if(d->scroll.scrollable) { d->scroll.scrollable = QPopupMenuPrivate::Scroll::ScrollNone; d->scroll.topScrollableIndex = d->scroll.scrollableSize = 0; @@ -520,18 +538,6 @@ updateSize(TRUE); } - int screen_num; - if (QApplication::desktop()->isVirtualDesktop()) - screen_num = - QApplication::desktop()->screenNumber( QApplication::reverseLayout() ? - pos+QPoint(width(),0) : pos ); - else - screen_num = QApplication::desktop()->screenNumber( this ); -#ifdef Q_WS_MAC - QRect screen = QApplication::desktop()->availableGeometry( screen_num ); -#else - QRect screen = QApplication::desktop()->screenGeometry( screen_num ); -#endif int sw = screen.width(); // screen width int sh = screen.height(); // screen height int sx = screen.x(); // screen pos @@ -1059,7 +1065,7 @@ mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 4 ); } - int dh = QApplication::desktop()->height(); + int dh = screenRect( geometry().center()).height(); ncols = 1; for ( QMenuItemListIt it2( *mitems ); it2.current(); ++it2 ) { @@ -2313,9 +2319,9 @@ bool right = FALSE; if ( ( parentMenu && parentMenu->isPopupMenu && ((QPopupMenu*)parentMenu)->geometry().x() < geometry().x() ) || - p.x() < 0 ) + p.x() < screenRect( p ).left()) right = TRUE; - if ( right && (ps.width() > QApplication::desktop()->width() - mapToGlobal( r.topRight() ).x() ) ) + if ( right && (ps.width() > screenRect( p ).right() - mapToGlobal( r.topRight() ).x() ) ) right = FALSE; if ( right ) p.setX( mapToGlobal( r.topRight() ).x() ); @@ -2326,7 +2332,7 @@ bool left = FALSE; if ( ( parentMenu && parentMenu->isPopupMenu && ((QPopupMenu*)parentMenu)->geometry().x() > geometry().x() ) || - p.x() + ps.width() > QApplication::desktop()->width() ) + p.x() + ps.width() > screenRect( p ).right() ) left = TRUE; if ( left && (ps.width() > mapToGlobal( r.topLeft() ).x() ) ) left = FALSE; @@ -2334,8 +2340,8 @@ p.setX( mapToGlobal( r.topLeft() ).x() - ps.width() ); } QRect pr = popup->itemGeometry(popup->count() - 1); - if (p.y() + ps.height() > QApplication::desktop()->height() && - p.y() - ps.height() + (QCOORD) pr.height() >= 0) + if (p.y() + ps.height() > screenRect( p ).bottom() && + p.y() - ps.height() + (QCOORD) pr.height() >= screenRect( p ).top()) p.setY( p.y() - ps.height() + (QCOORD) pr.height()); if ( style().styleHint(QStyle::SH_PopupMenu_SloppySubMenus, this )) { --- src/widgets/qpopupmenu.h.sav +++ src/widgets/qpopupmenu.h @@ -152,6 +152,7 @@ QSize updateSize(bool force_recalc=FALSE, bool do_resize=TRUE); void updateRow( int row ); + QRect screenRect(const QPoint& pos); #ifndef QT_NO_ACCEL void updateAccel( QWidget * ); void enableAccel( bool ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nautilus
by root＠suse.de 01 Nov '06

01 Nov '06

Hello community, here is the log from the commit of package nautilus checked in at Wed Nov 1 01:39:27 CET 2006. -------- --- GNOME/nautilus/nautilus.changes 2006-10-14 17:59:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2006-10-31 20:22:34.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Oct 31 20:21:44 CET 2006 - joeshaw(a)suse.de + +- Add a patch to ensure that the search entry bar is displayed + when navigating to the x-nautilus-search:/// URI. (bnc #212649) + +------------------------------------------------------------------- New: ---- nautilus-212649-search-bar-visibility.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.IBnLR5/_old 2006-11-01 01:39:00.000000000 +0100 +++ /var/tmp/diff_new_pack.IBnLR5/_new 2006-11-01 01:39:00.000000000 +0100 @@ -14,11 +14,11 @@ BuildRequires: cdparanoia eel-devel gnome-common gnome-patch-translation intltool libbeagle-devel libexif libgnomeui-devel libidl librsvg-devel mDNSResponder-devel perl-XML-Parser update-desktop-files %define prefix /opt/gnome %define sysconfdir /etc%{prefix} -License: GPL +License: GNU General Public License (GPL) - all versions Group: Productivity/File utilities Autoreqprov: on Version: 2.16.1 -Release: 4 +Release: 14 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.… URL: http://www.gnome.org @@ -41,6 +41,7 @@ Patch46: nautilus-142860-vfs-drive-for-extensions.diff Patch49: nautilus-172870-support-drives-and-volumes.diff Patch50: nautilus-174766-fix-lazy-positioning.diff +Patch51: nautilus-212649-search-bar-visibility.patch PreReq: filesystem gconf2 shared-mime-info Requires: gnome2-user-docs Provides: nautilus2 @@ -89,6 +90,7 @@ %patch46 -p1 #%patch49 -p1 %patch50 -p1 +%patch51 # FIXME: this code updates translation for upstreamed patches. cd po intltool-update --pot @@ -173,6 +175,9 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n nautilus +* Tue Oct 31 2006 - joeshaw(a)suse.de +- Add a patch to ensure that the search entry bar is displayed + when navigating to the x-nautilus-search:/// URI. (bnc #212649) * Sat Oct 14 2006 - danw(a)suse.de - Remove dead patches * Tue Oct 03 2006 - jhargadon(a)suse.de ++++++ nautilus-212649-search-bar-visibility.patch ++++++ This patch fixes a problem in which the search bar is not visible and it's not obvious how to search when you navigate directly to the x-nautilus-search:/// URI. This also fixes a problem in which focus is stolen away from the search bar when the window is first displayed. This is filed upstream at http://bugzilla.gnome.org/368424 Index: src/nautilus-navigation-window.c =================================================================== RCS file: /cvs/gnome/nautilus/src/nautilus-navigation-window.c,v retrieving revision 1.450 diff -u -p -u -r1.450 nautilus-navigation-window.c --- src/nautilus-navigation-window.c 2 Oct 2006 10:53:58 -0000 1.450 +++ src/nautilus-navigation-window.c 31 Oct 2006 17:53:23 -0000 @@ -1128,8 +1128,7 @@ real_set_search_mode (NautilusWindow *wi query_editor = nautilus_query_editor_new (TRUE, nautilus_search_directory_is_indexed (search_directory)); } else { - nautilus_navigation_window_show_location_bar_temporarily (nav_window); - nautilus_navigation_window_set_bar_mode (nav_window, NAUTILUS_BAR_SEARCH); + nautilus_navigation_window_show_search (nav_window); nav_window->details->temporary_search_bar = FALSE; query_editor = nautilus_query_editor_new_with_bar (FALSE, @@ -1145,7 +1144,7 @@ real_set_search_mode (NautilusWindow *wi nautilus_query_editor_set_query (NAUTILUS_QUERY_EDITOR (query_editor), query); g_object_unref (query); - }else { + } else { nautilus_query_editor_set_default_query (NAUTILUS_QUERY_EDITOR (query_editor)); } @@ -1466,16 +1465,18 @@ nautilus_navigation_window_show (GtkWidg nautilus_navigation_window_hide_toolbar (window); } - if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { - nautilus_navigation_window_show_location_bar (window, FALSE); - } else { - nautilus_navigation_window_hide_location_bar (window, FALSE); - } - - if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY)) { - nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_NAVIGATION); - } else { - nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_PATH); + if (! nautilus_navigation_window_search_bar_showing (window)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { + nautilus_navigation_window_show_location_bar (window, FALSE); + } else { + nautilus_navigation_window_hide_location_bar (window, FALSE); + } + + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY)) { + nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_NAVIGATION); + } else { + nautilus_navigation_window_set_bar_mode (window, NAUTILUS_BAR_PATH); + } } if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_SIDEBAR)) { @@ -1491,6 +1492,11 @@ nautilus_navigation_window_show (GtkWidg } GTK_WIDGET_CLASS (parent_class)->show (widget); + + /* Lame hack to ensure that the icon view doesn't steal the focus away */ + if (nautilus_navigation_window_search_bar_showing (window)) { + nautilus_search_bar_grab_focus (NAUTILUS_SEARCH_BAR (window->search_bar)); + } } static void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mkinitrd
by root＠suse.de 01 Nov '06

01 Nov '06

Hello community, here is the log from the commit of package mkinitrd checked in at Wed Nov 1 01:39:25 CET 2006. -------- --- mkinitrd/mkinitrd.changes 2006-10-17 00:12:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2006-10-31 18:46:40.000000000 +0100 @@ -1,0 +2,30 @@ +Tue Oct 31 18:46:13 CET 2006 - olh(a)suse.de + +- require file for elf detection + +------------------------------------------------------------------- +Tue Oct 31 18:35:34 CET 2006 - olh(a)suse.de + +- use RPM_OPT_FLAGS + +------------------------------------------------------------------- +Tue Oct 31 18:13:07 CET 2006 - olh(a)suse.de + +- reduce build requires + +------------------------------------------------------------------- +Sat Oct 28 13:15:15 CEST 2006 - olh(a)suse.de + +- ldd exits early if ld.so fails on one of the passed binaries + +------------------------------------------------------------------- +Thu Oct 26 00:41:27 CEST 2006 - olh(a)suse.de + +- use ELF type for lib/lib64 decision + +------------------------------------------------------------------- +Thu Oct 26 00:28:45 CEST 2006 - olh(a)suse.de + +- do the chmod 755 in cp_bin to fix suid binaries early + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.5ENjbF/_old 2006-11-01 01:38:57.000000000 +0100 +++ /var/tmp/diff_new_pack.5ENjbF/_new 2006-11-01 01:38:57.000000000 +0100 @@ -11,14 +11,14 @@ # norootforbuild Name: mkinitrd -License: GPL +License: GNU General Public License (GPL) - all versions Group: System/Base Provides: aaa_base:/sbin/mk_initrd -Requires: coreutils modutils util-linux grep e2fsprogs gzip sed gawk cpio udev pciutils sysvinit reiserfs -# bootsplash required only if creating splash initrd's. +BuildRequires: -e2fsprogs -module-init-tools -pciutils -reiserfs -udev +Requires: coreutils modutils util-linux grep e2fsprogs gzip sed gawk cpio udev pciutils sysvinit reiserfs file Autoreqprov: on Version: 1.2 -Release: 131 +Release: 136 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd @@ -58,7 +58,7 @@ cp %{S:10} . %build -gcc -Wall -Os -o run-init run-init.c +gcc $RPM_OPT_FLAGS -Wall -Os -o run-init run-init.c %install rm -rf $RPM_BUILD_ROOT @@ -87,6 +87,18 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog -n mkinitrd +* Tue Oct 31 2006 - olh(a)suse.de +- require file for elf detection +* Tue Oct 31 2006 - olh(a)suse.de +- use RPM_OPT_FLAGS +* Tue Oct 31 2006 - olh(a)suse.de +- reduce build requires +* Sat Oct 28 2006 - olh(a)suse.de +- ldd exits early if ld.so fails on one of the passed binaries +* Thu Oct 26 2006 - olh(a)suse.de +- use ELF type for lib/lib64 decision +* Thu Oct 26 2006 - olh(a)suse.de +- do the chmod 755 in cp_bin to fix suid binaries early * Mon Oct 16 2006 - hare(a)suse.de - Escape 'mdadm' to avoid error messages - Only use '-C' for fsck if we're on the console (#121946) ++++++ mkinitrd ++++++ --- mkinitrd/mkinitrd 2006-10-17 00:12:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd 2006-10-28 13:17:13.000000000 +0200 @@ -23,7 +23,7 @@ # This file is kept in the following CVS repository: # # $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $ -# $Revision: 1.344 $ +# $Revision: 1.349 $ usage() { cat<<EOF @@ -460,6 +460,13 @@ initrd_bins[${#initrd_bins[@]}]=$1 shift done + # file may print '^setuid ELF ...' + # suid mount will fail if mkinitrd was called as user + if [ -L "$1" ]; then + : do nothing with symlinks + elif [ -d "$1" -o -f "$1" ]; then + find "$1" -type f -print0 | xargs -0 chmod 0755 + fi } # Resolve dynamic library dependencies. Returns a list of symbolic links @@ -473,7 +480,7 @@ fi initrd_libs=( $( - $LDD "$@" \ + for i in "$@" ; do $LDD "$i" ; done \ | sed -ne 's:\t$.* => $\?$/.*$ (0x[0-9a-f]*):\2:p' ) ) @@ -1382,22 +1389,6 @@ getent group | sed 's/^$[^:]\+$:[^:]*:$[^:]\+$:.*/\1::\2:/' > $tmp_mnt/etc/group (echo 'passwd: files';echo 'group: files') > $tmp_mnt/etc/nsswitch.conf - if [ -d /lib64 ]; then - mkdir -p $tmp_mnt/lib64 - for nss_lib in /lib64/libnss_files*; do - if [ -f "$nss_lib" ]; then - cp_bin $nss_lib $tmp_mnt/lib64 - fi - done - else - mkdir -p $tmp_mnt/lib - for nss_lib in /lib/libnss_files*; do - if [ -f "$nss_lib" ]; then - cp_bin $nss_lib $tmp_mnt/lib - fi - done - fi - cp_bin /sbin/udevd $tmp_mnt/sbin/ cp_bin /sbin/udevtrigger $tmp_mnt/sbin/ cp_bin /sbin/udevsettle $tmp_mnt/sbin/ @@ -1478,9 +1469,11 @@ cp_bin /usr/bin/expr $tmp_mnt/bin mkdir -p $tmp_mnt/mnt cp -a /etc/evms.conf $tmp_mnt/etc - [ -d /lib/evms ] && evms_lib="/lib/evms" - [ -d /lib64/evms ] && evms_lib="/lib64/evms" - + evms_lib= + case "`LANG=C LC_ALL=C file -b $tmp_mnt/sbin/evms_activate | awk '/^ELF ..-bit/ { print $2 }'`" in + 32-bit) evms_lib="/lib/evms" ;; + 64-bit) evms_lib="/lib64/evms" ;; + esac if [ "$evms_lib" ] ; then mkdir -p ${tmp_mnt}${evms_lib} SD=$(ls -A $evms_lib | tail -n 1) @@ -1595,8 +1588,22 @@ [ -L $root_dir/$lib ] || echo -n "$lib " ( cd ${root_dir:-/} ; cp -dp --parents $lib $tmp_mnt ) done - # Hardcode libgcc_s.so.1 - for lib in $root_dir/lib/libgcc_s.so* $root_dir/lib64/libgcc_s.so.* ; do + lib_files= + # no symlinks, most point into the running system + for i in `LANG=C LC_ALL=C file -b $tmp_mnt/{,usr/}{lib*/udev/,{,s}bin}/* | awk '/^ELF ..-bit/ { print $2 }' | sort -u` + do + case "$i" in + 32-bit) + mkdir -p $tmp_mnt/lib + lib_files="$lib_files `echo $root_dir/lib/libnss_files* $root_dir/lib/libgcc_s.so*`" + ;; + 64-bit) + mkdir -p $tmp_mnt/lib64 + lib_files="$lib_files `echo $root_dir/lib64/libnss_files* $root_dir/lib64/libgcc_s.so*`" + ;; + esac + done + for lib in $lib_files ; do if [ -f $lib ] ; then echo -n "${lib##$root_dir/} " cp -dp --parents $lib $tmp_mnt @@ -2973,7 +2980,6 @@ pushd . > /dev/null 2>&1 cd $tmp_mnt - find bin sbin -type f -print0 | xargs -0 chmod 0755 find . ! -name "*~" | cpio -H newc --create | gzip -9 > $tmp_initrd.gz popd > /dev/null 2>&1 if ! cp -f $tmp_initrd.gz $initrd_image ; then ++++++ run-init.c ++++++ --- mkinitrd/run-init.c 2006-02-20 08:59:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/run-init.c 2006-10-31 18:37:07.000000000 +0100 @@ -1,4 +1,4 @@ -#ident "$Id: run-init.c,v 1.1 2006/02/20 07:59:35 hare Exp $" +#ident "$Id: run-init.c,v 1.2 2006/10/31 17:37:07 olh Exp $" /* ----------------------------------------------------------------------- * * * Copyright 2004 H. Peter Anvin - All Rights Reserved @@ -173,7 +173,6 @@ { struct stat rst, cst, ist; struct statfs sfs; - int o; int confd; int optind = 1; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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