- openSUSE Commits

commit gnome-icon-theme
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package gnome-icon-theme checked in at Wed Apr 5 17:52:47 CEST 2006. -------- --- GNOME/gnome-icon-theme/gnome-icon-theme.changes 2006-03-04 07:16:34.000000000 +0100 +++ gnome-icon-theme/gnome-icon-theme.changes 2006-04-03 22:51:51.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Apr 3 22:51:26 CEST 2006 - dobey(a)suse.de + +- Update hicolor-icon-theme tarball to 0.9 for multiple bug fixes + +------------------------------------------------------------------- Old: ---- hicolor-icon-theme-0.5.tar.bz2 New: ---- hicolor-icon-theme-0.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.4T2Lbv/_old 2006-04-05 17:52:16.000000000 +0200 +++ /var/tmp/diff_new_pack.4T2Lbv/_new 2006-04-05 17:52:16.000000000 +0200 @@ -16,10 +16,10 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.12.1 -Release: 11 +Release: 18 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-icon-theme/2.12/%{name}-%{versi… # http://freedesktop.org/Software/icon-theme/releases/ -Source1: hicolor-icon-theme-0.5.tar.bz2 +Source1: hicolor-icon-theme-0.9.tar.bz2 Source3: gnome-dev-ethernet-16.png Source4: gnome-dev-ethernet-24.png Source5: realplay.png @@ -47,7 +47,7 @@ automake autoconf export CFLAGS="$RPM_OPT_FLAGS" -cd ../hicolor-icon-theme-0.5 +cd ../hicolor-icon-theme-0.9 ./configure \ --prefix=%{prefix} \ --sysconfdir=/etc%{prefix} @@ -61,9 +61,8 @@ %install rm -rf $RPM_BUILD_ROOT -cd ../hicolor-icon-theme-0.5 +cd ../hicolor-icon-theme-0.9 make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/opt/gnome/share/icons/hicolor/24x24/{apps,mimetypes} cd ../%{name}-%{version} make DESTDIR=$RPM_BUILD_ROOT hicolor_dirs=$RPM_BUILD_ROOT%{prefix}/share/icons install find $RPM_BUILD_ROOT -name *real* -exec rm -v {} \; @@ -88,6 +87,8 @@ %{prefix}/share/pkgconfig/*.pc %changelog -n gnome-icon-theme +* Mon Apr 03 2006 - dobey(a)suse.de +- Update hicolor-icon-theme tarball to 0.9 for multiple bug fixes * Sat Mar 04 2006 - aj(a)suse.de - Fix typo in last change. * Fri Mar 03 2006 - dobey(a)suse.de ++++++ hicolor-icon-theme-0.5.tar.bz2 -> hicolor-icon-theme-0.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hicolor-icon-theme-0.5/ChangeLog new/hicolor-icon-theme-0.9/ChangeLog --- old/hicolor-icon-theme-0.5/ChangeLog 2004-04-06 15:21:24.000000000 +0200 +++ new/hicolor-icon-theme-0.9/ChangeLog 2006-01-12 16:16:00.000000000 +0100 @@ -1,3 +1,45 @@ +2006-01-12 Alexander Larsson <alexl(a)redhat.com> + + * Makefile (VERSION): + Bump version to 0.9 + +2005-12-23 Luca Ferretti <elle.uca(a)libero.it> + + * index.theme: + Sort values for Directories keys (fix gnome bug 315841) and add missing + entries. Now all installed directories should have an entry in this + file. + +2005-04-08 Alexander Larsson <alexl(a)redhat.com> + + * Makefile.in (ICON_CONTEXTS): + Add emblem subdir + + * configure.ac: + Bump version to 0.8 + + * index.theme: + Add emblem subdir + +2005-02-04 Alexander Larsson <alexl(a)redhat.com> + + * configure.ac: + Bump version to 0.7 + + * index.theme (Size): + Fix typos in last version + +2005-02-02 Alexander Larsson <alexl(a)redhat.com> + + * configure.ac: + Bump version to 0.6 + + * Makefile.in (ICON_SIZES): + Add 24x24 dirs + + * index.theme (Directories): + Add 24x24 version of action, apps, devices, filesystem & mimetypes + 2004-04-06 Alexander Larsson <alexl(a)redhat.com> * configure.ac: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hicolor-icon-theme-0.5/Makefile.in new/hicolor-icon-theme-0.9/Makefile.in --- old/hicolor-icon-theme-0.5/Makefile.in 2004-04-06 15:21:24.000000000 +0200 +++ new/hicolor-icon-theme-0.9/Makefile.in 2006-01-12 16:16:00.000000000 +0100 @@ -8,9 +8,9 @@ distdir = $(PACKAGE)-$(VERSION) FILES = README Makefile.in configure.ac configure install-sh index.theme ChangeLog COPYING -ICON_SIZES = 16x16 22x22 32x32 36x36 48x48 64x64 72x72 96x96 \ +ICON_SIZES = 16x16 22x22 24x24 32x32 36x36 48x48 64x64 72x72 96x96 \ 128x128 192x192 scalable -ICON_CONTEXTS = actions apps devices filesystems mimetypes stock +ICON_CONTEXTS = actions apps devices filesystems mimetypes stock emblems STOCK_SUBS = chart code data form image io media navigation net object table text all: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hicolor-icon-theme-0.5/configure new/hicolor-icon-theme-0.9/configure --- old/hicolor-icon-theme-0.5/configure 2004-04-06 15:21:24.000000000 +0200 +++ new/hicolor-icon-theme-0.9/configure 2006-01-12 16:16:00.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for hicolor-icon-theme 0.5. +# Generated by GNU Autoconf 2.59 for hicolor-icon-theme 0.8. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -267,8 +267,8 @@ # Identity of this package. PACKAGE_NAME='hicolor-icon-theme' PACKAGE_TARNAME='hicolor-icon-theme' -PACKAGE_VERSION='0.5' -PACKAGE_STRING='hicolor-icon-theme 0.5' +PACKAGE_VERSION='0.8' +PACKAGE_STRING='hicolor-icon-theme 0.8' PACKAGE_BUGREPORT='' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS' @@ -720,7 +720,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 hicolor-icon-theme 0.5 to adapt to many kinds of systems. +\`configure' configures hicolor-icon-theme 0.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -777,7 +777,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hicolor-icon-theme 0.5:";; + short | recursive ) echo "Configuration of hicolor-icon-theme 0.8:";; esac cat <<\_ACEOF @@ -876,7 +876,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -hicolor-icon-theme configure 0.5 +hicolor-icon-theme configure 0.8 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -890,7 +890,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hicolor-icon-theme $as_me 0.5, which was +It was created by hicolor-icon-theme $as_me 0.8, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1728,7 +1728,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by hicolor-icon-theme $as_me 0.5, which was +This file was extended by hicolor-icon-theme $as_me 0.8, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -1783,7 +1783,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -hicolor-icon-theme config.status 0.5 +hicolor-icon-theme config.status 0.8 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hicolor-icon-theme-0.5/configure.ac new/hicolor-icon-theme-0.9/configure.ac --- old/hicolor-icon-theme-0.5/configure.ac 2004-04-06 15:21:24.000000000 +0200 +++ new/hicolor-icon-theme-0.9/configure.ac 2006-01-12 16:16:00.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([hicolor-icon-theme], [0.5]) +AC_INIT([hicolor-icon-theme], [0.8]) AC_PROG_INSTALL diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hicolor-icon-theme-0.5/index.theme new/hicolor-icon-theme-0.9/index.theme --- old/hicolor-icon-theme-0.5/index.theme 2004-04-06 15:21:24.000000000 +0200 +++ new/hicolor-icon-theme-0.9/index.theme 2006-01-12 16:16:00.000000000 +0100 @@ -2,7 +2,7 @@ Name=Hicolor Comment=Fallback icon theme Hidden=true -Directories=192x192/apps,128x128/actions,128x128/apps,128x128/devices,128x128/filesystems,128x128/mimetypes,96x96/actions,96x96/apps,96x96/devices,96x96/filesystems,96x96/mimetypes,72x72/apps,64x64/actions,64x64/apps,64x64/devices,64x64/filesystems,64x64/mimetypes,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,36x36/apps,32x32/actions,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes,22x22/actions,22x22/apps,22x22/devices,22x22/filesystems,22x22/mimetypes,16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,scalable/actions,scalable/apps,scalable/devices,scalable/filesystems,scalable/mimetypes,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/ stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/document,32x32/stock/form,32x32/stock/generic,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/document,36x36/stock/form,36x36/stock/generic,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/document,48x48/stock/form,48x48/stock/generic,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text +Directories=16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,16x16/emblems,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/form,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,22x22/actions,22x22/apps,22x22/devices,22x22/filesystems,22x22/mimetypes,22x22/emblems,22x22/stock/chart,22x22/stock/code,22x22/stock/data,22x22/stock/form,22x22/stock/image,22x22/stock/io,22x22/stock/media,22x22/stock/navigation,22x22/stock/net,22x22/stock/object,22x22/stock/table,22x22/stock/text,24x24/actions,24x24/apps,24x24/devices,24x24/filesystems,24x24/mimetypes,24x24/emblems,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/form,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/actions,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes,32x3 2/emblems,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/form,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/actions,36x36/apps,36x36/devices,36x36/filesystems,36x36/mimetypes,36x36/emblems,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/form,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,48x48/emblems,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/form,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text,64x64/actions,64x64/apps,64x64/devices,64x64/filesystems,64x64/mimetypes,64x64/emblems,64x64/stock/chart,64x64/stock/code,64x64/stock/data,64x64/stock/form,64x64/stoc k/image,64x64/stock/io,64x64/stock/media,64x64/stock/navigation,64x64/stock/net,64x64/stock/object,64x64/stock/table,64x64/stock/text,72x72/actions,72x72/apps,72x72/devices,72x72/filesystems,72x72/mimetypes,72x72/emblems,72x72/stock/chart,72x72/stock/code,72x72/stock/data,72x72/stock/form,72x72/stock/image,72x72/stock/io,72x72/stock/media,72x72/stock/navigation,72x72/stock/net,72x72/stock/object,72x72/stock/table,72x72/stock/text,96x96/actions,96x96/apps,96x96/devices,96x96/filesystems,96x96/mimetypes,96x96/emblems,96x96/stock/chart,96x96/stock/code,96x96/stock/data,96x96/stock/form,96x96/stock/image,96x96/stock/io,96x96/stock/media,96x96/stock/navigation,96x96/stock/net,96x96/stock/object,96x96/stock/table,96x96/stock/text,128x128/actions,128x128/apps,128x128/devices,128x128/filesystems,128x128/mimetypes,128x128/emblems,128x128/stock/chart,128x128/stock/code,128x128/stock/data,128x128/stock/form,128x128/stock/image,128x128/stock/io,128x128/stock/media,128x128/stock/navigati on,128x128/stock/net,128x128/stock/object,128x128/stock/table,128x128/stock/text,192x192/actions,192x192/apps,192x192/devices,192x192/filesystems,192x192/mimetypes,192x192/emblems,192x192/stock/chart,192x192/stock/code,192x192/stock/data,192x192/stock/form,192x192/stock/image,192x192/stock/io,192x192/stock/media,192x192/stock/navigation,192x192/stock/net,192x192/stock/object,192x192/stock/table,192x192/stock/text,scalable/actions,scalable/apps,scalable/devices,scalable/filesystems,scalable/mimetypes,scalable/emblems,scalable/stock/chart,scalable/stock/code,scalable/stock/data,scalable/stock/form,scalable/stock/image,scalable/stock/io,scalable/stock/media,scalable/stock/navigation,scalable/stock/net,scalable/stock/object,scalable/stock/table,scalable/stock/text [16x16/actions] Size=16 @@ -29,6 +29,71 @@ Context=MimeTypes Type=Threshold +[16x16/emblems] +Size=16 +Context=Emblems +Type=Threshold + +[16x16/stock/chart] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/code] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/data] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/form] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/image] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/io] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/media] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/navigation] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/net] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/object] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/table] +Size=16 +Context=Stock +Type=Threshold + +[16x16/stock/text] +Size=16 +Context=Stock +Type=Threshold + [22x22/actions] Size=22 Context=Actions @@ -54,61 +119,432 @@ Context=MimeTypes Type=Threshold +[22x22/emblems] +Size=22 +Context=Emblems +Type=Threshold + +[22x22/stock/chart] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/code] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/data] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/form] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/image] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/io] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/media] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/navigation] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/net] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/object] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/table] +Size=22 +Context=Stock +Type=Threshold + +[22x22/stock/text] +Size=22 +Context=Stock +Type=Threshold + +[24x24/actions] +Size=24 +Context=Actions +Type=Threshold + +[24x24/apps] +Size=24 +Context=Applications +Type=Threshold + +[24x24/devices] +Size=24 +Context=Devices +Type=Threshold + +[24x24/filesystems] +Size=24 +Context=FileSystems +Type=Threshold + +[24x24/mimetypes] +Size=24 +Context=MimeTypes +Type=Threshold + +[24x24/emblems] +Size=24 +Context=Emblems +Type=Threshold + +[24x24/stock/chart] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/code] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/data] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/form] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/image] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/io] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/media] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/navigation] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/net] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/object] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/table] +Size=24 +Context=Stock +Type=Threshold + +[24x24/stock/text] +Size=24 +Context=Stock +Type=Threshold + [32x32/actions] Size=32 Context=Actions Type=Threshold -[32x32/apps] -Size=32 -Context=Applications +[32x32/apps] +Size=32 +Context=Applications +Type=Threshold + +[32x32/devices] +Size=32 +Context=Devices +Type=Threshold + +[32x32/filesystems] +Size=32 +Context=FileSystems +Type=Threshold + +[32x32/mimetypes] +Size=32 +Context=MimeTypes +Type=Threshold + +[32x32/emblems] +Size=32 +Context=Emblems +Type=Threshold + +[32x32/stock/chart] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/code] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/data] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/form] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/image] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/io] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/media] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/navigation] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/net] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/object] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/table] +Size=32 +Context=Stock +Type=Threshold + +[32x32/stock/text] +Size=32 +Context=Stock +Type=Threshold + +[36x36/actions] +Size=36 +Context=Actions +Type=Threshold + +[36x36/apps] +Size=36 +Context=Applications +Type=Threshold + +[36x36/devices] +Size=36 +Context=Devices +Type=Threshold + +[36x36/filesystems] +Size=36 +Context=FileSystems +Type=Threshold + +[36x36/mimetypes] +Size=36 +Context=MimeTypes +Type=Threshold + +[36x36/emblems] +Size=36 +Context=Emblems +Type=Threshold + +[36x36/stock/chart] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/code] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/data] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/form] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/image] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/io] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/media] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/navigation] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/net] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/object] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/table] +Size=36 +Context=Stock +Type=Threshold + +[36x36/stock/text] +Size=36 +Context=Stock +Type=Threshold + +[48x48/actions] +Size=48 +Context=Actions +Type=Threshold + +[48x48/apps] +Size=48 +Context=Applications +Type=Threshold + +[48x48/devices] +Size=48 +Context=Devices +Type=Threshold + +[48x48/filesystems] +Size=48 +Context=FileSystems +Type=Threshold + +[48x48/mimetypes] +Size=48 +Context=MimeTypes +Type=Threshold + +[48x48/emblems] +Size=48 +Context=Emblems +Type=Threshold + +[48x48/stock/chart] +Size=48 +Context=Stock +Type=Threshold + +[48x48/stock/code] +Size=48 +Context=Stock Type=Threshold -[32x32/devices] -Size=32 -Context=Devices +[48x48/stock/data] +Size=48 +Context=Stock Type=Threshold -[32x32/filesystems] -Size=32 -Context=FileSystems +[48x48/stock/form] +Size=48 +Context=Stock Type=Threshold -[32x32/mimetypes] -Size=32 -Context=MimeTypes +[48x48/stock/image] +Size=48 +Context=Stock Type=Threshold -[36x36/apps] -Size=36 -Context=Applications +[48x48/stock/io] +Size=48 +Context=Stock Type=Threshold -[48x48/actions] +[48x48/stock/media] Size=48 -Context=Actions +Context=Stock Type=Threshold -[48x48/apps] +[48x48/stock/navigation] Size=48 -Context=Applications +Context=Stock Type=Threshold -[48x48/devices] +[48x48/stock/net] Size=48 -Context=Devices +Context=Stock Type=Threshold -[48x48/filesystems] +[48x48/stock/object] Size=48 -Context=FileSystems +Context=Stock Type=Threshold -[48x48/mimetypes] +[48x48/stock/table] Size=48 -Context=MimeTypes +Context=Stock +Type=Threshold + +[48x48/stock/text] +Size=48 +Context=Stock Type=Threshold + [64x64/actions] Size=64 Context=Actions @@ -134,448 +570,556 @@ Context=MimeTypes Type=Threshold -[72x72/apps] -Size=72 -Context=Applications +[64x64/emblems] +Size=64 +Context=Emblems Type=Threshold -[96x96/actions] -Size=96 -Context=Actions +[64x64/stock/chart] +Size=64 +Context=Stock Type=Threshold -[96x96/apps] -Size=96 -Context=Applications +[64x64/stock/code] +Size=64 +Context=Stock Type=Threshold -[96x96/devices] -Size=96 -Context=Devices +[64x64/stock/data] +Size=64 +Context=Stock Type=Threshold -[96x96/filesystems] -Size=96 -Context=FileSystems +[64x64/stock/form] +Size=64 +Context=Stock Type=Threshold -[96x96/mimetypes] -Size=96 -Context=MimeTypes +[64x64/stock/image] +Size=64 +Context=Stock Type=Threshold -[128x128/actions] -Size=128 -Context=Actions +[64x64/stock/io] +Size=64 +Context=Stock Type=Threshold -[128x128/apps] -Size=128 -Context=Applications +[64x64/stock/media] +Size=64 +Context=Stock Type=Threshold -[128x128/devices] -Size=128 -Context=Devices +[64x64/stock/navigation] +Size=64 +Context=Stock Type=Threshold -[128x128/filesystems] -Size=128 -Context=FileSystems +[64x64/stock/net] +Size=64 +Context=Stock Type=Threshold -[128x128/mimetypes] -Size=128 -Context=MimeTypes +[64x64/stock/object] +Size=64 +Context=Stock Type=Threshold -[192x192/apps] -Size=192 -Context=Applications +[64x64/stock/table] +Size=64 +Context=Stock Type=Threshold +[64x64/stock/text] +Size=64 +Context=Stock +Type=Threshold -[scalable/actions] -MinSize=1 -Size=128 -MaxSize=256 + +[72x72/actions] +Size=72 Context=Actions -Type=Scalable +Type=Threshold -[scalable/apps] -MinSize=1 -Size=128 -MaxSize=256 +[72x72/apps] +Size=72 Context=Applications -Type=Scalable +Type=Threshold -[scalable/devices] -MinSize=1 -Size=128 -MaxSize=256 +[72x72/devices] +Size=72 Context=Devices -Type=Scalable +Type=Threshold -[scalable/filesystems] -MinSize=1 -Size=128 -MaxSize=256 +[72x72/filesystems] +Size=72 Context=FileSystems -Type=Scalable +Type=Threshold -[scalable/mimetypes] -MinSize=1 -Size=128 -MaxSize=256 +[72x72/mimetypes] +Size=72 Context=MimeTypes -Type=Scalable +Type=Threshold -[16x16/stock/chart] -Size=16 +[72x72/emblems] +Size=72 +Context=Emblems +Type=Threshold + +[72x72/stock/chart] +Size=72 Context=Stock Type=Threshold -[16x16/stock/code] -Size=16 +[72x72/stock/code] +Size=72 Context=Stock Type=Threshold -[16x16/stock/data] -Size=16 +[72x72/stock/data] +Size=72 Context=Stock Type=Threshold -[16x16/stock/document] -Size=16 +[72x72/stock/form] +Size=72 Context=Stock Type=Threshold -[16x16/stock/form] -Size=16 +[72x72/stock/image] +Size=72 Context=Stock Type=Threshold -[16x16/stock/generic] -Size=16 +[72x72/stock/io] +Size=72 Context=Stock Type=Threshold -[16x16/stock/image] -Size=16 +[72x72/stock/media] +Size=72 Context=Stock Type=Threshold -[16x16/stock/io] -Size=16 +[72x72/stock/navigation] +Size=72 Context=Stock Type=Threshold -[16x16/stock/media] -Size=16 +[72x72/stock/net] +Size=72 Context=Stock Type=Threshold -[16x16/stock/navigation] -Size=16 +[72x72/stock/object] +Size=72 Context=Stock Type=Threshold -[16x16/stock/net] -Size=16 +[72x72/stock/table] +Size=72 Context=Stock Type=Threshold -[16x16/stock/object] -Size=16 +[72x72/stock/text] +Size=72 Context=Stock Type=Threshold -[16x16/stock/table] -Size=16 +[96x96/actions] +Size=96 +Context=Actions +Type=Threshold + +[96x96/apps] +Size=96 +Context=Applications +Type=Threshold + +[96x96/devices] +Size=96 +Context=Devices +Type=Threshold + +[96x96/filesystems] +Size=96 +Context=FileSystems +Type=Threshold + +[96x96/mimetypes] +Size=96 +Context=MimeTypes +Type=Threshold + +[96x96/emblems] +Size=96 +Context=Emblems +Type=Threshold + +[96x96/stock/chart] +Size=96 Context=Stock Type=Threshold -[16x16/stock/text] -Size=16 +[96x96/stock/code] +Size=96 Context=Stock Type=Threshold -[24x24/stock/chart] -Size=24 +[96x96/stock/data] +Size=96 Context=Stock Type=Threshold -[24x24/stock/code] -Size=24 +[96x96/stock/form] +Size=96 Context=Stock Type=Threshold -[24x24/stock/data] -Size=24 +[96x96/stock/image] +Size=96 Context=Stock Type=Threshold -[24x24/stock/document] -Size=24 +[96x96/stock/io] +Size=96 Context=Stock Type=Threshold -[24x24/stock/form] -Size=24 +[96x96/stock/media] +Size=96 Context=Stock Type=Threshold -[24x24/stock/generic] -Size=24 +[96x96/stock/navigation] +Size=96 Context=Stock Type=Threshold -[24x24/stock/image] -Size=24 +[96x96/stock/net] +Size=96 Context=Stock Type=Threshold -[24x24/stock/io] -Size=24 +[96x96/stock/object] +Size=96 +Context=Stock +Type=Threshold + +[96x96/stock/table] +Size=96 +Context=Stock +Type=Threshold + +[96x96/stock/text] +Size=96 Context=Stock Type=Threshold -[24x24/stock/media] -Size=24 -Context=Stock + +[128x128/actions] +Size=128 +Context=Actions Type=Threshold -[24x24/stock/navigation] -Size=24 -Context=Stock +[128x128/apps] +Size=128 +Context=Applications Type=Threshold -[24x24/stock/net] -Size=24 -Context=Stock +[128x128/devices] +Size=128 +Context=Devices Type=Threshold -[24x24/stock/object] -Size=24 -Context=Stock +[128x128/filesystems] +Size=128 +Context=FileSystems Type=Threshold -[24x24/stock/table] -Size=24 -Context=Stock +[128x128/mimetypes] +Size=128 +Context=MimeTypes Type=Threshold -[24x24/stock/text] -Size=24 -Context=Stock +[128x128/emblems] +Size=128 +Context=Emblems Type=Threshold -[32x32/stock/chart] -Size=32 +[128x128/stock/chart] +Size=128 Context=Stock Type=Threshold -[32x32/stock/code] -Size=32 +[128x128/stock/code] +Size=128 Context=Stock Type=Threshold -[32x32/stock/data] -Size=32 +[128x128/stock/data] +Size=128 Context=Stock Type=Threshold -[32x32/stock/document] -Size=32 +[128x128/stock/form] +Size=128 Context=Stock Type=Threshold -[32x32/stock/form] -Size=32 +[128x128/stock/image] +Size=128 Context=Stock Type=Threshold -[32x32/stock/generic] -Size=32 +[128x128/stock/io] +Size=128 Context=Stock Type=Threshold -[32x32/stock/image] -Size=32 +[128x128/stock/media] +Size=128 Context=Stock Type=Threshold -[32x32/stock/io] -Size=32 +[128x128/stock/navigation] +Size=128 Context=Stock Type=Threshold -[32x32/stock/media] -Size=32 +[128x128/stock/net] +Size=128 Context=Stock Type=Threshold -[32x32/stock/navigation] -Size=32 +[128x128/stock/object] +Size=128 Context=Stock Type=Threshold -[32x32/stock/net] -Size=32 +[128x128/stock/table] +Size=128 Context=Stock Type=Threshold -[32x32/stock/object] -Size=32 +[128x128/stock/text] +Size=128 Context=Stock Type=Threshold -[32x32/stock/table] -Size=32 -Context=Stock +[192x192/actions] +Size=192 +Context=Actions Type=Threshold -[32x32/stock/text] -Size=32 -Context=Stock +[192x192/apps] +Size=192 +Context=Applications Type=Threshold -[36x36/stock/chart] -Size=36 -Context=Stock +[192x192/devices] +Size=192 +Context=Devices Type=Threshold -[36x36/stock/code] -Size=36 -Context=Stock +[192x192/filesystems] +Size=192 +Context=FileSystems Type=Threshold -[36x36/stock/data] -Size=36 -Context=Stock +[192x192/mimetypes] +Size=192 +Context=MimeTypes Type=Threshold -[36x36/stock/document] -Size=36 -Context=Stock +[192x192/emblems] +Size=192 +Context=Emblems Type=Threshold -[36x36/stock/form] -Size=36 +[192x192/stock/chart] +Size=192 Context=Stock Type=Threshold -[36x36/stock/generic] -Size=36 +[192x192/stock/code] +Size=192 Context=Stock Type=Threshold -[36x36/stock/image] -Size=36 +[192x192/stock/data] +Size=192 Context=Stock Type=Threshold -[36x36/stock/io] -Size=36 +[192x192/stock/form] +Size=192 Context=Stock Type=Threshold -[36x36/stock/media] -Size=36 +[192x192/stock/image] +Size=192 Context=Stock Type=Threshold -[36x36/stock/navigation] -Size=36 +[192x192/stock/io] +Size=192 Context=Stock Type=Threshold -[36x36/stock/net] -Size=36 +[192x192/stock/media] +Size=192 Context=Stock Type=Threshold -[36x36/stock/object] -Size=36 +[192x192/stock/navigation] +Size=192 Context=Stock Type=Threshold -[36x36/stock/table] -Size=36 +[192x192/stock/net] +Size=192 Context=Stock Type=Threshold -[36x36/stock/text] -Size=36 +[192x192/stock/object] +Size=192 Context=Stock Type=Threshold -[48x48/stock/chart] -Size=48 +[192x192/stock/table] +Size=192 Context=Stock Type=Threshold -[48x48/stock/code] -Size=48 +[192x192/stock/text] +Size=192 Context=Stock Type=Threshold -[48x48/stock/data] -Size=48 +[scalable/actions] +MinSize=1 +Size=128 +MaxSize=256 +Context=Actions +Type=Scalable + +[scalable/apps] +MinSize=1 +Size=128 +MaxSize=256 +Context=Applications +Type=Scalable + +[scalable/devices] +MinSize=1 +Size=128 +MaxSize=256 +Context=Devices +Type=Scalable + +[scalable/filesystems] +MinSize=1 +Size=128 +MaxSize=256 +Context=FileSystems +Type=Scalable + +[scalable/mimetypes] +MinSize=1 +Size=128 +MaxSize=256 +Context=MimeTypes +Type=Scalable + +[scalable/emblems] +MinSize=1 +Size=128 +MaxSize=256 +Context=Emblems +Type=Scalable + +[scalable/stock/chart] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable -[48x48/stock/document] -Size=48 +[scalable/stock/code] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable -[48x48/stock/form] -Size=48 +[scalable/stock/data] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable -[48x48/stock/generic] -Size=48 +[scalable/stock/form] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable -[48x48/stock/image] -Size=48 +[scalable/stock/image] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable -[48x48/stock/io] -Size=48 +[scalable/stock/io] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable -[48x48/stock/media] -Size=48 +[scalable/stock/media] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable -[48x48/stock/navigation] -Size=48 +[scalable/stock/navigation] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable -[48x48/stock/net] -Size=48 +[scalable/stock/net] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable -[48x48/stock/object] -Size=48 +[scalable/stock/object] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable -[48x48/stock/table] -Size=48 +[scalable/stock/table] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable -[48x48/stock/text] -Size=48 +[scalable/stock/text] +MinSize=1 +Size=128 +MaxSize=256 Context=Stock -Type=Threshold +Type=Scalable + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit autoyast2
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package autoyast2 checked in at Wed Apr 5 17:52:10 CEST 2006. -------- --- autoyast2/autoyast2.changes 2006-03-31 14:06:17.000000000 +0200 +++ autoyast2/autoyast2.changes 2006-04-05 10:36:11.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 5 10:20:21 CEST 2006 - ug(a)suse.de + +- Cloning EVMS fixed +- fixed a 'find' warining (#162725) + in create_package_descr (thanx to hou ghi) +- 2.13.39 + +------------------------------------------------------------------- Old: ---- autoyast2-2.13.38.tar.bz2 New: ---- autoyast2-2.13.39.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.q1nvGH/_old 2006-04-05 17:48:10.000000000 +0200 +++ /var/tmp/diff_new_pack.q1nvGH/_new 2006-04-05 17:48:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package autoyast2 (Version 2.13.38) +# spec file for package autoyast2 (Version 2.13.39) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: autoyast2 URL: http://www.suse.com/ -Version: 2.13.38 +Version: 2.13.39 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: autoyast2-2.13.38.tar.bz2 +Source0: autoyast2-2.13.39.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets fop java2-devel-packages libxslt perl-XML-Writer pkg-config sgml-skel update-desktop-files xorg-x11-libs yast2-bootloader yast2-devtools yast2-mouse yast2-testsuite yast2-transfer yast2-update Requires: yast2-core yast2-xml libxslt @@ -48,7 +48,7 @@ Anas Nashif <nashif(a)suse.de> %package installation -Version: 2.13.38 +Version: 2.13.39 Release: 1 Summary: YaST2 - Auto Installation Modules Group: System/YaST @@ -68,7 +68,7 @@ Anas Nashif <nashif(a)suse.de> %package utils -Version: 2.13.38 +Version: 2.13.39 Release: 1 Summary: YaST2 - Auto Installation Utilities Group: System/YaST @@ -81,7 +81,7 @@ %prep -%setup -n autoyast2-2.13.38 +%setup -n autoyast2-2.13.39 %build %{prefix}/bin/y2tool y2autoconf @@ -228,6 +228,11 @@ /usr/bin/create_update_source.sh %changelog -n autoyast2 +* Wed Apr 05 2006 - ug(a)suse.de +- Cloning EVMS fixed +- fixed a 'find' warining (#162725) + in create_package_descr (thanx to hou ghi) +- 2.13.39 * Fri Mar 31 2006 - ug(a)suse.de - creating EVMS fixed (missing mountpoints) - 2.13.38 ++++++ autoyast2-2.13.38.tar.bz2 -> autoyast2-2.13.39.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.38/VERSION new/autoyast2-2.13.39/VERSION --- old/autoyast2-2.13.38/VERSION 2006-03-31 14:04:30.000000000 +0200 +++ new/autoyast2-2.13.39/VERSION 2006-04-05 10:20:16.000000000 +0200 @@ -1 +1 @@ -2.13.38 +2.13.39 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.38/configure new/autoyast2-2.13.39/configure --- old/autoyast2-2.13.38/configure 2006-03-31 14:04:46.000000000 +0200 +++ new/autoyast2-2.13.39/configure 2006-04-05 10:22:36.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for autoyast2 2.13.38. +# Generated by GNU Autoconf 2.59 for autoyast2 2.13.39. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='autoyast2' PACKAGE_TARNAME='autoyast2' -PACKAGE_VERSION='2.13.38' -PACKAGE_STRING='autoyast2 2.13.38' +PACKAGE_VERSION='2.13.39' +PACKAGE_STRING='autoyast2 2.13.39' PACKAGE_BUGREPORT='http://www.suse.de/feedback' 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 autoyast2 2.13.38 to adapt to many kinds of systems. +\`configure' configures autoyast2 2.13.39 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 autoyast2 2.13.38:";; + short | recursive ) echo "Configuration of autoyast2 2.13.39:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -autoyast2 configure 2.13.38 +autoyast2 configure 2.13.39 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 autoyast2 $as_me 2.13.38, which was +It was created by autoyast2 $as_me 2.13.39, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1652,7 +1652,7 @@ # Define the identity of the package. PACKAGE='autoyast2' - VERSION='2.13.38' + VERSION='2.13.39' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.38" +VERSION="2.13.39" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" @@ -2764,7 +2764,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by autoyast2 $as_me 2.13.38, which was +This file was extended by autoyast2 $as_me 2.13.39, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2819,7 +2819,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -autoyast2 config.status 2.13.38 +autoyast2 config.status 2.13.39 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.38/configure.in new/autoyast2-2.13.39/configure.in --- old/autoyast2-2.13.38/configure.in 2006-03-31 14:04:42.000000000 +0200 +++ new/autoyast2-2.13.39/configure.in 2006-04-05 10:22:31.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(autoyast2, 2.13.38, http://www.suse.de/feedback, autoyast2) +AC_INIT(autoyast2, 2.13.39, http://www.suse.de/feedback, autoyast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.38" +VERSION="2.13.39" RPMNAME="autoyast2" MAINTAINER="Uwe Gansert <ug(a)suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.38/doc/Installation.xml new/autoyast2-2.13.39/doc/Installation.xml --- old/autoyast2-2.13.38/doc/Installation.xml 2006-01-18 17:10:24.000000000 +0100 +++ new/autoyast2-2.13.39/doc/Installation.xml 2006-04-03 17:03:41.000000000 +0200 @@ -128,7 +128,7 @@ # install SLES9 label SLES9 kernel linux_sles9 - append initrd=initrd_sles9 install=.... autoyast=... language=de_DE + append initrd=initrd_sles9 vga=0x0314 install=.... autoyast=... language=de_DE # boot harddisc label hd· @@ -136,6 +136,11 @@ </screen> </para> <para> + It's recommended to add the vga=... parameter with a valid value for graphical + installations, to trigger an installation with the frame buffer device instead + of the vesa driver or ncurses mode. + </para> + <para> Here is as a small example my "/etc/dhcp.conf" file: <screen> option domain-name-servers 192.168.66.1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.38/scripts/create_package_descr new/autoyast2-2.13.39/scripts/create_package_descr --- old/autoyast2-2.13.38/scripts/create_package_descr 2005-02-08 18:27:08.000000000 +0100 +++ new/autoyast2-2.13.39/scripts/create_package_descr 2006-04-03 11:19:00.000000000 +0200 @@ -121,7 +121,7 @@ $allcounter = 0; foreach $datapath (@DATADIRS) { $media_number++; - open ( FIND, "find $datapath $with_links -name \"*.[rs]pm\" -maxdepth 2 -print | sort |" ); + open ( FIND, "find $datapath $with_links -maxdepth 2 -name \"*.[rs]pm\" -print | sort |" ); my @pkg_arr = (); my @src_arr = (); while ( <FIND> ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/autoyast2-2.13.38/src/modules/AutoinstClone.ycp new/autoyast2-2.13.39/src/modules/AutoinstClone.ycp --- old/autoyast2-2.13.38/src/modules/AutoinstClone.ycp 2006-03-27 13:39:05.000000000 +0200 +++ new/autoyast2-2.13.39/src/modules/AutoinstClone.ycp 2006-04-04 18:05:35.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Anas Nashif <nashif(a)suse.de> * - * $Id: AutoinstClone.ycp 29408 2006-03-27 11:39:02Z ug $ + * $Id: AutoinstClone.ycp 29675 2006-04-04 16:05:33Z ug $ * * */ @@ -112,8 +112,9 @@ StorageDevices::InitDone(); map<string, map> StorageMap = eval(Storage::GetTargetMap()); - StorageMap=filter(string d, map p, StorageMap, ``(!issubstring(d, "/dev/evms") && size(p["partitions"]:[]) > 0)); + StorageMap=filter(string d, map p, StorageMap, ``( d != "/dev/evms" && size(p["partitions"]:[]) > 0)); y2debug("Storagemap %1", StorageMap); + list evms_vgs = []; list drives = maplist(string k, map v, StorageMap, ``{ list partitions = []; @@ -161,8 +162,14 @@ new_pe["lvm_group"] = pe["used_by"]:""; } + // EVMS Group + if (haskey(pe,"used_by_type") && pe["used_by_type"]:`nothing == `UB_EVMS) { + integer index = findlastof( pe["used_by"]:"", "/" ); + new_pe["evms_group"] = substring( pe["used_by"]:"", index+1); + } + // LV - if (pe["type"]:`unknown == `lvm ) + if (pe["type"]:`unknown == `lvm || pe["type"]:`unknown == `evms ) { new_pe["lv_name"] = pe["name"]:""; new_pe["size"] = sformat("%1", pe["size_k"]:0*1024); @@ -216,6 +223,13 @@ { drive["pesize"] = sformat("%1M", v["pesize"]:1 / (1024*1024) ); drive["is_lvm_vg"] = true; + } else if( v["type"]:`CT_UNKNOWN==`CT_EVMS ) { + drive["pesize"] = sformat("%1M", v["pesize"]:1 / (1024*1024) ); + drive["is_evms_vg"] = true; + integer index = findlastof( drive["device"]:"", "/" ); + string vg_name = substring(drive["device"]:"", index); + drive["device"] = "/dev"+vg_name; + evms_vgs = add( evms_vgs, "/dev"+vg_name ); } if (haskey(v,"lvm2") && v["lvm2"]:false) { @@ -237,9 +251,14 @@ drive["use"] = mergestring(up, ","); } } - return drive; }); + drives = filter( map v, (list<map>)drives, ``{ + if( ! (contains( evms_vgs, v["device"]:"") && v["is_lvm_vg"]:false) ) + return true; + y2milestone("kicking LVM %1 out of the profile because an EVMS with that name exists",v); + return false; + }); Mode::SetMode("autoinst_config"); return drives; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yelp
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package yelp checked in at Wed Apr 5 17:48:27 CEST 2006. -------- --- GNOME/yelp/yelp.changes 2006-03-19 08:38:22.000000000 +0100 +++ yelp/yelp.changes 2006-04-05 13:15:13.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 5 13:13:30 CEST 2006 - hpj(a)suse.de + +- Updated patch to be better at finding HTML index files. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp.spec ++++++ --- /var/tmp/diff_new_pack.1kCoR0/_old 2006-04-05 17:47:48.000000000 +0200 +++ /var/tmp/diff_new_pack.1kCoR0/_new 2006-04-05 17:47:48.000000000 +0200 @@ -19,7 +19,7 @@ Group: System/GUI/GNOME Autoreqprov: on Version: 2.14.0 -Release: 5 +Release: 9 Summary: The GNOME 2.x Desktop Help Browser Source: ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.12/%{name}-%{version}.tar.bz2 Source1: help-title.png @@ -107,6 +107,8 @@ %{prefix}/share/icons/hicolor/192x192/apps/yelp-icon-big.png %changelog -n yelp +* Wed Apr 05 2006 - hpj(a)suse.de +- Updated patch to be better at finding HTML index files. * Sun Mar 19 2006 - hpj(a)suse.de - Updated patch to resolve even more cases of broken help URIs, missing DTDs and other external entities. Also fall back to ++++++ yelp-suse-20060319.patch ++++++ --- /var/tmp/diff_new_pack.1kCoR0/_old 2006-04-05 17:47:49.000000000 +0200 +++ /var/tmp/diff_new_pack.1kCoR0/_new 2006-04-05 17:47:49.000000000 +0200 @@ -1,6 +1,6 @@ -diff -urp yelp-2.14.0-pre/configure.in yelp-2.14.0-post/configure.in ---- yelp-2.14.0-pre/configure.in 2006-03-17 18:33:11.000000000 -0600 -+++ yelp-2.14.0-post/configure.in 2006-03-17 18:33:29.000000000 -0600 +diff -upr yelp-2.14.0-pre/configure.in yelp-2.14.0-post/configure.in +--- yelp-2.14.0-pre/configure.in 2006-04-05 05:49:05.000000000 -0500 ++++ yelp-2.14.0-post/configure.in 2006-04-05 05:49:18.000000000 -0500 @@ -81,6 +81,7 @@ PKG_CHECK_MODULES(YELP, libxslt >= 1.1.1 libexslt >= 0.8.1 @@ -9,9 +9,9 @@ ]) AC_SUBST([YELP_CFLAGS]) AC_SUBST([YELP_LIBS]) -diff -urp yelp-2.14.0-pre/configure.in.orig yelp-2.14.0-post/configure.in.orig +diff -upr yelp-2.14.0-pre/configure.in.orig yelp-2.14.0-post/configure.in.orig --- yelp-2.14.0-pre/configure.in.orig 2006-03-12 22:36:49.000000000 -0600 -+++ yelp-2.14.0-post/configure.in.orig 2006-03-17 18:33:29.000000000 -0600 ++++ yelp-2.14.0-post/configure.in.orig 2006-04-05 05:49:18.000000000 -0500 @@ -77,8 +77,8 @@ PKG_CHECK_MODULES(YELP, libglade-2.0 >= 2.0.0 libgnome-2.0 >= 2.0.2 @@ -23,9 +23,9 @@ libexslt >= 0.8.1 libstartup-notification-1.0 >= 0.8 ]) -diff -urp yelp-2.14.0-pre/data/icons/Makefile.am yelp-2.14.0-post/data/icons/Makefile.am +diff -upr yelp-2.14.0-pre/data/icons/Makefile.am yelp-2.14.0-post/data/icons/Makefile.am --- yelp-2.14.0-pre/data/icons/Makefile.am 2005-02-01 15:45:05.000000000 -0600 -+++ yelp-2.14.0-post/data/icons/Makefile.am 2006-03-17 18:33:29.000000000 -0600 ++++ yelp-2.14.0-post/data/icons/Makefile.am 2006-04-05 05:49:18.000000000 -0500 @@ -14,6 +14,7 @@ icon_DATA = \ yelp-watermark-blockquote-00BB.png \ yelp-watermark-blockquote-201C.png \ @@ -35,9 +35,9 @@ + help-title.png EXTRA_DIST = $(icon_DATA) $(icon192_DATA) -diff -urp yelp-2.14.0-pre/data/yelp.js yelp-2.14.0-post/data/yelp.js +diff -upr yelp-2.14.0-pre/data/yelp.js yelp-2.14.0-post/data/yelp.js --- yelp-2.14.0-pre/data/yelp.js 2005-11-21 14:56:22.000000000 -0600 -+++ yelp-2.14.0-post/data/yelp.js 2006-03-17 18:33:29.000000000 -0600 ++++ yelp-2.14.0-post/data/yelp.js 2006-04-05 05:49:18.000000000 -0500 @@ -81,6 +81,50 @@ var slt = { } } @@ -89,9 +89,9 @@ /* addEventListener() is Gecko-only, but so is yelp */ window.addEventListener("load",slt.init,false); /* load doesn't seem to get fired in Yelp. I might need to tell Gecko -diff -urp yelp-2.14.0-pre/src/yelp-db-pager.c yelp-2.14.0-post/src/yelp-db-pager.c +diff -upr yelp-2.14.0-pre/src/yelp-db-pager.c yelp-2.14.0-post/src/yelp-db-pager.c --- yelp-2.14.0-pre/src/yelp-db-pager.c 2006-01-08 14:56:04.000000000 -0600 -+++ yelp-2.14.0-post/src/yelp-db-pager.c 2006-03-18 22:45:23.000000000 -0600 ++++ yelp-2.14.0-post/src/yelp-db-pager.c 2006-04-05 05:49:18.000000000 -0500 @@ -24,6 +24,7 @@ #include <config.h> #endif @@ -189,9 +189,9 @@ if (node_is_chunk (walker)) { title = BAD_CAST node_get_title (walker, "titleabbrev"); if (!title) -diff -urp yelp-2.14.0-pre/src/yelp-main.c yelp-2.14.0-post/src/yelp-main.c +diff -upr yelp-2.14.0-pre/src/yelp-main.c yelp-2.14.0-post/src/yelp-main.c --- yelp-2.14.0-pre/src/yelp-main.c 2006-02-16 18:10:28.000000000 -0600 -+++ yelp-2.14.0-post/src/yelp-main.c 2006-03-19 00:41:49.000000000 -0600 ++++ yelp-2.14.0-post/src/yelp-main.c 2006-04-05 05:49:18.000000000 -0500 @@ -24,6 +24,8 @@ #include <config.h> #endif @@ -261,9 +261,9 @@ /* Commandline parsing is done here */ g_object_get (G_OBJECT (program), GNOME_PARAM_POPT_CONTEXT, &poptCon, -diff -urp yelp-2.14.0-pre/src/yelp-search-pager.c yelp-2.14.0-post/src/yelp-search-pager.c +diff -upr yelp-2.14.0-pre/src/yelp-search-pager.c yelp-2.14.0-post/src/yelp-search-pager.c --- yelp-2.14.0-pre/src/yelp-search-pager.c 2006-02-27 13:55:10.000000000 -0600 -+++ yelp-2.14.0-post/src/yelp-search-pager.c 2006-03-17 18:33:29.000000000 -0600 ++++ yelp-2.14.0-post/src/yelp-search-pager.c 2006-04-05 05:49:18.000000000 -0500 @@ -147,6 +147,7 @@ static gboolean search_pager_proces static YelpPagerClass *parent_class; @@ -345,18 +345,18 @@ return; } +#endif /* ENABLE_SCROLLKEEPER */ -diff -urp yelp-2.14.0-pre/src/yelp-search-pager.h yelp-2.14.0-post/src/yelp-search-pager.h +diff -upr yelp-2.14.0-pre/src/yelp-search-pager.h yelp-2.14.0-post/src/yelp-search-pager.h --- yelp-2.14.0-pre/src/yelp-search-pager.h 2005-10-28 15:37:37.000000000 -0500 -+++ yelp-2.14.0-post/src/yelp-search-pager.h 2006-03-17 18:33:29.000000000 -0600 ++++ yelp-2.14.0-post/src/yelp-search-pager.h 2006-04-05 05:49:18.000000000 -0500 @@ -53,4 +53,5 @@ GType yelp_search_pager_get_t void yelp_search_pager_init (void); YelpSearchPager *yelp_search_pager_get (YelpDocInfo *doc_info); +gboolean yelp_search_pager_search_available (void); #endif /* __YELP_SEARCH_PAGER_H__ */ -diff -urp yelp-2.14.0-pre/src/yelp-settings.c yelp-2.14.0-post/src/yelp-settings.c +diff -upr yelp-2.14.0-pre/src/yelp-settings.c yelp-2.14.0-post/src/yelp-settings.c --- yelp-2.14.0-pre/src/yelp-settings.c 2006-01-26 22:49:44.000000000 -0600 -+++ yelp-2.14.0-post/src/yelp-settings.c 2006-03-17 18:33:29.000000000 -0600 ++++ yelp-2.14.0-post/src/yelp-settings.c 2006-04-05 05:49:18.000000000 -0500 @@ -34,7 +34,8 @@ #include "yelp-settings.h" @@ -367,9 +367,9 @@ #define KEY_GNOME_FIXED_FONT KEY_GNOME_DIR "/monospace_font_name" #define KEY_GNOME_GTK_THEME KEY_GNOME_DIR "/gtk_theme" -diff -urp yelp-2.14.0-pre/src/yelp-toc-pager.c yelp-2.14.0-post/src/yelp-toc-pager.c ---- yelp-2.14.0-pre/src/yelp-toc-pager.c 2006-03-17 18:33:11.000000000 -0600 -+++ yelp-2.14.0-post/src/yelp-toc-pager.c 2006-03-17 19:00:21.000000000 -0600 +diff -upr yelp-2.14.0-pre/src/yelp-toc-pager.c yelp-2.14.0-post/src/yelp-toc-pager.c +--- yelp-2.14.0-pre/src/yelp-toc-pager.c 2006-04-05 05:49:05.000000000 -0500 ++++ yelp-2.14.0-post/src/yelp-toc-pager.c 2006-04-05 05:49:18.000000000 -0500 @@ -39,6 +39,7 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> @@ -917,9 +917,9 @@ static void xslt_yelp_document (xsltTransformContextPtr ctxt, xmlNodePtr node, -diff -urp yelp-2.14.0-pre/src/yelp-toc-pager.c.orig yelp-2.14.0-post/src/yelp-toc-pager.c.orig +diff -upr yelp-2.14.0-pre/src/yelp-toc-pager.c.orig yelp-2.14.0-post/src/yelp-toc-pager.c.orig --- yelp-2.14.0-pre/src/yelp-toc-pager.c.orig 2006-02-18 10:10:22.000000000 -0600 -+++ yelp-2.14.0-post/src/yelp-toc-pager.c.orig 2006-03-17 18:33:29.000000000 -0600 ++++ yelp-2.14.0-post/src/yelp-toc-pager.c.orig 2006-04-05 05:49:18.000000000 -0500 @@ -497,6 +497,15 @@ process_omf_pending (YelpTocPager *pager XML_PARSE_NONET ); if (!omf_doc) { @@ -936,9 +936,9 @@ goto done; } -diff -urp yelp-2.14.0-pre/src/yelp-utils.c yelp-2.14.0-post/src/yelp-utils.c +diff -upr yelp-2.14.0-pre/src/yelp-utils.c yelp-2.14.0-post/src/yelp-utils.c --- yelp-2.14.0-pre/src/yelp-utils.c 2006-01-15 08:41:01.000000000 -0600 -+++ yelp-2.14.0-post/src/yelp-utils.c 2006-03-18 17:37:37.000000000 -0600 ++++ yelp-2.14.0-post/src/yelp-utils.c 2006-04-05 06:05:55.000000000 -0500 @@ -70,6 +70,7 @@ struct _YelpDocInfo { static YelpDocType get_doc_type (gchar *uri); @@ -1116,7 +1116,7 @@ if (*(++cur) != '\0') { if (frag_id) g_free (frag_id); -@@ -606,6 +702,166 @@ yelp_doc_info_add_uri (YelpDocInfo *doc_ +@@ -606,6 +702,180 @@ yelp_doc_info_add_uri (YelpDocInfo *doc_ /** Convert fancy URIs to file URIs *******************************************/ static gchar * @@ -1162,6 +1162,20 @@ + if (result) + return result; + ++ full_path = g_build_filename (path, "index.html", NULL); ++ result = help_uri_check_file (full_path, reference); ++ g_free (full_path); ++ if (result) ++ return result; ++ ++ full_identifier = g_strconcat (identifier, ".html", NULL); ++ full_path = g_build_filename (path, full_identifier, NULL); ++ result = help_uri_check_file (full_path, reference); ++ g_free (full_path); ++ g_free (full_identifier); ++ if (result) ++ return result; ++ + return NULL; +} + @@ -1283,7 +1297,7 @@ locate_file_lang (gchar *path, gchar *file, const gchar *lang) { gchar *exts[] = {".xml", ".docbook", ".sgml", ".html", "", NULL}; -@@ -640,6 +896,9 @@ convert_ghelp_uri (gchar *uri) +@@ -640,6 +910,9 @@ convert_ghelp_uri (gchar *uri) else goto done; @@ -1293,7 +1307,7 @@ if (path && path[0] == '/') { if ((cur = strchr (path, '?')) || (cur = strchr (path, '#'))) *cur = '\0'; -@@ -913,7 +1172,7 @@ convert_info_uri (gchar *uri) +@@ -913,7 +1186,7 @@ convert_info_uri (gchar *uri) goto done; info_name = g_strndup (path, cur - path); } @@ -1302,9 +1316,9 @@ info_name = g_strndup (path, cur - path); else info_name = g_strdup (path); -diff -urp yelp-2.14.0-pre/src/yelp-utils.h yelp-2.14.0-post/src/yelp-utils.h +diff -upr yelp-2.14.0-pre/src/yelp-utils.h yelp-2.14.0-post/src/yelp-utils.h --- yelp-2.14.0-pre/src/yelp-utils.h 2006-01-07 13:17:58.000000000 -0600 -+++ yelp-2.14.0-post/src/yelp-utils.h 2006-03-17 18:33:29.000000000 -0600 ++++ yelp-2.14.0-post/src/yelp-utils.h 2006-04-05 05:49:18.000000000 -0500 @@ -67,6 +67,7 @@ typedef enum { YELP_URI_TYPE_TOC = 1 << 4, YELP_URI_TYPE_EXTERNAL = 1 << 5, @@ -1323,9 +1337,9 @@ YELP_URI_TYPE_ANY = YELP_URI_TYPE_FILE | YELP_URI_TYPE_NO_FILE -diff -urp yelp-2.14.0-pre/src/yelp-window.c yelp-2.14.0-post/src/yelp-window.c +diff -upr yelp-2.14.0-pre/src/yelp-window.c yelp-2.14.0-post/src/yelp-window.c --- yelp-2.14.0-pre/src/yelp-window.c 2006-02-04 09:53:40.000000000 -0600 -+++ yelp-2.14.0-post/src/yelp-window.c 2006-03-17 18:33:29.000000000 -0600 ++++ yelp-2.14.0-post/src/yelp-window.c 2006-04-05 05:49:18.000000000 -0500 @@ -1025,9 +1025,11 @@ window_populate (YelpWindow *window) _("_Search:"), _("Search for other documentation"), @@ -1338,9 +1352,9 @@ #endif priv->ui_manager = gtk_ui_manager_new (); -diff -urp yelp-2.14.0-pre/stylesheets/toc2html.xsl yelp-2.14.0-post/stylesheets/toc2html.xsl +diff -upr yelp-2.14.0-pre/stylesheets/toc2html.xsl yelp-2.14.0-post/stylesheets/toc2html.xsl --- yelp-2.14.0-pre/stylesheets/toc2html.xsl 2006-02-11 23:06:06.000000000 -0600 -+++ yelp-2.14.0-post/stylesheets/toc2html.xsl 2006-03-17 18:33:29.000000000 -0600 ++++ yelp-2.14.0-post/stylesheets/toc2html.xsl 2006-04-05 05:49:18.000000000 -0500 @@ -8,6 +8,9 @@ <xsl:param name="help_icon"/> <xsl:param name="help_icon_size"/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-pkg-bindings
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Wed Apr 5 17:47:46 CEST 2006. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-04 14:35:55.000000000 +0200 +++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-05 16:28:15.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 5 16:28:24 CEST 2006 - lslezak(a)suse.cz + +- updated keyring callbacks +- 2.13.47 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.13.46.tar.bz2 New: ---- yast2-pkg-bindings-2.13.47.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.WfFwif/_old 2006-04-05 17:47:31.000000000 +0200 +++ /var/tmp/diff_new_pack.WfFwif/_new 2006-04-05 17:47:31.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.13.46) +# spec file for package yast2-pkg-bindings (Version 2.13.47) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-pkg-bindings -Version: 2.13.46 +Version: 2.13.47 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.13.46.tar.bz2 +Source0: yast2-pkg-bindings-2.13.47.tar.bz2 prefix: /usr BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools Summary: YaST2 Package Manager Access @@ -36,7 +36,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-pkg-bindings-2.13.46 +%setup -n yast2-pkg-bindings-2.13.47 %build %{prefix}/bin/y2tool y2autoconf @@ -67,6 +67,9 @@ %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog -n yast2-pkg-bindings +* Wed Apr 05 2006 - lslezak(a)suse.cz +- updated keyring callbacks +- 2.13.47 * Tue Apr 04 2006 - mvidner(a)suse.cz - Added "alias" to Pkg::SourceGeneralData (#156030). - libzypp API change: use location instead of plainRpm. ++++++ yast2-pkg-bindings-2.13.46.tar.bz2 -> yast2-pkg-bindings-2.13.47.tar.bz2 ++++++ ++++ 14594 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-pkg-bindings-2.13.46/VERSION new/yast2-pkg-bindings-2.13.47/VERSION --- old/yast2-pkg-bindings-2.13.46/VERSION 2006-04-04 14:33:49.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.47/VERSION 2006-04-05 16:28:18.000000000 +0200 @@ -1 +1 @@ -2.13.46 +2.13.47 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-pkg-bindings-2.13.46/configure.in new/yast2-pkg-bindings-2.13.47/configure.in --- old/yast2-pkg-bindings-2.13.46/configure.in 2006-04-04 14:37:46.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.47/configure.in 2006-03-27 16:16:48.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-pkg-bindings dnl -dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.13.46, http://www.suse.de/feedback, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.13.41, http://www.suse.de/feedback, yast2-pkg-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.46" +VERSION="2.13.41" RPMNAME="yast2-pkg-bindings" MAINTAINER="Michael Andres <ma(a)suse.de>" @@ -158,7 +158,6 @@ AC_HEADER_STDC -PKG_CHECK_MODULES([ZYPP], [libzypp]) AX_CHECK_DOCBOOK AC_CONFIG_FILES(Makefile doc/Makefile 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-pkg-bindings-2.13.46/src/Callbacks.cc new/yast2-pkg-bindings-2.13.47/src/Callbacks.cc --- old/yast2-pkg-bindings-2.13.46/src/Callbacks.cc 2006-04-04 14:20:53.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.47/src/Callbacks.cc 2006-04-05 15:17:49.000000000 +0200 @@ -795,8 +795,8 @@ { KeyRingReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {} - virtual bool askUserToTrustKey( const std::string keyid - , const std::string keyname ) + virtual bool askUserToTrustKey( const std::string &keyid + , const std::string &keyname, const std::string &keydetails ) { CB callback( ycpcb( YCPCallbacks::CB_ImportGpgKey) ); @@ -804,27 +804,29 @@ { callback.addStr(keyid); callback.addStr(keyname); + callback.addStr(keydetails); return callback.evaluateBool(); } - return zypp::KeyRingReport::askUserToTrustKey(keyid, keyname); + return zypp::KeyRingReport::askUserToTrustKey(keyid, keyname, keydetails); } - virtual bool askUserToAcceptUnknownKey( const std::string &keyid, - const std::string &keyname ) + virtual bool askUserToAcceptUnknownKey( const zypp::Pathname &path, + const std::string &keyid, const std::string &keyname ) { CB callback( ycpcb( YCPCallbacks::CB_AcceptUnknownGpgKey) ); if (callback._set) { + callback.addStr(path.asString()); callback.addStr(keyid); callback.addStr(keyname); return callback.evaluateBool(); } - return zypp::KeyRingReport::askUserToAcceptUnknownKey(keyid, keyname); + return zypp::KeyRingReport::askUserToAcceptUnknownKey(path, keyid, keyname); } virtual bool askUserToAcceptUnsignedFile( const zypp::Pathname &file ) @@ -1070,7 +1072,7 @@ /** * @builtin CallbackImportGpgKey * @short Register callback function - * @param string args Name of the callback handler function. Required callback prototype is <code>boolean(string keyid, string keyname)</code>. The callback function should ask user whether the key is trusted, returned true value means the key is trusted. + * @param string args Name of the callback handler function. Required callback prototype is <code>boolean(string keyid, string keyname, string keydetails)</code>. The callback function should ask user whether the key is trusted, returned true value means the key is trusted. * @return void */ YCPValue PkgModuleFunctions::CallbackImportGpgKey( const YCPString& args ) { @@ -1080,7 +1082,7 @@ /** * @builtin CallbackAcceptUnknownGpgKey * @short Register callback function - * @param string args Name of the callback handler function. Required callback prototype is <code>boolean(string keyid, string keyname)</code>. The callback function should ask user whether the unknown key can be accepted, returned true value means to accept the file. + * @param string args Name of the callback handler function. Required callback prototype is <code>boolean(string filename, string keyid, string keyname)</code>. The callback function should ask user whether the unknown key can be accepted, returned true value means to accept the file. * @return void */ YCPValue PkgModuleFunctions::CallbackAcceptUnknownGpgKey( const YCPString& args ) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package yast2 checked in at Wed Apr 5 17:47:44 CEST 2006. -------- --- yast2/yast2.changes 2006-04-04 15:41:27.000000000 +0200 +++ yast2/yast2.changes 2006-04-05 16:00:54.000000000 +0200 @@ -1,0 +2,45 @@ +Wed Apr 5 15:59:36 CEST 2006 - locilka(a)suse.cz + +- Registered new Pkg:: callbacks + - Pkg::CallbackAcceptUnsignedFile + - Pkg::CallbackAcceptUnknownGpgKey + - Pkg::CallbackImportGpgKey + - Pkg::CallbackAcceptVerificationFailed + - Pkg::CallbackTrustedKeyAdded + - Pkg::CallbackTrustedKeyRemoved +- 2.13.45 + +------------------------------------------------------------------- +Wed Apr 5 15:09:52 CEST 2006 - sh(a)suse.de + +- V 2.13.44 +- Fixed bug #116356: save_y2logs saves into a different directory + +------------------------------------------------------------------- +Wed Apr 5 11:36:03 CEST 2006 - fehr(a)suse.de + +- changed some very verbose debug output in AsciiFile.ycp +- 2.13.43 + +------------------------------------------------------------------- +Wed Apr 5 11:11:44 CEST 2006 - locilka(a)suse.cz + +- Adding special Xen interface "xenbr0" into the + FW_FORWARD_ALWAYS_INOUT_DEV variable in the Network Proposal in + case of "kernel-xen" package installed (#154133). + +------------------------------------------------------------------- +Wed Apr 5 10:49:47 CEST 2006 - mvidner(a)suse.cz + +- Added CWM::DisableButtons (jsuchome, #157125). + +------------------------------------------------------------------- +Wed Apr 5 09:44:25 CEST 2006 - locilka(a)suse.cz + +- Fixed wrong handling of special 'any' string in the internal + function ArePortsOrServicesAllowed(). This part was forgotten + from the first implementation of NetworkManager support (#162512). +- Adding FW_FORWARD_ALWAYS_INOUT_DEV variable into the Read() + function to prepare fix for Xen handling (#154133). + +------------------------------------------------------------------- Old: ---- yast2-2.13.42.tar.bz2 New: ---- yast2-2.13.45.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.oukytP/_old 2006-04-05 17:47:27.000000000 +0200 +++ /var/tmp/diff_new_pack.oukytP/_new 2006-04-05 17:47:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2 (Version 2.13.42) +# spec file for package yast2 (Version 2.13.45) # # 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 -Version: 2.13.42 +Version: 2.13.45 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.13.42.tar.bz2 +Source0: yast2-2.13.45.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite # Need the new file popups @@ -93,7 +93,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.13.42 +%setup -n yast2-2.13.45 %build %{prefix}/bin/y2tool y2autoconf @@ -192,6 +192,33 @@ %doc %{prefix}/share/doc/packages/yast2/wizard %changelog -n yast2 +* Wed Apr 05 2006 - locilka(a)suse.cz +- Registered new Pkg:: callbacks +- Pkg::CallbackAcceptUnsignedFile +- Pkg::CallbackAcceptUnknownGpgKey +- Pkg::CallbackImportGpgKey +- Pkg::CallbackAcceptVerificationFailed +- Pkg::CallbackTrustedKeyAdded +- Pkg::CallbackTrustedKeyRemoved +- 2.13.45 +* Wed Apr 05 2006 - sh(a)suse.de +- V 2.13.44 +- Fixed bug #116356: save_y2logs saves into a different directory +* Wed Apr 05 2006 - fehr(a)suse.de +- changed some very verbose debug output in AsciiFile.ycp +- 2.13.43 +* Wed Apr 05 2006 - locilka(a)suse.cz +- Adding special Xen interface "xenbr0" into the + FW_FORWARD_ALWAYS_INOUT_DEV variable in the Network Proposal in + case of "kernel-xen" package installed (#154133). +* Wed Apr 05 2006 - mvidner(a)suse.cz +- Added CWM::DisableButtons (jsuchome, #157125). +* Wed Apr 05 2006 - locilka(a)suse.cz +- Fixed wrong handling of special 'any' string in the internal + function ArePortsOrServicesAllowed(). This part was forgotten + from the first implementation of NetworkManager support (#162512). +- Adding FW_FORWARD_ALWAYS_INOUT_DEV variable into the Read() + function to prepare fix for Xen handling (#154133). * Tue Apr 04 2006 - locilka(a)suse.cz - Added mapping for Pkg::CallbackAcceptUnsignedFile() callback (#162858) ++++++ yast2-2.13.42.tar.bz2 -> yast2-2.13.45.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/VERSION new/yast2-2.13.45/VERSION --- old/yast2-2.13.42/VERSION 2006-04-04 15:38:54.000000000 +0200 +++ new/yast2-2.13.45/VERSION 2006-04-05 15:59:31.000000000 +0200 @@ -1 +1 @@ -2.13.42 +2.13.45 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/configure new/yast2-2.13.45/configure --- old/yast2-2.13.42/configure 2006-04-04 15:54:42.000000000 +0200 +++ new/yast2-2.13.45/configure 2006-04-05 16:31:29.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for yast2 2.13.42. +# Generated by GNU Autoconf 2.59 for yast2 2.13.45. # # Report bugs to <http://www.suse.de/feedback>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.13.42' -PACKAGE_STRING='yast2 2.13.42' +PACKAGE_VERSION='2.13.45' +PACKAGE_STRING='yast2 2.13.45' PACKAGE_BUGREPORT='http://www.suse.de/feedback' 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 2.13.42 to adapt to many kinds of systems. +\`configure' configures yast2 2.13.45 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 2.13.42:";; + short | recursive ) echo "Configuration of yast2 2.13.45:";; esac cat <<\_ACEOF @@ -908,7 +908,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.13.42 +yast2 configure 2.13.45 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 $as_me 2.13.42, which was +It was created by yast2 $as_me 2.13.45, 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' - VERSION='2.13.42' + VERSION='2.13.45' cat >>confdefs.h <<_ACEOF @@ -1863,7 +1863,7 @@ -VERSION="2.13.42" +VERSION="2.13.45" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>" @@ -2797,7 +2797,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by yast2 $as_me 2.13.42, which was +This file was extended by yast2 $as_me 2.13.45, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2852,7 +2852,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2 config.status 2.13.42 +yast2 config.status 2.13.45 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/configure.in new/yast2-2.13.45/configure.in --- old/yast2-2.13.42/configure.in 2006-04-04 15:54:36.000000000 +0200 +++ new/yast2-2.13.45/configure.in 2006-04-05 16:31:22.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.13.42, http://www.suse.de/feedback, yast2) +AC_INIT(yast2, 2.13.45, http://www.suse.de/feedback, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.42" +VERSION="2.13.45" RPMNAME="yast2" MAINTAINER="Stanislav Visnovsky <visnov(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/library/cwm/src/CWM.ycp new/yast2-2.13.45/library/cwm/src/CWM.ycp --- old/yast2-2.13.42/library/cwm/src/CWM.ycp 2006-02-03 08:47:14.000000000 +0100 +++ new/yast2-2.13.45/library/cwm/src/CWM.ycp 2006-04-05 11:10:55.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Routines for common widget manipulation * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: CWM.ycp 26844 2006-01-05 15:57:41Z mvidner $ + * $Id: CWM.ycp 29700 2006-04-05 08:53:20Z mvidner $ * */ @@ -812,6 +812,20 @@ } /** + * Disable given bottom buttons of the wizard sequencer + * @patam buttons list of buttons to be disabled + */ + global define void DisableButtons (list<string> buttons) { + foreach (string button, buttons, { + if (button == "back_button") + Wizard::DisableBackButton (); + if (button == "abort_button") + Wizard::DisableAbortButton (); + if (button == "next_button") + Wizard::DisableNextButton (); + }); + } + /** * Adjust the labels of the bottom buttons of the wizard sequencer * @param next label of the "Next" button * @param back string label of the "Back" button @@ -879,6 +893,7 @@ Wizard::SetContentsButtons (caption, contents, help, back_button, next_button); AdjustButtons (next_button, back_button, abort_button, nil); + DisableButtons (settings["disable_buttons"]:[]); return Run (w, fallback); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/library/modules/AsciiFile.ycp new/yast2-2.13.45/library/modules/AsciiFile.ycp --- old/yast2-2.13.42/library/modules/AsciiFile.ycp 2006-02-03 08:47:24.000000000 +0100 +++ new/yast2-2.13.45/library/modules/AsciiFile.ycp 2006-04-05 12:13:41.000000000 +0200 @@ -5,7 +5,7 @@ * * Purpose: Handle reading and modifying of ascii files. * - * $Id: AsciiFile.ycp 21897 2005-02-24 11:00:17Z fehr $ + * $Id: AsciiFile.ycp 29706 2006-04-05 09:37:17Z fehr $ */ { module "AsciiFile"; @@ -314,13 +314,13 @@ global define void RewriteFile( map& file, string fpath ) ``{ y2milestone( "path %1", fpath ); - y2milestone( "out: %1", file ); + y2debug( "out: %1", file ); string out = ""; foreach( integer num, map entry, file["l"]:$[], ``{ out = out + AssertLineValid( file, num ) + "\n"; }); - y2milestone ("Out text: %1", out ); + y2debug ("Out text: %1", out ); if( size(out)==0 ) { if( SCR::Read( .target.size, fpath ) >= 0 ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/library/modules/Version.ycp new/yast2-2.13.45/library/modules/Version.ycp --- old/yast2-2.13.42/library/modules/Version.ycp 2006-04-04 15:55:01.000000000 +0200 +++ new/yast2-2.13.45/library/modules/Version.ycp 2006-04-05 16:31:48.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.13.42"; +global string yast2 = "2.13.45"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/library/network/src/CWMFirewallInterfaces.ycp new/yast2-2.13.45/library/network/src/CWMFirewallInterfaces.ycp --- old/yast2-2.13.42/library/network/src/CWMFirewallInterfaces.ycp 2006-02-13 09:51:15.000000000 +0100 +++ new/yast2-2.13.45/library/network/src/CWMFirewallInterfaces.ycp 2006-04-05 11:57:22.000000000 +0200 @@ -4,12 +4,26 @@ * Summary: Routines for selecting interfaces opened in firewall * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: CWMFirewallInterfaces.ycp 27875 2006-02-13 08:51:13Z locilka $ + * $Id: CWMFirewallInterfaces.ycp 29707 2006-04-05 09:57:19Z locilka $ * */ { + /** + * WARNING: If you want to use this functionality of this module + * you should allways call 'SuSEFirewall::Read()' in the + * Read() function of you module + * and you should call 'SuSEFirewall::Write()' in the + * Write() function. + * + * Functionality of this module only changes the SuSEFirewall + * settings in memory, it never Reads or Writes the settings. + * + * Additionally you may need to call Progress::set(false) + * before SuSEFirewall::Read() or SuSEFirewall::Write(). + */ + module "CWMFirewallInterfaces"; textdomain "base"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/library/network/src/Makefile.am new/yast2-2.13.45/library/network/src/Makefile.am --- old/yast2-2.13.42/library/network/src/Makefile.am 2006-02-03 08:47:17.000000000 +0100 +++ new/yast2-2.13.45/library/network/src/Makefile.am 2006-04-05 12:08:38.000000000 +0200 @@ -19,5 +19,5 @@ EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) # runlevel: Service, wizard: Report, Progress -YCPCFLAGS = -M ../../types/src -M ../../modules -M ../../runlevel/src -M ../../wizard/src -M ../../cwm/src -M ../../control/src -M ../../xml/src -M ../../commandline/src +YCPCFLAGS = -M ../../types/src -M ../../modules -M ../../runlevel/src -M ../../wizard/src -M ../../cwm/src -M ../../control/src -M ../../xml/src -M ../../commandline/src -M ../../packages/src include $(top_srcdir)/Makefile.am.common diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/library/network/src/Makefile.in new/yast2-2.13.45/library/network/src/Makefile.in --- old/yast2-2.13.42/library/network/src/Makefile.in 2006-04-04 15:54:51.000000000 +0200 +++ new/yast2-2.13.45/library/network/src/Makefile.in 2006-04-05 16:31:37.000000000 +0200 @@ -190,7 +190,7 @@ EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) # runlevel: Service, wizard: Report, Progress -YCPCFLAGS = -M ../../types/src -M ../../modules -M ../../runlevel/src -M ../../wizard/src -M ../../cwm/src -M ../../control/src -M ../../xml/src -M ../../commandline/src +YCPCFLAGS = -M ../../types/src -M ../../modules -M ../../runlevel/src -M ../../wizard/src -M ../../cwm/src -M ../../control/src -M ../../xml/src -M ../../commandline/src -M ../../packages/src modulebin_DATA = $(patsubst %.ycp,%.ybc,$(module_DATA)) modulebindir = $(moduledir) ybcfiles = $(filter %.ybc,$(modulebin_DATA)) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/library/network/src/NetworkDevices.ycp new/yast2-2.13.45/library/network/src/NetworkDevices.ycp --- old/yast2-2.13.42/library/network/src/NetworkDevices.ycp 2006-02-03 08:47:17.000000000 +0100 +++ new/yast2-2.13.45/library/network/src/NetworkDevices.ycp 2006-04-05 09:49:25.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Interface manipulation (/etc/sysconfig/network/ifcfg-*) * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: NetworkDevices.ycp 26301 2005-11-25 14:30:03Z mvidner $ + * $Id: NetworkDevices.ycp 29693 2006-04-05 07:49:19Z locilka $ * * The new sysconfig naming is interface (eg. eth0) vs. device * (eg. NE2000 card), but historically yast has called them device @@ -21,6 +21,11 @@ import "String"; /** + * False suppresses tones of logs 'NetworkDevices.ycp:ABC Check(eth,id-00:aa:bb:cc:dd:ee,)' + */ +global boolean report_every_check = true; + +/** * Current device identifier * @example eth0, eth1:blah, lo, ... * Add, Edit and Delete copy the requested device info (via Select) @@ -830,7 +835,7 @@ string typ = device_type(dev); string num = device_num(dev); string anum = alias_num(dev); - y2milestone("Check(%1,%2,%3)", typ, num, anum); + if (report_every_check) y2milestone("Check(%1,%2,%3)", typ, num, anum); if(!haskey(Devices, typ)) return false; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/library/network/src/SuSEFirewall.ycp new/yast2-2.13.45/library/network/src/SuSEFirewall.ycp --- old/yast2-2.13.42/library/network/src/SuSEFirewall.ycp 2006-02-13 09:38:17.000000000 +0100 +++ new/yast2-2.13.45/library/network/src/SuSEFirewall.ycp 2006-04-05 11:56:21.000000000 +0200 @@ -110,7 +110,7 @@ "FW_PROTECT_FROM_INT", // global routing, masquerading - "FW_ROUTE", "FW_MASQUERADE", "FW_FORWARD_MASQ", + "FW_ROUTE", "FW_MASQUERADE", "FW_FORWARD_MASQ", "FW_FORWARD_ALWAYS_INOUT_DEV", // broadcast packets "FW_ALLOW_FW_BROADCAST_EXT", "FW_ALLOW_FW_BROADCAST_INT", "FW_ALLOW_FW_BROADCAST_DMZ", @@ -970,7 +970,7 @@ /** * Local function allows ports for requested protocol and zone. * - * @param list <string> ports to be removed + * @param list <string> ports to be added * @param string protocol * @param string zone */ @@ -1882,14 +1882,6 @@ boolean ArePortsOrServicesAllowed (list <string> needed_ports, string protocol, string zone, boolean check_for_aliases) { boolean are_allowed = true; - // When NetworkManager is turned on - //if (NetworkService::IsManaged()) { - // When the defined zone contains the defined special string (EXT/any) by default - if (contains(SuSEFirewall::GetSpecialInterfacesInZone(special_all_interface_zone), special_all_interface_string)) { - zone = special_all_interface_zone; - } - //} - if (size(needed_ports)<1) { y2warning("Undefined list of %1 services/ports for service", protocol); return true; @@ -2162,6 +2154,10 @@ * Fills internal variables only. */ global define boolean Read () { + // Don't fill up the logs with tones of Check-logs + // Turn on for debugging + // NetworkDevices::report_every_check = false; + if (configuration_has_been_read) { y2milestone("SuSEfirewall2 configuration has been read already."); return true; @@ -2204,6 +2200,7 @@ // Allways modified for installation, allways save the final state // fixing bug #67355 // SetModified(); + boolean make_parser_happy = true; } if (have_progress) Progress::NextStage(); @@ -2828,6 +2825,23 @@ SETTINGS["FW_IGNORE_FW_BROADCAST_" + zone] = bcast; } + /** + * Function adds a special interface into the FW_FORWARD_ALWAYS_INOUT_DEV variable + * + * @see: https://bugzilla.novell.com/show_bug.cgi?id=154133 + */ + global define void AddXenSupport () { + string special_xen_interface = "xenbr0"; + + SetModified(); + + list <string> allways_inout_dev = splitstring (SETTINGS["FW_FORWARD_ALWAYS_INOUT_DEV"]:"", " "); + allways_inout_dev = toset(add (allways_inout_dev, special_xen_interface)); + SETTINGS["FW_FORWARD_ALWAYS_INOUT_DEV"] = mergestring(allways_inout_dev, " "); + + y2milestone("FW_FORWARD_ALWAYS_INOUT_DEV -> %1", SETTINGS["FW_FORWARD_ALWAYS_INOUT_DEV"]:""); + } + #  /* EOF */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/library/network/src/SuSEFirewallProposal.ycp new/yast2-2.13.45/library/network/src/SuSEFirewallProposal.ycp --- old/yast2-2.13.42/library/network/src/SuSEFirewallProposal.ycp 2006-02-13 09:51:15.000000000 +0100 +++ new/yast2-2.13.45/library/network/src/SuSEFirewallProposal.ycp 2006-04-05 11:56:21.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Functional interface for SuSEFirewall installation proposal * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: SuSEFirewallProposal.ycp 27875 2006-02-13 08:51:13Z locilka $ + * $Id: SuSEFirewallProposal.ycp 29702 2006-04-05 09:14:44Z locilka $ * * This module provides a functional API for Installation proposal of SuSEfirewall2 */ @@ -17,6 +17,7 @@ //import "NetworkService"; import "ProductFeatures"; import "Linuxrc"; + import "Package"; #  @@ -175,6 +176,13 @@ } /** + * Local function returns whether the Xen kernel is installed + */ + boolean IsXenInstalled () { + return Package::Installed ("kernel-xen"); + } + + /** * Local function for proposing firewall configuration. */ void ProposeFunctions () { @@ -258,6 +266,14 @@ OpenServiceOnNonDialUpInterfaces("ssh"); } + /* + * Firewall support for XEN domain0 + */ + if (IsXenInstalled()) { + y2milestone("Adding Xen support into the firewall configuration"); + SuSEFirewall::AddXenSupport(); + } + SetKnownInterfaces(SuSEFirewall::GetListOfKnownInterfaces()); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/library/packages/src/PackageCallbacksInit.ycp new/yast2-2.13.45/library/packages/src/PackageCallbacksInit.ycp --- old/yast2-2.13.42/library/packages/src/PackageCallbacksInit.ycp 2006-04-04 15:42:13.000000000 +0200 +++ new/yast2-2.13.45/library/packages/src/PackageCallbacksInit.ycp 2006-04-05 16:01:22.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Initialize packager callbacks * Authors: Jiri Srain <jsrain(a)suse.cz> * - * $Id: PackageCallbacksInit.ycp 29661 2006-04-04 13:42:05Z locilka $ + * $Id: PackageCallbacksInit.ycp 29725 2006-04-05 14:01:18Z locilka $ * * This module is used to initialize package manager callbacks */ @@ -42,7 +42,12 @@ // Pkg::CallbackDoneDownload ("PackageCallbacks::DoneDownload"); // Signature-related callbacks - Pkg::CallbackAcceptUnsignedFile ("SignatureCheckCallbacks::AcceptUnsignedFile"); + Pkg::CallbackAcceptUnsignedFile ("SignatureCheckCallbacks::AcceptUnsignedFile"); + Pkg::CallbackAcceptUnknownGpgKey ("SignatureCheckCallbacks::AcceptUnknownGpgKey"); + Pkg::CallbackImportGpgKey ("SignatureCheckCallbacks::ImportGpgKey"); + Pkg::CallbackAcceptVerificationFailed ("SignatureCheckCallbacks::AcceptVerificationFailed"); + Pkg::CallbackTrustedKeyAdded ("SignatureCheckCallbacks::TrustedKeyAdded"); + Pkg::CallbackTrustedKeyRemoved ("SignatureCheckCallbacks::TrustedKeyRemoved"); SetMediaCallbacks (); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.13.42/scripts/save_y2logs new/yast2-2.13.45/scripts/save_y2logs --- old/yast2-2.13.42/scripts/save_y2logs 2006-02-03 08:47:26.000000000 +0100 +++ new/yast2-2.13.45/scripts/save_y2logs 2006-04-05 15:55:08.000000000 +0200 @@ -5,19 +5,54 @@ # # Author: Stefan Hundhammer <sh(a)suse.de> -if [ $# != 1 ]; then +usage() +{ echo "Usage: $0 <tgz-file-name>" echo "" echo "Copies the YaST2 logs to a compressed tar archive." exit 1 -fi +} + +test -z "$1" && usage + +case "$1" in + -*) + usage + ;; + + *.tgz|*.tar.gz) + TARGET="$1" + COMPRESSION=--gzip + ;; + + *.tar.bz2) + TARGET="$1" + COMPRESSION=--bzip2 + + if [ ! -x /usr/bin/bzip2 ]; then + echo "FATAL: /usr/bin/bzip2 not available" >&2 + # This might easily happen in the inst-sys + exit 3 + fi + ;; + + *) + echo "FATAL: Uncompressed archives not supported" >&2 + echo "Use one of: .tgz .tar.gz .tar.bz2" >&2 + exit 4 +esac -TARGET=$1 LIST=YaST2 -[ -f /var/log/evms-engine.log ] && LIST="$LIST evms-engine.*" +if [ -f /var/log/evms-engine.log ]; then + LIST="$LIST $( cd /var/log/; ls evms-engine.*)" +fi + +echo "Saving y2logs to $TARGET" + +tar cf "$TARGET" $COMPRESSION --directory=/var/log $LIST && exit 0 -cd /var/log && tar czf $TARGET $LIST && exit 0 +echo "FATAL: Error creating archive $TARGET" >&2 exit 2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit xorg-x11
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package xorg-x11 checked in at Wed Apr 5 17:47:25 CEST 2006. -------- --- xorg-x11/xorg-x11.changes 2006-03-31 15:10:28.000000000 +0200 +++ xorg-x11/xorg-x11.changes 2006-04-04 16:47:45.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 4 16:47:23 CEST 2006 - sndirsch(a)suse.de + +- xorg-x11 provides/obsoletes XFree86-Xprt/XFree86-driver-options + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.6Y5QDC/_old 2006-04-05 17:46:12.000000000 +0200 +++ /var/tmp/diff_new_pack.6Y5QDC/_new 2006-04-05 17:46:12.000000000 +0200 @@ -26,9 +26,9 @@ %endif License: X11/MIT, Other License(s), see package Group: System/X11/Utilities -Obsoletes: XFree86 +Obsoletes: XFree86 XFree86-Xprt XFree86-driver-options %if %suse_version > 920 -Provides: XFree86 +Provides: XFree86 XFree86-Xprt XFree86-driver-options %else Provides: XFree86 xf86 %endif @@ -40,7 +40,7 @@ %endif Autoreqprov: on Version: 6.9.0 -Release: 31 +Release: 32 Summary: The basic X Window System package Source: xorg-6.9.0.tar.bz2 Source1: xdm.tar.gz @@ -2681,6 +2681,8 @@ %clean %changelog -n xorg-x11 +* Tue Apr 04 2006 - sndirsch(a)suse.de +- xorg-x11 provides/obsoletes XFree86-Xprt/XFree86-driver-options * Fri Mar 31 2006 - sndirsch(a)suse.de - xdm.tar.gz: converted to .gz format (has been .bz2) * Fri Mar 31 2006 - werner(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit powersave
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package powersave checked in at Wed Apr 5 17:44:23 CEST 2006. -------- --- powersave/powersave.changes 2006-04-05 12:17:19.000000000 +0200 +++ powersave/powersave.changes 2006-04-05 15:26:23.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 5 15:26:13 CEST 2006 - hmacht(a)suse.de + +- update translation files + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powersave.spec ++++++ --- /var/tmp/diff_new_pack.cDfhF2/_old 2006-04-05 17:44:10.000000000 +0200 +++ /var/tmp/diff_new_pack.cDfhF2/_new 2006-04-05 17:44:10.000000000 +0200 @@ -15,7 +15,7 @@ URL: http://powersave.sourceforge.net/ Summary: General Powermanagement daemon supporting APM and ACPI and CPU frequency scaling Version: 0.12.10 -Release: 1 +Release: 2 License: GPL Group: System/Daemons Autoreqprov: on @@ -172,6 +172,8 @@ %changelog -n powersave * Wed Apr 05 2006 - hmacht(a)suse.de +- update translation files +* Wed Apr 05 2006 - hmacht(a)suse.de - show graphical message if suspend to RAM works, but not with framebuffer - update contribution script for asus hotkeys ++++++ powersave-0.12.10.tar.bz2 ++++++ ++++ 3661 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit udev
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package udev checked in at Wed Apr 5 17:42:59 CEST 2006. -------- --- udev/udev.changes 2006-03-31 11:40:31.000000000 +0200 +++ udev/udev.changes 2006-04-04 23:37:35.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Apr 4 18:00:21 CEST 2006 - kay.sievers(a)suse.de + +- export current seqnum to /dev/.udev/uevent_seqnum to + be able to compare against the kernel seqnum and make + sure that there are no more events to expect. Add + udevsettle to wait for events. (#163010). + +------------------------------------------------------------------- Old: ---- udev.count_events New: ---- udev-export-seqnum-02.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.8jS9BV/_old 2006-04-05 17:42:12.000000000 +0200 +++ /var/tmp/diff_new_pack.8jS9BV/_new 2006-04-05 17:42:12.000000000 +0200 @@ -13,7 +13,7 @@ Name: udev URL: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ Version: 085 -Release: 13 +Release: 14 License: GPL Group: System/Kernel Summary: A rule based device node and kernel event manager @@ -26,6 +26,7 @@ Patch1: fix-queue-export-01.patch Patch3: udevtrigger-01.patch Patch4: allow-comma-01.patch +Patch5: udev-export-seqnum-02.patch # Source1: path_id # @@ -38,7 +39,6 @@ # # rule helper Source26: load_floppy_module.sh -Source27: udev.count_events Source29: firmware.sh # # system @@ -71,12 +71,14 @@ %patch1 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build make V=1 EXTRAS=%{extras} STRIPCMD= OPTFLAGS="${RPM_OPT_FLAGS}" all %install make V=1 EXTRAS=%{extras} DESTDIR=$RPM_BUILD_ROOT install +ln -sf /sbin/udevsettle ${RPM_BUILD_ROOT}/usr/bin/udev.count_events install -m755 -D extras/eventrecorder.sh ${RPM_BUILD_ROOT}/lib/udev/eventrecorder.sh install -m755 -D extras/path_id ${RPM_BUILD_ROOT}/sbin/path_id install -m644 -D extras/scsi_id/README ../doc/scsi_id/README @@ -104,7 +106,6 @@ # install stuff from package install -m755 -D %{S:26} $RPM_BUILD_ROOT/lib/udev/load_floppy_module.sh install -m755 -D %{S:29} $RPM_BUILD_ROOT/lib/udev/firmware.sh -install -m755 -D %{S:27} $RPM_BUILD_ROOT/usr/bin/udev.count_events # install -m755 -D %{S:60} $RPM_BUILD_ROOT/etc/init.d/boot.udev install -m755 -D %{S:61} $RPM_BUILD_ROOT/etc/init.d/boot.udev_retry @@ -143,6 +144,7 @@ /sbin/udevd /sbin/udevcontrol /sbin/udevtrigger +/sbin/udevsettle /usr/bin/udev.count_events /usr/bin/udevinfo /usr/bin/udevtest @@ -222,6 +224,11 @@ %attr(600,root,root) %dev(c,10,200) /lib/udev/devices/fwmonitor %changelog -n udev +* Tue Apr 04 2006 - kay.sievers(a)suse.de +- export current seqnum to /dev/.udev/uevent_seqnum to + be able to compare against the kernel seqnum and make + sure that there are no more events to expect. Add + udevsettle to wait for events. (#163010). * Fri Mar 31 2006 - olh(a)suse.de - do not provide tty0-7, only tty1 (162365) * Wed Mar 22 2006 - kay.sievers(a)suse.de ++++++ boot.udev ++++++ --- udev/boot.udev 2006-03-20 17:22:24.000000000 +0100 +++ udev/boot.udev 2006-04-05 13:58:22.000000000 +0200 @@ -29,6 +29,7 @@ # start udevd echo -n "Starting udevd " + rm -rf /dev/.udev startproc $DAEMON $udevd_args # cleanup some stuff @@ -42,17 +43,11 @@ fi done - # we may be faster than the first event - mkdir -p /dev/.udev/queue + # trigger events for all devices /sbin/udevtrigger - # until we know how to do better, just wait for _all_ events to finish - loop=300 - while test -d /dev/.udev/queue; do - sleep 0.1; - test "$loop" -gt 0 || break - loop=$(($loop - 1)) - done + # wait for events to finish + /sbin/udevsettle --timeout=60 rc_status -v ;; stop) ++++++ udev-export-seqnum-02.patch ++++++ diff --git a/Makefile b/Makefile index 5e43224..1ce1abe 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,7 @@ PROGRAMS = \ udev \ udevd \ udevtrigger \ + udevsettle \ udevsend \ udevcontrol \ udevmonitor \ @@ -86,6 +87,7 @@ MAN_PAGES = \ udevmonitor.8 \ udevd.8 \ udevtrigger.8 \ + udevsettle.8 \ udevsend.8 \ udevtest.8 \ udevinfo.8 \ @@ -261,6 +263,7 @@ install-man: $(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8 $(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8 $(INSTALL_DATA) -D udevtrigger.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8 + $(INSTALL_DATA) -D udevsettle.8 $(DESTDIR)$(mandir)/man8/udevsettle.8 $(INSTALL_DATA) -D udevmonitor.8 $(DESTDIR)$(mandir)/man8/udevmonitor.8 - ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8 @extras="$(EXTRAS)"; for target in $$extras; do \ @@ -274,6 +277,7 @@ uninstall-man: - rm -f $(DESTDIR)$(mandir)/man8/udevtest.8 - rm -f $(DESTDIR)$(mandir)/man8/udevd.8 - rm -f $(DESTDIR)$(mandir)/man8/udevtrigger.8 + - rm -f $(DESTDIR)$(mandir)/man8/udevsettle.8 - rm -f $(DESTDIR)$(mandir)/man8/udevmonitor.8 - rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8 @ extras="$(EXTRAS)"; for target in $$extras; do \ @@ -285,6 +289,7 @@ install-bin: $(INSTALL) -d $(DESTDIR)$(udevdir) $(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd $(INSTALL_PROGRAM) -D udevtrigger $(DESTDIR)$(sbindir)/udevtrigger + $(INSTALL_PROGRAM) -D udevsettle $(DESTDIR)$(sbindir)/udevsettle $(INSTALL_PROGRAM) -D udevcontrol $(DESTDIR)$(sbindir)/udevcontrol $(INSTALL_PROGRAM) -D udevmonitor $(DESTDIR)$(usrsbindir)/udevmonitor $(INSTALL_PROGRAM) -D udevinfo $(DESTDIR)$(usrbindir)/udevinfo @@ -302,6 +307,7 @@ endif uninstall-bin: - rm -f $(DESTDIR)$(sbindir)/udevd - rm -f $(DESTDIR)$(sbindir)/udevtrigger + - rm -f $(DESTDIR)$(sbindir)/udevsettle - rm -f $(DESTDIR)$(sbindir)/udevcontrol - rm -f $(DESTDIR)$(usrsbindir)/udevmonitor - rm -f $(DESTDIR)$(usrbindir)/udevinfo diff --git a/udevd.c b/udevd.c index 701165b..8741a09 100644 --- a/udevd.c +++ b/udevd.c @@ -279,8 +279,23 @@ static void udev_event_run(struct uevent static void msg_queue_insert(struct uevent_msg *msg) { + char filename[PATH_SIZE]; + int fd; + msg->queue_time = time(NULL); + strlcpy(filename, udev_root, sizeof(filename)); + strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename)); + fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644); + if (fd > 0) { + char str[32]; + int len; + + len = sprintf(str, "%llu\n", msg->seqnum); + write(fd, str, len); + close(fd); + } + export_event_state(msg, EVENT_QUEUED); /* run all events with a timeout set immediately */ diff --git a/udevd.h b/udevd.h index 9ab6a44..e6ed58d 100644 --- a/udevd.h +++ b/udevd.h @@ -31,6 +31,7 @@ #define EVENT_QUEUE_DIR ".udev/queue" #define EVENT_FAILED_DIR ".udev/failed" +#define EVENT_SEQNUM ".udev/uevent_seqnum" /* maximum limit of forked childs */ #define UDEVD_MAX_CHILDS 64 diff --git a/udevsettle.c b/udevsettle.c new file mode 100644 index 0000000..f0f85ff --- /dev/null +++ b/udevsettle.c @@ -0,0 +1,155 @@ +/* + * udevsettle.c + * + * Copyright (C) 2006 Kay Sievers <kay(a)vrfy.org> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + +#include <stdlib.h> +#include <stddef.h> +#include <string.h> +#include <stdio.h> +#include <unistd.h> +#include <errno.h> +#include <dirent.h> +#include <fcntl.h> +#include <syslog.h> +#include <sys/stat.h> +#include <sys/types.h> + +#include "udev.h" +#include "udevd.h" + +#define LOOP_PER_SECOND 20 + +static const char *udev_log_str; + +#ifdef USE_LOG +void log_message(int priority, const char *format, ...) +{ + va_list args; + + if (priority > udev_log_priority) + return; + + va_start(args, format); + vsyslog(priority, format, args); + va_end(args); +} +#endif + +int main(int argc, char *argv[], char *envp[]) +{ + char queuename[PATH_SIZE]; + char filename[PATH_SIZE]; + unsigned long long seq_kernel; + unsigned long long seq_udev; + char seqnum[32]; + int fd; + ssize_t len; + int timeout = 30; + int loop; + int i; + int rc = 1; + + logging_init("udevsettle"); + udev_config_init(); + dbg("version %s", UDEV_VERSION); + + udev_log_str = getenv("UDEV_LOG"); + + for (i = 1 ; i < argc; i++) { + char *arg = argv[i]; + + if (strncmp(arg, "--timeout=", 10) == 0) { + char *str = &arg[10]; + + timeout = atoi(str); + dbg("timeout=%i", timeout); + if (timeout <= 0) { + fprintf(stderr, "Invalid timeout value.\n"); + goto exit; + } + } else { + fprintf(stderr, "Usage: udevsettle [--timeout=<seconds>]\n"); + goto exit; + } + } + + sysfs_init(); + strlcpy(queuename, udev_root, sizeof(queuename)); + strlcat(queuename, "/" EVENT_QUEUE_DIR, sizeof(queuename)); + + loop = timeout * LOOP_PER_SECOND; + while (loop--) { + /* wait for events in queue to finish */ + while (loop--) { + struct stat statbuf; + + if (stat(queuename, &statbuf) < 0) { + info("queue is empty"); + break; + } + usleep(1000 * 1000 / LOOP_PER_SECOND); + } + if (loop <= 0) { + info("timeout waiting for queue"); + goto exit; + } + + /* read current kernel seqnum */ + strlcpy(filename, sysfs_path, sizeof(filename)); + strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename)); + fd = open(filename, O_RDONLY); + if (fd < 0) + goto exit; + len = read(fd, seqnum, sizeof(seqnum)-1); + close(fd); + if (len <= 0) + goto exit; + seqnum[len] = '\0'; + seq_kernel = strtoull(seqnum, NULL, 10); + info("kernel seqnum = %llu", seq_kernel); + + /* read current udev seqnum */ + strlcpy(filename, udev_root, sizeof(filename)); + strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename)); + fd = open(filename, O_RDONLY); + if (fd < 0) + goto exit; + len = read(fd, seqnum, sizeof(seqnum)-1); + close(fd); + if (len <= 0) + goto exit; + seqnum[len] = '\0'; + seq_udev = strtoull(seqnum, NULL, 10); + info("udev seqnum = %llu", seq_udev); + + /* make sure all kernel events have arrived in the queue */ + if (seq_udev >= seq_kernel) { + info("queue is empty and no pending events left"); + rc = 0; + goto exit; + } + usleep(1000 * 1000 / LOOP_PER_SECOND); + info("queue is empty, but events still pending"); + } + +exit: + sysfs_cleanup(); + logging_close(); + return rc; +} diff --git a/udevsettle.xml b/udevsettle.xml new file mode 100644 index 0000000..5f8f1ee --- /dev/null +++ b/udevsettle.xml @@ -0,0 +1,82 @@ +<?xml version='1.0'?> +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + +<article> + <articleinfo> + <title>xmlto</title> + <author> + <firstname>Kay</firstname> + <surname>Sievers</surname> + <email>kay.sievers(a)vrfy.org</email> + </author> + <copyright> + <year>2006</year> + <holder>Kay Sievers</holder> + </copyright> + </articleinfo> + + <section> + <title>udevsettle</title> + <refentry> + <refentryinfo> + <title>udevsettle</title> + <date>March 2006</date> + <productname>udev</productname> + </refentryinfo> + + <refmeta> + <refentrytitle>udevsettle</refentrytitle> + <manvolnum>8</manvolnum> + </refmeta> + + <refnamediv> + <refname>udevsettle</refname><refpurpose>wait until queued kernel/udev events are handled</refpurpose> + </refnamediv> + + <refsynopsisdiv> + <cmdsynopsis> + <command>udevsettle</command> + <arg><option>--timeout=<replaceable>seconds</replaceable></option></arg> + </cmdsynopsis> + </refsynopsisdiv> + + <refsect1><title>DESCRIPTION</title> + <para>Waits watching the udev event queue and exits if all current events are handled.</para> + </refsect1> + + <refsect1><title>OPTIONS</title> + <variablelist> + <varlistentry> + <term><option>--timeout=<replaceable>seconds</replaceable></option></term> + <listitem> + <para>maximum seconds to wait for the queue to become empty.</para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + + <refsect1><title>ENVIRONMENT</title> + <variablelist> + <varlistentry> + <term><option>UDEV_LOG</option></term> + <listitem> + <para>Overrides the syslog priority specified in the config file.</para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + + <refsect1><title>AUTHOR</title> + <para>Written by Kay Sievers <email>kay.sievers(a)vrfy.org</email>.</para> + </refsect1> + + <refsect1> + <title>SEE ALSO</title> + <para><citerefentry> + <refentrytitle>udev</refentrytitle><manvolnum>7</manvolnum> + </citerefentry></para> + </refsect1> + </refentry> + </section> +</article> diff --git a/udevsettle.8 b/udevsettle.8 new file mode 100644 index 0000000..6015539 --- /dev/null +++ b/udevsettle.8 @@ -0,0 +1,32 @@ +.\" ** You probably do not want to edit this file directly ** +.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). +.\" Instead of manually editing it, you probably should edit the DocBook XML +.\" source for it and then use the DocBook XSL Stylesheets to regenerate it. +.TH "UDEVSETTLE" "8" "March 2006" "udev" "udevsettle" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +udevsettle \- wait until queued kernel/udev events are handled +.SH "SYNOPSIS" +.HP 11 +\fBudevsettle\fR [\fB\-\-timeout=\fR\fB\fIseconds\fR\fR] +.SH "DESCRIPTION" +.PP +Waits watching the udev event queue and exits if all current events are handled. +.SH "OPTIONS" +.TP +\fB\-\-timeout=\fR\fB\fIseconds\fR\fR +maximum seconds to wait for the queue to become empty. +.SH "ENVIRONMENT" +.TP +\fBUDEV_LOG\fR +Overrides the syslog priority specified in the config file. +.SH "AUTHOR" +.PP +Written by Kay Sievers +<kay.sievers(a)vrfy.org>. +.SH "SEE ALSO" +.PP +\fBudev\fR(7) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit heartbeat
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package heartbeat checked in at Wed Apr 5 17:42:49 CEST 2006. -------- --- heartbeat/heartbeat.changes 2006-03-27 16:57:26.000000000 +0200 +++ heartbeat/heartbeat.changes 2006-04-05 17:26:43.000000000 +0200 @@ -1,0 +2,59 @@ +Wed Apr 5 17:25:44 CEST 2006 - lmb(a)suse.de + +- Reduce buildrequires dependencies by defaulting to path names. +- CRM fixes: + - Master/slave resources have been tested and work. + - "crm_role" now passed on to RAs as indication of m/s invocation. + - Election timer related fixes (OSDL #1151, #1154). + - Logging has been greatly enhanced and reduced in volume. + - Failcount only applies to recurring actions (monitor). + - crm_verify now can also optional save the CIB used (if invoked on + the live CIB) for reproduction. + - Better error handling and user feedback in cibadmin. + - CIB is now smaller by only saving the hash of the parameters in the + status section instead of the full list. + - DTD has been updated and the CIB can now be validated using xmllint + (OSDL #1169). + - crm_mon no longer displays provider for LSB/heartbeat class + resources. + - pengine now writes its inputs to disk under + /var/lib/heartbeat/pengine/, instead of logging them. Reduces log + flooding by 40% and improves supportability. + - New resource paramater "target_role" to specify that the admin wants + a resource to be Stopped (ie, not running), or to prevent it from + being promoted to Master. + - CIB better deals with invalid changes by the admin. + - cibadmin fixes for "Call cib_create failed (-25): The update was + empty" + - CIB deletions could cause a crash (OSDL #1141). + - Make sure logs are flushed before aborting. + - CIB now supports validation against the DTD to protect the admin + from inserting invalid XML when all nodes are 2.0.5 and up (OSDL + #1169). + - crmadmin help text advertised unimplemented commandline options + (#163517, #163563). +- GUI: + - Indicate refreshing progress in status bar to avoid appearing hung + (OSDL #1160). + - Further improved client-side caching for performance. + - Report why login to the server failed. + - Fixed a crash in conjunction with crm_resource -M (#154512, OSDL + #1176). + - Show whether a node is in standby mode or not (OSDL #1175, #1004). + - mgmtd memory leak fixed. + - Crashed daemon caused GUI to consume all CPU (OSDL #1157). +- LRM: + - Logging improvements. + - Do not send redundant notifications to crmd (OSDL #1083). + - Do report failure of class heartbeat resources (OSDL #1163). +- CIM provider: + - Detect http/https ports for openwbem (OSDL #1104, #151297). +- heartbeat core: + - Fix a crash in our IPC code on channel disconnect (OSDL #1182). +- Resource agents: + - ldirectord to use /dev/null instead of /dev/console when daemonized + (OSDL #1180). + - Remove stray "parameters" closing tag in OCFS2-enabled Filesystem + RA, causing GUI to not display help (#158531). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ heartbeat.spec ++++++ --- /var/tmp/diff_new_pack.tfQJAY/_old 2006-04-05 17:41:23.000000000 +0200 +++ /var/tmp/diff_new_pack.tfQJAY/_new 2006-04-05 17:41:23.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: heartbeat -BuildRequires: OpenIPMI-devel curl-devel drbd e2fsprogs-devel glib2-devel gnutls-devel iproute2 iptables iputils libnet libxml2-devel lynx lzo-devel mailx mdadm net-snmp-devel openssh openwbem-devel pam-devel python-devel python-gtk python-xml swig tcpd-devel +BuildRequires: OpenIPMI-devel curl-devel e2fsprogs-devel glib2-devel gnutls-devel iproute2 iptables iputils libnet libxml2-devel lynx lzo-devel net-snmp-devel openwbem-devel pam-devel python-devel python-gtk python-xml swig tcpd-devel %define sanity_check 0 %define with_extra_warnings 0 %define with_debugging 0 @@ -19,7 +19,7 @@ %define sanity_check_aborts_build 0 Summary: The Heartbeat Subsystem for High-Availability Linux Version: 2.0.4 -Release: 7 +Release: 8 License: GPL, LGPL URL: http://linux-ha.org/ Group: Productivity/Clustering/HA @@ -301,8 +301,7 @@ %{_libdir}/heartbeat/ccm* %{_libdir}/heartbeat/cib* %{_libdir}/heartbeat/clmtest -%{_libdir}/heartbeat/crmd -%{_libdir}/heartbeat/crmtest +%{_libdir}/heartbeat/crm* %{_libdir}/heartbeat/cts %{_libdir}/heartbeat/findif %{_libdir}/heartbeat/ha* @@ -371,6 +370,7 @@ # %ghost %attr (600, root, root) /var/lib/heartbeat/fifo %dir %attr (755, hacluster, haclient) /var/run/heartbeat/ccm %dir %attr (750, hacluster, haclient) /var/lib/heartbeat/crm +%dir %attr (750, hacluster, haclient) /var/lib/heartbeat/pengine %dir %attr (750, hacluster, haclient) /var/run/heartbeat/crm %dir /var/lib/heartbeat/cores %dir %attr (0700, root, root) /var/lib/heartbeat/cores/root @@ -431,6 +431,62 @@ %{_libdir}/pils %changelog -n heartbeat +* Wed Apr 05 2006 - lmb(a)suse.de +- Reduce buildrequires dependencies by defaulting to path names. +- CRM fixes: +- Master/slave resources have been tested and work. +- "crm_role" now passed on to RAs as indication of m/s invocation. +- Election timer related fixes (OSDL #1151, #1154). +- Logging has been greatly enhanced and reduced in volume. +- Failcount only applies to recurring actions (monitor). +- crm_verify now can also optional save the CIB used (if invoked on + the live CIB) for reproduction. +- Better error handling and user feedback in cibadmin. +- CIB is now smaller by only saving the hash of the parameters in the + status section instead of the full list. +- DTD has been updated and the CIB can now be validated using xmllint + (OSDL #1169). +- crm_mon no longer displays provider for LSB/heartbeat class + resources. +- pengine now writes its inputs to disk under + /var/lib/heartbeat/pengine/, instead of logging them. Reduces log + flooding by 40%% and improves supportability. +- New resource paramater "target_role" to specify that the admin wants + a resource to be Stopped (ie, not running), or to prevent it from + being promoted to Master. +- CIB better deals with invalid changes by the admin. +- cibadmin fixes for "Call cib_create failed (-25): The update was + empty" +- CIB deletions could cause a crash (OSDL #1141). +- Make sure logs are flushed before aborting. +- CIB now supports validation against the DTD to protect the admin + from inserting invalid XML when all nodes are 2.0.5 and up (OSDL + [#1169]). +- crmadmin help text advertised unimplemented commandline options + (#163517, #163563). +- GUI: +- Indicate refreshing progress in status bar to avoid appearing hung + (OSDL #1160). +- Further improved client-side caching for performance. +- Report why login to the server failed. +- Fixed a crash in conjunction with crm_resource -M (#154512, OSDL + [#1176]). +- Show whether a node is in standby mode or not (OSDL #1175, #1004). +- mgmtd memory leak fixed. +- Crashed daemon caused GUI to consume all CPU (OSDL #1157). +- LRM: +- Logging improvements. +- Do not send redundant notifications to crmd (OSDL #1083). +- Do report failure of class heartbeat resources (OSDL #1163). +- CIM provider: +- Detect http/https ports for openwbem (OSDL #1104, #151297). +- heartbeat core: +- Fix a crash in our IPC code on channel disconnect (OSDL #1182). +- Resource agents: +- ldirectord to use /dev/null instead of /dev/console when daemonized + (OSDL #1180). +- Remove stray "parameters" closing tag in OCFS2-enabled Filesystem + RA, causing GUI to not display help (#158531). * Mon Mar 27 2006 - lmb(a)suse.de - Logging updates. - CRM fixes: ++++++ heartbeat-CVS.tar.bz2 ++++++ ++++ 10077 lines of diff (skipped) ++++++ heartbeat-Filesystem-ocfs2.diff ++++++ --- /var/tmp/diff_new_pack.tfQJAY/_old 2006-04-05 17:41:34.000000000 +0200 +++ /var/tmp/diff_new_pack.tfQJAY/_new 2006-04-05 17:41:34.000000000 +0200 @@ -1,14 +1,32 @@ Index: resources/OCF/Filesystem.in =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Filesystem.in,v -retrieving revision 1.14 -diff -u -p -r1.14 Filesystem.in ---- resources/OCF/Filesystem.in 26 Jan 2006 18:00:05 -0000 1.14 -+++ resources/OCF/Filesystem.in 3 Feb 2006 16:23:25 -0000 -@@ -145,9 +145,31 @@ Any extra options to be given as -o opti - </parameter> - </parameters> +retrieving revision 1.17 +diff -u -r1.17 Filesystem.in +--- resources/OCF/Filesystem.in 10 Mar 2006 04:14:20 -0000 1.17 ++++ resources/OCF/Filesystem.in 5 Apr 2006 15:25:15 -0000 +@@ -1,6 +1,6 @@ + #!/bin/sh + # +-# $Id: Filesystem.in,v 1.17 2006/03/10 04:14:20 xunsun Exp $ ++# $Id: Filesystem.in,v 1.16 2006/03/09 12:55:10 xunsun Exp $ + # + # Support: linux-ha(a)lists.linux-ha.org + # License: GNU General Public License (GPL) +@@ -95,7 +95,7 @@ + usage() { + cat <<-EOT + usage: $0 {start|stop|status|monitor|validate-all|meta-data} +- $Id: Filesystem.in,v 1.17 2006/03/10 04:14:20 xunsun Exp $ ++ $Id: Filesystem.in,v 1.16 2006/03/09 12:55:10 xunsun Exp $ + EOT + } +@@ -143,11 +143,31 @@ + <shortdesc lang="en">options</shortdesc> + <content type="string" default="" /> + </parameter> ++ +<parameter name="ocfs2_cluster" unique="0"> +<longdesc lang="en"> +The name (UUID) of the OCFS2 cluster this filesystem is part of, @@ -18,7 +36,6 @@ +<shortdesc lang="en">OCFS2 cluster name/UUID</shortdesc> +<content type="string" default="" /> +</parameter> -+</parameters> + +<parameter name="ocfs2_configfs" unique="0"> +<longdesc lang="en"> @@ -28,8 +45,8 @@ +<shortdesc lang="en">OCFS2 configfs root</shortdesc> +<content type="string" default="" /> +</parameter> -+</parameters> -+ + </parameters> + <actions> <action name="start" timeout="60" /> <action name="stop" timeout="60" /> @@ -37,7 +54,7 @@ <action name="status" depth="0" timeout="10" interval="10" start-delay="10" /> <action name="monitor" depth="0" timeout="10" interval="10" start-delay="10" /> <action name="validate-all" timeout="5" /> -@@ -167,16 +189,10 @@ END +@@ -167,16 +187,10 @@ # flushbufs() { if @@ -57,7 +74,7 @@ fi return 0 -@@ -187,6 +203,13 @@ flushbufs() { +@@ -187,6 +201,13 @@ # Filesystem_start() { @@ -69,9 +86,9 @@ + fi + # See if the device is already mounted. - #$MOUNT | cut -d' ' -f3 | grep -e "^$MOUNTPOINT$" >/dev/null Filesystem_status >/dev/null 2>&1 -@@ -196,6 +219,8 @@ Filesystem_start() + if [ $? -eq $OCF_SUCCESS ] ; then +@@ -195,6 +216,8 @@ fi # Insert SCSI module @@ -80,7 +97,7 @@ $MODPROBE scsi_hostadapter >/dev/null 2>&1 if [ -z $FSTYPE ]; then -@@ -222,7 +247,7 @@ Filesystem_start() +@@ -221,7 +244,7 @@ if case $FSTYPE in @@ -89,7 +106,7 @@ *) true;; esac then -@@ -266,11 +291,154 @@ Filesystem_start() +@@ -265,11 +288,154 @@ } # end of Filesystem_start @@ -243,8 +260,8 @@ + # See if the device is currently mounted if - Filesystem_status >/dev/null 2>&1 -@@ -303,6 +471,7 @@ Filesystem_stop() + Filesystem_status >/dev/null 2>&1 +@@ -309,6 +475,7 @@ DEV=`$MOUNT | grep "on $MOUNTPOINT " | cut -d' ' -f1` # Unmount the filesystem $UMOUNT $MOUNTPOINT @@ -252,7 +269,7 @@ fi if [ $? -ne 0 ] ; then ocf_log err "Couldn't unmount $MOUNTPOINT" -@@ -313,7 +482,18 @@ Filesystem_stop() +@@ -319,7 +486,18 @@ : $MOUNTPOINT Not mounted. No problema! fi @@ -272,7 +289,7 @@ } # end of Filesystem_stop -@@ -339,6 +519,10 @@ Filesystem_status() +@@ -345,10 +523,14 @@ msg="$MOUNTPOINT is unmounted (stopped)" fi @@ -283,7 +300,12 @@ case "$OP" in status) ocf_log info "$msg";; esac -@@ -383,6 +567,63 @@ Filesystem_validate_all() +- return $rc ++ return_master $rc + } + # end of Filesystem_status + +@@ -383,6 +565,63 @@ return $OCF_SUCCESS } @@ -347,7 +369,7 @@ # Check the arguments passed to this script if [ $# -ne 1 ] -@@ -428,6 +669,17 @@ case $DEVICE in +@@ -428,6 +667,17 @@ ;; esac @@ -365,7 +387,7 @@ # It is possible that OCF_RESKEY_directory has one or even multiple trailing "/". # But the output of `mount` and /proc/mounts do not. if [ -z $OCF_RESKEY_directory ]; then -@@ -439,6 +691,8 @@ else +@@ -439,6 +689,8 @@ MOUNTPOINT=$(echo $OCF_RESKEY_directory | sed 's/\/*$//') : ${MOUNTPOINT:=/} # At this stage, $MOUNTPOINT does not contain trailing "/" unless it is "/" @@ -374,7 +396,7 @@ fi # Check to make sure the utilites are found -@@ -451,6 +705,8 @@ check_util $UMOUNT +@@ -451,6 +703,8 @@ case $OP in start) Filesystem_start ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit subversion
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package subversion checked in at Wed Apr 5 17:42:05 CEST 2006. -------- --- subversion/subversion.changes 2006-03-10 14:09:18.000000000 +0100 +++ subversion/subversion.changes 2006-04-04 21:10:55.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 4 21:10:36 CEST 2006 - olh(a)suse.de + +- add svn-config to subversion-devel package (#163289) + +------------------------------------------------------------------- New: ---- subversion.svn-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.Vy2YVX/_old 2006-04-05 17:41:29.000000000 +0200 +++ /var/tmp/diff_new_pack.Vy2YVX/_new 2006-04-05 17:41:29.000000000 +0200 @@ -13,7 +13,7 @@ Name: subversion BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages libapr-util1-devel neon-devel openldap2-devel pcre-devel python-devel swig xorg-x11-devel Version: 1.3.0 -Release: 7 +Release: 11 # %define apxs /usr/sbin/apxs2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) @@ -46,6 +46,7 @@ # Patch10: subversion.warning.svn_error_createf.patch Patch11: subversion.libtool-verbose.patch +Patch12: subversion.svn-config.patch # build fixes Patch20: subversion-swig-perl-install_vendor.patch Patch22: subversion-1.1.x-COMPILE_CXX.dif @@ -128,7 +129,7 @@ %package -n cvs2svn Version: 1.3.0 -Release: 17 +Release: 21 Provides: subversion-cvs2svn Obsoletes: subversion-cvs2svn Group: Development/Tools/Version Control @@ -148,7 +149,7 @@ %package -n viewcvs Version: 1.0 -Release: 42 +Release: 46 Requires: subversion-python Provides: subversion-viewcvs Obsoletes: subversion-viewcvs @@ -194,6 +195,7 @@ # %patch10 -p1 %patch11 -p1 +%patch12 -p1 # %patch20 -p1 %patch22 -p1 @@ -312,6 +314,7 @@ with_jdk= fi make DESTDIR=$RPM_BUILD_ROOT install install-swig-pl install-swig-py $with_jdk +cp svn-config $RPM_BUILD_ROOT/usr/bin/ # # double check that the essential repository access schemes have been compiled in # @@ -443,6 +446,7 @@ %{_libdir}/libsvn*.a %{_libdir}/libsvn*.la /usr/include/subversion-1/* +%attr(755,root,root) /usr/bin/svn-config %files -n cvs2svn %defattr(-,root,root) @@ -470,6 +474,8 @@ %config (noreplace) %{apache_sysconfdir}/conf.d/subversion.viewcvs.conf %changelog -n subversion +* Tue Apr 04 2006 - olh(a)suse.de +- add svn-config to subversion-devel package (#163289) * Fri Mar 10 2006 - poeml(a)suse.de - fix instructions in README.SuSE * Sun Mar 05 2006 - olh(a)suse.de ++++++ subversion.svn-config.patch ++++++ Provide a svn-config Bug 163289 - subversion-devel package misses svn-config --- svn-config.in | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) Index: subversion-1.3.x/svn-config.in =================================================================== --- subversion-1.3.x.orig/svn-config.in +++ subversion-1.3.x/svn-config.in @@ -22,14 +22,12 @@ bindir="@bindir@" libdir="@libdir@" includedir="@includedir@" -LIBS="@NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @SVN_DB_LIBS@ @LIBS@" +LIBS="@NEON_LIBS@ @SVN_APRUTIL_EXPORT_LIBS@ @SVN_APR_EXPORT_LIBS@ @LIBS@" CFLAGS="@CFLAGS@" CPPFLAGS="@CPPFLAGS@" -INCLUDES="@SVN_NEON_INCLUDES@ @SVN_DB_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@" +INCLUDES="@SVN_NEON_INCLUDES@ @SVN_APR_INCLUDES@ @SVN_APRUTIL_INCLUDES@" LDFLAGS="@LDFLAGS@" -SVN_SOURCE_DIR="@abs_srcdir@" -SVN_BUILD_DIR="@abs_builddir@" show_usage() { @@ -43,7 +41,6 @@ Known values for OPTION are: --includes print include information --ldflags print linker flags --libs print library information - --srcdir print SVN source directory --link-ld [NOT IMPL] print link switch(es) for linking to SVN --link-libtool [NOT IMPL] print the libtool inputs for linking to SVN --help print this help @@ -63,21 +60,6 @@ if test $# -eq 0; then exit 1 fi -thisdir="`dirname $0`" -thisdir="`cd $thisdir && pwd`" -if test -d $bindir; then - tmpbindir="`cd $bindir && pwd`" -else - tmpbindir="" -fi -if test "$tmpbindir" = "$thisdir"; then - location=installed -elif test "$SVN_SOURCE_DIR" = "$thisdir"; then - location=source -else - location=build -fi - flags="" while test $# -gt 0; do @@ -106,21 +88,11 @@ while test $# -gt 0; do flags="$flags $LIBS" ;; --includes) - if test "$location" = "installed"; then flags="$flags -I$includedir/subversion-1 $INCLUDES" - elif test "$location" = "source"; then - flags="$flags -I$SVN_SOURCE_DIR/include $INCLUDES" - else - flags="$flags -I$thisdir/include -I$SVN_SOURCE_DIR/include $INCLUDES" - fi ;; --ldflags) flags="$flags $LDFLAGS" ;; - --srcdir) - echo $SVN_SOURCE_DIR - exit 0 - ;; --help) show_usage exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0