September 2007 - openSUSE Commits - openSUSE Mailing Lists

commit zenity
by root＠Hilbert.suse.de 01 Sep '07

01 Sep '07

Hello community, here is the log from the commit of package zenity checked in at Sat Sep 1 13:24:52 CEST 2007. -------- --- GNOME/zenity/zenity.changes 2007-08-07 18:11:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/zenity/zenity.changes 2007-08-31 18:54:43.745513000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 31 18:53:55 CEST 2007 - maw(a)suse.de + +- Update tov ersion 2.19.2: + + Bugs (bugzilla.gnome.org) fixed: #160654, #453713, #343684, + #407275, and #410055 + + Updated translations. + +------------------------------------------------------------------- Old: ---- zenity-2.19.1.tar.bz2 New: ---- zenity-2.19.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zenity.spec ++++++ --- /var/tmp/diff_new_pack.r11789/_old 2007-09-01 13:24:44.000000000 +0200 +++ /var/tmp/diff_new_pack.r11789/_new 2007-09-01 13:24:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package zenity (Version 2.19.1) +# spec file for package zenity (Version 2.19.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,8 +14,8 @@ BuildRequires: docbook-xsl-stylesheets fdupes gnome-doc-utils gnome-doc-utils-devel libglade2-devel libgnomecanvas-devel perl-XML-Parser scrollkeeper License: LGPL v2 or later Group: System/GUI/GNOME -Version: 2.19.1 -Release: 12 +Version: 2.19.2 +Release: 1 Requires: %{name}-lang = %{version} Summary: GNOME Command Line Dialog Utility Source: ftp://ftp.gnome.org/pub/GNOME/sources/zenity/2.20/%{name}-%{version}.tar.bz2 @@ -68,6 +68,11 @@ %files lang -f %{name}.lang %changelog +* Fri Aug 31 2007 - maw(a)suse.de +- Update tov ersion 2.19.2: + + Bugs (bugzilla.gnome.org) fixed: #160654, #453713, #343684, + [#407275], and #410055 + + Updated translations. * Tue Aug 07 2007 - maw(a)suse.de - Use %%fdupes - Split off a -lang subpackage. ++++++ zenity-2.19.1.tar.bz2 -> zenity-2.19.2.tar.bz2 ++++++ ++++ 4571 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yelp
by root＠Hilbert.suse.de 01 Sep '07

01 Sep '07

Hello community, here is the log from the commit of package yelp checked in at Sat Sep 1 13:24:49 CEST 2007. -------- --- GNOME/yelp/yelp.changes 2007-08-07 18:12:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/yelp/yelp.changes 2007-09-01 06:50:44.277468000 +0200 @@ -1,0 +2,24 @@ +Sat Sep 1 06:47:46 CEST 2007 - hpj(a)suse.de + +- Add yelp-2.19.90-freed-memory-crash.patch (BGO #469436). +- Add yelp-2.19.90-freed-memory-crash-2.patch (BGO #469438). +- Add yelp-2.19.90-no-mime-type-crash.patch (BGO #472128). + +------------------------------------------------------------------- +Fri Aug 31 18:49:48 CEST 2007 - maw(a)suse.de + +- Update to version 2.19.90: + + Build fixes + + Use x-yelp-index instead of index, unbreaking some docbook + files + + Write html on demand instead of when idle, fixing info page + usage + + Add a "phrase not found" message to the find bar + + Fix "info <page>" in the serach bar + + Register EXSLT extensions + + Other bugs (bugzilla.gnome.org) fixed: #447107, #431078, + #430365, #381431, #364768, #370167, #358825, #464295, #457082, + #462440, #462813, #450168, #463281, #458693, and #462056 + + Updated translations. + +------------------------------------------------------------------- Old: ---- yelp-2.19.1.tar.bz2 New: ---- yelp-2.19.90-freed-memory-crash-2.patch yelp-2.19.90-freed-memory-crash.patch yelp-2.19.90-no-mime-type-crash.patch yelp-2.19.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp.spec ++++++ --- /var/tmp/diff_new_pack.H11524/_old 2007-09-01 13:24:41.000000000 +0200 +++ /var/tmp/diff_new_pack.H11524/_new 2007-09-01 13:24:41.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yelp (Version 2.19.1) +# spec file for package yelp (Version 2.19.90) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ Requires: gnome-utils susehelp License: GPL v2 or later, LGPL v2 or later Group: System/GUI/GNOME -Version: 2.19.1 -Release: 4 +Version: 2.19.90 +Release: 1 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 @@ -33,6 +33,9 @@ Patch10: mp-search-parser.patch # FIXME: this is surely not the correct approach to take. Patch11: abuild.patch +Patch12: yelp-2.19.90-freed-memory-crash.patch +Patch13: yelp-2.19.90-freed-memory-crash-2.patch +Patch14: yelp-2.19.90-no-mime-type-crash.patch PreReq: filesystem gconf2 Requires: gnome-doc-utils rarian Requires: libbeagle >= 0.2.0 @@ -78,6 +81,9 @@ #%patch9 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 # Use nds for Low Saxon (Northern Frisian Enclave) # Northern Frisian Enclave is not ISO-3166 country code: rename nds@NFE nds po/nds(a)NFE.* @@ -119,6 +125,24 @@ %files lang -f %{name}.lang %changelog +* Sat Sep 01 2007 - hpj(a)suse.de +- Add yelp-2.19.90-freed-memory-crash.patch (BGO #469436). +- Add yelp-2.19.90-freed-memory-crash-2.patch (BGO #469438). +- Add yelp-2.19.90-no-mime-type-crash.patch (BGO #472128). +* Fri Aug 31 2007 - maw(a)suse.de +- Update to version 2.19.90: + + Build fixes + + Use x-yelp-index instead of index, unbreaking some docbook + files + + Write html on demand instead of when idle, fixing info page + usage + + Add a "phrase not found" message to the find bar + + Fix "info <page>" in the serach bar + + Register EXSLT extensions + + Other bugs (bugzilla.gnome.org) fixed: #447107, #431078, + [#430365], #381431, #364768, #370167, #358825, #464295, #457082, + [#462440], #462813, #450168, #463281, #458693, and #462056 + + Updated translations. * Tue Aug 07 2007 - maw(a)suse.de - Split off a -lang subpackage. * Sat Aug 04 2007 - maw(a)suse.de ++++++ yelp-2.19.90-freed-memory-crash-2.patch ++++++ diff -upr yelp-2.19.90-pre/src/yelp-window.c yelp-2.19.90-post/src/yelp-window.c --- yelp-2.19.90-pre/src/yelp-window.c 2007-08-13 15:49:46.000000000 -0500 +++ yelp-2.19.90-post/src/yelp-window.c 2007-08-22 16:52:10.000000000 -0500 @@ -1008,6 +1008,8 @@ yelp_window_load (YelpWindow *window, co doc = priv->current_document; } else { g_free (priv->base_uri); + priv->base_uri = NULL; + switch (type) { case YELP_RRN_TYPE_TOC: doc = yelp_toc_get (); @@ -1037,6 +1039,7 @@ yelp_window_load (YelpWindow *window, co break; case YELP_RRN_TYPE_HTML: case YELP_RRN_TYPE_XHTML: + priv->base_uri = g_strdup ("file:///fakefile"); window_do_load_html (window, real_uri, frag_id, type, TRUE); break; case YELP_RRN_TYPE_EXTERNAL: @@ -1046,6 +1049,9 @@ yelp_window_load (YelpWindow *window, co gchar *cmd = NULL; gint status = 0; GError *error = NULL; + + priv->base_uri = g_strdup ("file:///fakefile"); + cmd = g_strdup_printf ("gnome-open %s", uri); if (!g_spawn_command_line_sync (cmd, &str_stdout, &str_stderr, &status, &error)) { g_free (error); @@ -1063,8 +1069,10 @@ yelp_window_load (YelpWindow *window, co return; } } + break; default: + priv->base_uri = g_strdup ("file:///fakefile"); break; } } ++++++ yelp-2.19.90-freed-memory-crash.patch ++++++ diff -upr yelp-2.19.90-pre/src/yelp-transform.c yelp-2.19.90-post/src/yelp-transform.c --- yelp-2.19.90-pre/src/yelp-transform.c 2007-08-13 15:49:46.000000000 -0500 +++ yelp-2.19.90-post/src/yelp-transform.c 2007-08-22 16:17:11.000000000 -0500 @@ -342,6 +342,7 @@ xslt_yelp_document (xsltTransformContext { YelpTransform *transform; xmlChar *page_id = NULL; + gchar *temp; xmlChar *page_buf; gint buf_size; xsltStylesheetPtr style = NULL; @@ -363,7 +364,9 @@ xslt_yelp_document (xsltTransformContext page_id = xsltEvalAttrValueTemplate (ctxt, inst, (const xmlChar *) "href", NULL); - if (page_id == NULL) { + if (page_id == NULL || *page_id == '\0') { + if (page_id) + xmlFree (page_id); xsltTransformError (ctxt, NULL, inst, _("No href attribute found on yelp:document")); /* FIXME: put a real error here */ @@ -401,10 +404,15 @@ xslt_yelp_document (xsltTransformContext ctxt->insert = old_insert; g_mutex_lock (transform->mutex); - g_hash_table_insert (transform->chunks, page_id, page_buf); - g_async_queue_push (transform->queue, g_strdup ((gchar *) page_id)); + + temp = g_strdup (page_id); + xmlFree (page_id); + + g_async_queue_push (transform->queue, g_strdup ((gchar *) temp)); + g_hash_table_insert (transform->chunks, temp, page_buf); transform->idle_funcs++; g_idle_add ((GSourceFunc) transform_chunk, transform); + g_mutex_unlock (transform->mutex); done: ++++++ yelp-2.19.90-no-mime-type-crash.patch ++++++ diff -upr yelp-2.19.90-pre/src/yelp-utils.c yelp-2.19.90-post/src/yelp-utils.c --- yelp-2.19.90-pre/src/yelp-utils.c 2007-08-13 15:49:46.000000000 -0500 +++ yelp-2.19.90-post/src/yelp-utils.c 2007-08-30 23:16:20.000000000 -0500 @@ -73,7 +73,8 @@ resolve_process_ghelp (char *uri, gchar else mime = gnome_vfs_get_mime_type (*result); - if (g_str_equal (mime, "text/xml") || + if (!mime || + g_str_equal (mime, "text/xml") || g_str_equal (mime, "application/docbook+xml") || g_str_equal (mime, "application/xml")) type = YELP_RRN_TYPE_DOC; ++++++ yelp-2.19.1.tar.bz2 -> yelp-2.19.90.tar.bz2 ++++++ ++++ 41168 lines of diff (skipped) ++++++ yelp-desktop.patch ++++++ --- /var/tmp/diff_new_pack.H11524/_old 2007-09-01 13:24:43.000000000 +0200 +++ /var/tmp/diff_new_pack.H11524/_new 2007-09-01 13:24:43.000000000 +0200 @@ -1,16 +1,13 @@ Index: yelp.desktop.in.in -================================================================================ ---- yelp.desktop.in.in +=================================================================== +--- yelp.desktop.in.in.orig +++ yelp.desktop.in.in -@@ -1,9 +1,9 @@ +@@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 _Name=Help -_Comment=Get help with GNOME +_GenericName=Get help with GNOME Exec=yelp --Icon=gnome-help.png -+Icon=gnome-help + Icon=gnome-help StartupNotify=true - Terminal=false - Type=Application ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network
by root＠Hilbert.suse.de 01 Sep '07

01 Sep '07

Hello community, here is the log from the commit of package yast2-network checked in at Sat Sep 1 13:24:37 CEST 2007. -------- --- yast2-network/yast2-network.changes 2007-08-31 15:34:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2007-09-01 09:02:42.000000000 +0200 @@ -1,0 +2,11 @@ +Sat Sep 1 09:01:47 CEST 2007 - mzugec(a)suse.cz + +- read NISDomain instead of NisDomain from install.inf + +------------------------------------------------------------------- +Fri Aug 31 16:04:05 CEST 2007 - locilka(a)suse.cz + +- Using --proxy-user and --proxy in /root/.curlrc (#305163). +- Changing priorities in syntax for /root/.curlrc parser (#305163). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.r10049/_old 2007-09-01 13:24:30.000000000 +0200 +++ /var/tmp/diff_new_pack.r10049/_new 2007-09-01 13:24:30.000000000 +0200 @@ -12,7 +12,7 @@ Name: yast2-network Version: 2.15.71 -Release: 1 +Release: 2 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,7 +44,7 @@ Summary: YaST2 - Network Configuration %package devel-doc Version: 2.15.71 -Release: 1 +Release: 2 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -141,6 +141,11 @@ %exclude %{prefix}/share/doc/packages/yast2-network/README %changelog +* Sat Sep 01 2007 - mzugec(a)suse.cz +- read NISDomain instead of NisDomain from install.inf +* Fri Aug 31 2007 - locilka(a)suse.cz +- Using --proxy-user and --proxy in /root/.curlrc (#305163). +- Changing priorities in syntax for /root/.curlrc parser (#305163). * Fri Aug 31 2007 - mzugec(a)suse.cz - autoyast support for udev rules and backport compatibility with old-style network devices names (#303916) ++++++ yast2-network-2.15.71.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/agents/root_curlrc.scr new/yast2-network-2.15.71/agents/root_curlrc.scr --- old/yast2-network-2.15.71/agents/root_curlrc.scr 2007-08-10 17:24:03.000000000 +0200 +++ new/yast2-network-2.15.71/agents/root_curlrc.scr 2007-08-31 16:32:38.000000000 +0200 @@ -15,7 +15,7 @@ * Write(.root.curlrc.proxy_user, "newuser") * (true) * - * $Id: root_curlrc.scr 12980 2003-12-06 20:51:23Z msvec $ + * $Id: root_curlrc.scr 40651 2007-08-31 14:06:38Z locilka $ */ .root.curlrc @@ -25,12 +25,12 @@ "options" : [ "ignore_case", "global_values", "flat" ], "comments" : [ "^#.*", "^[ \t]*$", ], "params" : [ + $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]* [ \t]*\"(.*)\"[ \t]*$", "%s \"%s\"" ] ], $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]*=[ \t]*\"(.*)\"[ \t]*$", "%s = \"%s\"" ] ], $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]*:[ \t]*\"(.*)\"[ \t]*$", "%s : \"%s\"" ] ], - $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]* [ \t]*\"(.*)\"[ \t]*$", "%s \"%s\"" ] ], + $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]* [ \t]*(.*)[ \t]*$", "%s %s" ] ], $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]*=[ \t]*(.*)[ \t]*$", "%s = %s" ] ], $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]*:[ \t]*(.*)[ \t]*$", "%s : %s" ] ], - $[ "match" : [ "^[ \t]*([a-zA-Z_-]+)[ \t]* [ \t]*(.*)[ \t]*$", "%s %s" ] ], ] ] ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/configure new/yast2-network-2.15.71/configure --- old/yast2-network-2.15.71/configure 2007-08-31 15:27:10.000000000 +0200 +++ new/yast2-network-2.15.71/configure 2007-09-01 08:59:45.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-network 2.15.70. +# Generated by GNU Autoconf 2.61 for yast2-network 2.15.71. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-network' PACKAGE_TARNAME='yast2-network' -PACKAGE_VERSION='2.15.70' -PACKAGE_STRING='yast2-network 2.15.70' +PACKAGE_VERSION='2.15.71' +PACKAGE_STRING='yast2-network 2.15.71' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,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-network 2.15.70 to adapt to many kinds of systems. +\`configure' configures yast2-network 2.15.71 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-network 2.15.70:";; + short | recursive ) echo "Configuration of yast2-network 2.15.71:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-network configure 2.15.70 +yast2-network configure 2.15.71 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,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-network $as_me 2.15.70, which was +It was created by yast2-network $as_me 2.15.71, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-network' - VERSION='2.15.70' + VERSION='2.15.71' cat >>confdefs.h <<_ACEOF @@ -2408,7 +2408,7 @@ -VERSION="2.15.70" +VERSION="2.15.71" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3303,7 +3303,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-network $as_me 2.15.70, which was +This file was extended by yast2-network $as_me 2.15.71, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3346,7 +3346,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-network config.status 2.15.70 +yast2-network config.status 2.15.71 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/configure.in new/yast2-network-2.15.71/configure.in --- old/yast2-network-2.15.71/configure.in 2007-08-31 15:27:05.000000000 +0200 +++ new/yast2-network-2.15.71/configure.in 2007-09-01 08:59:39.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-network dnl -dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.15.70, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.15.71, http://bugs.opensuse.org/, yast2-network) 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.15.70" +VERSION="2.15.71" RPMNAME="yast2-network" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/Makefile.am new/yast2-network-2.15.71/Makefile.am --- old/yast2-network-2.15.71/Makefile.am 2007-08-31 15:27:05.000000000 +0200 +++ new/yast2-network-2.15.71/Makefile.am 2007-09-01 08:59:39.000000000 +0200 @@ -30,7 +30,7 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/Makefile.in new/yast2-network-2.15.71/Makefile.in --- old/yast2-network-2.15.71/Makefile.in 2007-08-31 15:27:14.000000000 +0200 +++ new/yast2-network-2.15.71/Makefile.in 2007-09-01 08:59:47.000000000 +0200 @@ -86,8 +86,8 @@ { test ! -d $(distdir) \ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_ARCHIVES = $(distdir).tar.bz2 distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ @@ -222,7 +222,7 @@ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal @@ -517,7 +517,6 @@ $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/src/clients/save_network.ycp new/yast2-network-2.15.71/src/clients/save_network.ycp --- old/yast2-network-2.15.71/src/clients/save_network.ycp 2007-08-31 15:00:04.000000000 +0200 +++ new/yast2-network-2.15.71/src/clients/save_network.ycp 2007-08-31 16:33:06.000000000 +0200 @@ -79,7 +79,7 @@ ReadInstallInfItem(install_inf, "gateway", "Gateway"); ReadInstallInfItem(install_inf, "nameserver", "Nameserver"); ReadInstallInfItem(install_inf, "domain", "Domain"); - ReadInstallInfItem(install_inf, "nisdomain", "NisDomain"); + ReadInstallInfItem(install_inf, "nisdomain", "NISDomain"); ReadInstallInfItem(install_inf, "hostname", "Hostname"); ReadInstallInfItem(install_inf, "module", "Alias"); // ReadInstallInfItem(install_inf, "options", "Options"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-network-2.15.71/src/modules/Proxy.ycp new/yast2-network-2.15.71/src/modules/Proxy.ycp --- old/yast2-network-2.15.71/src/modules/Proxy.ycp 2007-08-10 17:24:04.000000000 +0200 +++ new/yast2-network-2.15.71/src/modules/Proxy.ycp 2007-08-31 16:32:39.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Proxy data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Proxy.ycp 38086 2007-05-22 12:45:35Z kmachalkova $ + * $Id: Proxy.ycp 40651 2007-08-31 14:06:38Z locilka $ * * Configures FTP and HTTP proxies via sysconfig & SuSEconfig * and /root/.curlrc (for YOU) @@ -71,7 +71,7 @@ /* Read /root/.curlrc */ if(SCR::Read(.target.size, "/root/.curlrc") > 0) - user = (string) SCR::Read(.root.curlrc.proxy-user); + user = (string) SCR::Read (add (.root.curlrc, "--proxy-user")); if(user == nil) user = ""; @@ -110,7 +110,9 @@ ]; string caption = _("Saving Proxy Configuration"); - integer sl = 500; //sleep for longer time, so that progress does not disappear right afterwards + // sleep for longer time, so that progress does not disappear right afterwards + // but only when Progress is visible + integer sl = (Progress::status() == true ? 500 : 0); Progress::New(caption, " ", size(steps), steps, [], ""); @@ -124,14 +126,40 @@ SCR::Write(.sysconfig.proxy.NO_PROXY, no); SCR::Write(.sysconfig.proxy, nil); - /* Update /root/.curlrc */ - string proxyuser = nil; - if(user != "") { - proxyuser = user; - if(pass != "") proxyuser = user + ":" + pass; + // proxy is used, write /root/.curlrc + // bugzilla #305163 + if (enabled) { + /* Update /root/.curlrc */ + string proxyuser = nil; + if (user != "") { + proxyuser = user; + if (pass != "") proxyuser = user + ":" + pass; + } + + // nil or real value + SCR::Write (add (.root.curlrc, "--proxy-user"), proxyuser); + + // not 'nil', not empty + // bugzilla #305163 + if (http != nil && size (http) > 0) { + SCR::Write (add (.root.curlrc, "--proxy"), http); + } else { + SCR::Write (add (.root.curlrc, "--proxy"), nil); + } + + // only written value can have a comment + if (proxyuser != nil) { + SCR::Write (add (add (.root.curlrc, "--proxy-user"), "comment"), ChangedComment("proxy")); + // only when set, can have a comment + } else if (http != nil && size (http) > 0) { + SCR::Write (add (add (.root.curlrc, "--proxy"), "comment"), ChangedComment("proxy")); + } + // proxy is not used, remove proxy-related settings + } else { + SCR::Write (add (.root.curlrc, "--proxy-user"), nil); + SCR::Write (add (.root.curlrc, "--proxy"), nil); } - SCR::Write(.root.curlrc.proxy-user, proxyuser); - SCR::Write(.root.curlrc.proxy-user.comment, ChangedComment("proxy")); + SCR::Write(.root.curlrc, nil); sleep(sl); Progress::NextStage(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-control-center-gnome
by root＠Hilbert.suse.de 01 Sep '07

01 Sep '07

Hello community, here is the log from the commit of package yast2-control-center-gnome checked in at Sat Sep 1 13:24:34 CEST 2007. -------- --- yast2-control-center-gnome/yast2-control-center-gnome.changes 2007-05-23 01:44:20.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-control-center-gnome/yast2-control-center-gnome.changes 2007-08-25 01:41:25.089303000 +0200 @@ -1,0 +2,7 @@ +Sat Aug 25 01:17:16 CEST 2007 - sreeves(a)suse.de + +- Fix for 247684 - remove empty icon hierarchy + Fix for 8097 - use new yast window icon + Fix for 297243 - change app armor icon name + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-control-center-gnome.spec ++++++ --- /var/tmp/diff_new_pack.ae9896/_old 2007-09-01 13:24:29.000000000 +0200 +++ /var/tmp/diff_new_pack.ae9896/_new 2007-09-01 13:24:29.000000000 +0200 @@ -12,12 +12,12 @@ Name: yast2-control-center-gnome BuildRequires: gnome-main-menu-devel libgnome-devel libgnomeui-devel pkgconfig qt3-devel update-desktop-files yast2-devtools -License: GNU General Public License (GPL) -Group: System/Management +License: GPL v2 or later +Group: System/YaST Autoreqprov: on Version: 2.13.2 -Release: 25 -Summary: GNOME control center +Release: 73 +Summary: YaST2 - Control Center (GNOME version) Source: %{name}-%{version}.tar.gz prefix: /usr URL: http://en.opensuse.org/YaST2-GTK @@ -75,19 +75,12 @@ %{prefix}/lib/YaST2/bin/y2controlcenter-gnome %{_datadir}/desktop-directories/yast-gnome*.directory %doc %{_datadir}/doc/packages/yast2-control-center-gnome -# hacks to move elsewhere ... -%dir %{_datadir}/YaST2 -%dir %{_datadir}/YaST2/theme -%dir %{_datadir}/YaST2/theme/NLD -%dir %{_datadir}/YaST2/theme/NLD/icons -%dir %{_datadir}/YaST2/theme/SuSELinux -%dir %{_datadir}/YaST2/theme/SuSELinux/icons -%{_datadir}/YaST2/theme/NLD/icons/index.theme -%{_datadir}/YaST2/theme/NLD/hicolor -%{_datadir}/YaST2/theme/SuSELinux/icons/index.theme -%{_datadir}/YaST2/theme/SuSELinux/hicolor %changelog +* Sat Aug 25 2007 - sreeves(a)suse.de +- Fix for 247684 - remove empty icon hierarchy + Fix for 8097 - use new yast window icon + Fix for 297243 - change app armor icon name * Wed May 23 2007 - sreeves(a)suse.de - Remove existing X-SuSE-translate from .directory files so suse_update_desktop_file wont error out ++++++ yast2-control-center-gnome-2.13.2.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/configure new/yast2-control-center-gnome-2.13.2/configure --- old/yast2-control-center-gnome-2.13.2/configure 2007-05-23 00:46:03.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/configure 2007-08-24 23:21:22.000000000 +0200 @@ -466,7 +466,7 @@ # include <unistd.h> #endif" -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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YDOXYGEN CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG CONTROL_CFLAGS CONTROL_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE LIBOBJS LTLIBOBJS' +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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT Y2DEVTOOLS_PREFIX CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YDOXYGEN CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS ac_pt_PKG_CONFIG CONTROL_CFLAGS CONTROL_LIBS GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -2389,6 +2389,8 @@ { (exit 1); exit 1; }; } fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` + devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -4879,7 +4881,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4882 "configure"' > conftest.$ac_ext + echo '#line 4884 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5780,7 +5782,7 @@ # Provide some information about the compiler. -echo "$as_me:5783:" \ +echo "$as_me:5785:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 @@ -6843,11 +6845,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6846: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6848: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6850: \$? = $ac_status" >&5 + echo "$as_me:6852: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7111,11 +7113,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7114: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7116: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7118: \$? = $ac_status" >&5 + echo "$as_me:7120: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7215,11 +7217,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7218: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7220: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7222: \$? = $ac_status" >&5 + echo "$as_me:7224: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9560,7 +9562,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9563 "configure" +#line 9565 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -9660,7 +9662,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 9663 "configure" +#line 9665 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12000,11 +12002,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12003: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12005: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12007: \$? = $ac_status" >&5 + echo "$as_me:12009: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12104,11 +12106,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12107: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12109: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12111: \$? = $ac_status" >&5 + echo "$as_me:12113: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13674,11 +13676,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13677: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13679: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13681: \$? = $ac_status" >&5 + echo "$as_me:13683: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13778,11 +13780,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13781: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13783: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13785: \$? = $ac_status" >&5 + echo "$as_me:13787: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15981,11 +15983,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15984: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15986: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15988: \$? = $ac_status" >&5 + echo "$as_me:15990: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16249,11 +16251,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16252: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16254: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16256: \$? = $ac_status" >&5 + echo "$as_me:16258: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16353,11 +16355,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16356: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16358: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16360: \$? = $ac_status" >&5 + echo "$as_me:16362: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20923,6 +20925,7 @@ s,@LN_S@,$LN_S,;t t s,@PKG_CONFIG_PATH@,$PKG_CONFIG_PATH,;t t s,@XGETTEXT@,$XGETTEXT,;t t +s,@Y2DEVTOOLS_PREFIX@,$Y2DEVTOOLS_PREFIX,;t t s,@CREATE_PKGCONFIG_TRUE@,$CREATE_PKGCONFIG_TRUE,;t t s,@CREATE_PKGCONFIG_FALSE@,$CREATE_PKGCONFIG_FALSE,;t t s,@CREATE_PKGCONFIG_NOARCH_TRUE@,$CREATE_PKGCONFIG_NOARCH_TRUE,;t t diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/configure.in new/yast2-control-center-gnome-2.13.2/configure.in --- old/yast2-control-center-gnome-2.13.2/configure.in 2007-05-23 00:45:37.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/configure.in 2007-08-24 23:21:10.000000000 +0200 @@ -1,6 +1,6 @@ dnl configure.in for yast2-control-center-gnome dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.13.29 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-control-center-gnome, 2.13.2, http://bugs.opensuse.org/, yast2-control-center-gnome) @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/index.theme new/yast2-control-center-gnome-2.13.2/etc/index.theme --- old/yast2-control-center-gnome-2.13.2/etc/index.theme 2007-05-23 00:34:10.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/index.theme 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -[Icon Theme] -Name=SLED -Comment=SLED YaST theme -Directories=32x32/apps,48x48/apps,scaleable/apps - -[scaleable/apps] -Size=48 -Context=Actions -Type=Scalable -MinSize=25 -MaxSize=256 - -[48x48/apps] -Size=48 -Context=Applications -Type=Fixed - -[32x32/apps] -Size=24 -Context=Applications -Type=Fixed diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/Makefile.am new/yast2-control-center-gnome-2.13.2/etc/Makefile.am --- old/yast2-control-center-gnome-2.13.2/etc/Makefile.am 2007-05-23 00:34:10.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/Makefile.am 2007-08-24 23:19:20.000000000 +0200 @@ -9,33 +9,16 @@ directorydir = $(datadir)/desktop-directories directory_DATA = $(wildcard yast-gnome-*.directory) -NLD_YAST_THEME_DIR = /usr/share/YaST2/theme/NLD -SL_YAST_THEME_DIR = /usr/share/YaST2/theme/SuSELinux - $(schemas_DATA): $(schemas_DATA).in sed -e "s|\@DATADIR\@|$(datadir)|g" $< > $@ -# ----------------------------------------------------- -# clobber the NLD yast2 theme to make it an icon theme -# this hack should be in the themes themselves. -# ----------------------------------------------------- -indexdir = $(NLD_YAST_THEME_DIR)/icons -index_DATA = index.theme -index2dir = $(SL_YAST_THEME_DIR)/icons -index2_DATA = index.theme -# we also require a symlink to make it look like a theme -link-hicolor: - mkdir -p $(DESTDIR)$(NLD_YAST_THEME_DIR) ; ln -sf icons $(DESTDIR)$(NLD_YAST_THEME_DIR)/hicolor - mkdir -p $(DESTDIR)$(SL_YAST_THEME_DIR) ; ln -sf icons $(DESTDIR)$(SL_YAST_THEME_DIR)/hicolor -# ----------------------------------------------------- - -install-data-local: link-hicolor +install-data-local: if test -z "$(DESTDIR)" ; then \ for p in $(schemas_DATA) ; do \ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ done \ fi -EXTRA_DIST = $(schemas_DATA).in $(menu_DATA) $(directory_DATA) $(index_DATA) +EXTRA_DIST = $(schemas_DATA).in $(menu_DATA) $(directory_DATA) CLEANFILES = $(schemas_DATA) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/Makefile.in new/yast2-control-center-gnome-2.13.2/etc/Makefile.in --- old/yast2-control-center-gnome-2.13.2/etc/Makefile.in 2007-05-23 00:46:14.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/Makefile.in 2007-08-24 23:21:25.000000000 +0200 @@ -54,16 +54,12 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(directorydir)" "$(DESTDIR)$(indexdir)" \ - "$(DESTDIR)$(index2dir)" "$(DESTDIR)$(menudir)" \ +am__installdirs = "$(DESTDIR)$(directorydir)" "$(DESTDIR)$(menudir)" \ "$(DESTDIR)$(schemasdir)" directoryDATA_INSTALL = $(INSTALL_DATA) -indexDATA_INSTALL = $(INSTALL_DATA) -index2DATA_INSTALL = $(INSTALL_DATA) menuDATA_INSTALL = $(INSTALL_DATA) schemasDATA_INSTALL = $(INSTALL_DATA) -DATA = $(directory_DATA) $(index_DATA) $(index2_DATA) $(menu_DATA) \ - $(schemas_DATA) +DATA = $(directory_DATA) $(menu_DATA) $(schemas_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AGENT_LIBADD = @AGENT_LIBADD@ @@ -146,6 +142,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ @@ -226,18 +223,7 @@ # built from yast2 groups/ desktop files directorydir = $(datadir)/desktop-directories directory_DATA = $(wildcard yast-gnome-*.directory) -NLD_YAST_THEME_DIR = /usr/share/YaST2/theme/NLD -SL_YAST_THEME_DIR = /usr/share/YaST2/theme/SuSELinux - -# ----------------------------------------------------- -# clobber the NLD yast2 theme to make it an icon theme -# this hack should be in the themes themselves. -# ----------------------------------------------------- -indexdir = $(NLD_YAST_THEME_DIR)/icons -index_DATA = index.theme -index2dir = $(SL_YAST_THEME_DIR)/icons -index2_DATA = index.theme -EXTRA_DIST = $(schemas_DATA).in $(menu_DATA) $(directory_DATA) $(index_DATA) +EXTRA_DIST = $(schemas_DATA).in $(menu_DATA) $(directory_DATA) CLEANFILES = $(schemas_DATA) all: all-am @@ -298,40 +284,6 @@ echo " rm -f '$(DESTDIR)$(directorydir)/$$f'"; \ rm -f "$(DESTDIR)$(directorydir)/$$f"; \ done -install-indexDATA: $(index_DATA) - @$(NORMAL_INSTALL) - test -z "$(indexdir)" || $(mkdir_p) "$(DESTDIR)$(indexdir)" - @list='$(index_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(indexDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(indexdir)/$$f'"; \ - $(indexDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(indexdir)/$$f"; \ - done - -uninstall-indexDATA: - @$(NORMAL_UNINSTALL) - @list='$(index_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(indexdir)/$$f'"; \ - rm -f "$(DESTDIR)$(indexdir)/$$f"; \ - done -install-index2DATA: $(index2_DATA) - @$(NORMAL_INSTALL) - test -z "$(index2dir)" || $(mkdir_p) "$(DESTDIR)$(index2dir)" - @list='$(index2_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(index2DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(index2dir)/$$f'"; \ - $(index2DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(index2dir)/$$f"; \ - done - -uninstall-index2DATA: - @$(NORMAL_UNINSTALL) - @list='$(index2_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(index2dir)/$$f'"; \ - rm -f "$(DESTDIR)$(index2dir)/$$f"; \ - done install-menuDATA: $(menu_DATA) @$(NORMAL_INSTALL) test -z "$(menudir)" || $(mkdir_p) "$(DESTDIR)$(menudir)" @@ -404,7 +356,7 @@ check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(directorydir)" "$(DESTDIR)$(indexdir)" "$(DESTDIR)$(index2dir)" "$(DESTDIR)$(menudir)" "$(DESTDIR)$(schemasdir)"; do \ + for dir in "$(DESTDIR)$(directorydir)" "$(DESTDIR)$(menudir)" "$(DESTDIR)$(schemasdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -451,8 +403,7 @@ info-am: install-data-am: install-data-local install-directoryDATA \ - install-index2DATA install-indexDATA install-menuDATA \ - install-schemasDATA + install-menuDATA install-schemasDATA install-exec-am: @@ -478,34 +429,26 @@ ps-am: -uninstall-am: uninstall-directoryDATA uninstall-index2DATA \ - uninstall-indexDATA uninstall-info-am uninstall-menuDATA \ - uninstall-schemasDATA +uninstall-am: uninstall-directoryDATA uninstall-info-am \ + uninstall-menuDATA uninstall-schemasDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-data-local \ install-directoryDATA install-exec install-exec-am \ - install-index2DATA install-indexDATA install-info \ - install-info-am install-man install-menuDATA \ + install-info install-info-am install-man install-menuDATA \ install-schemasDATA install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am uninstall uninstall-am uninstall-directoryDATA \ - uninstall-index2DATA uninstall-indexDATA uninstall-info-am \ - uninstall-menuDATA uninstall-schemasDATA + uninstall-info-am uninstall-menuDATA uninstall-schemasDATA $(schemas_DATA): $(schemas_DATA).in sed -e "s|\@DATADIR\@|$(datadir)|g" $< > $@ -# we also require a symlink to make it look like a theme -link-hicolor: - mkdir -p $(DESTDIR)$(NLD_YAST_THEME_DIR) ; ln -sf icons $(DESTDIR)$(NLD_YAST_THEME_DIR)/hicolor - mkdir -p $(DESTDIR)$(SL_YAST_THEME_DIR) ; ln -sf icons $(DESTDIR)$(SL_YAST_THEME_DIR)/hicolor -# ----------------------------------------------------- -install-data-local: link-hicolor +install-data-local: if test -z "$(DESTDIR)" ; then \ for p in $(schemas_DATA) ; do \ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory --- old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory 2007-05-23 00:58:37.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory 2007-08-24 22:09:00.000000000 +0200 @@ -1,6 +1,6 @@ [Desktop Entry] Type=Directory -Icon=apparmor/app_armor +Icon=apparmor_app_armor X-SuSE-DocTeamID=ycc_apparmor diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/Makefile.am new/yast2-control-center-gnome-2.13.2/Makefile.am --- old/yast2-control-center-gnome-2.13.2/Makefile.am 2007-05-23 00:45:38.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/Makefile.am 2007-08-24 23:21:11.000000000 +0200 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,7 +19,7 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -67,7 +66,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/Makefile.in new/yast2-control-center-gnome-2.13.2/Makefile.in --- old/yast2-control-center-gnome-2.13.2/Makefile.in 2007-05-23 00:46:15.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/Makefile.in 2007-08-24 23:21:26.000000000 +0200 @@ -175,6 +175,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = $(shell cat $(srcdir)/VERSION) XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ @@ -247,15 +248,14 @@ ystartupdir = @ystartupdir@ #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english @@ -266,7 +266,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec @@ -784,7 +784,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in +@CREATE_PKGCONFIG_TRUE@$(RPMNAME).pc: $(RPMNAME).pc.in config.status @CREATE_PKGCONFIG_TRUE@ ./config.status --file=$@:$< dist-hook: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/src/control-center.c new/yast2-control-center-gnome-2.13.2/src/control-center.c --- old/yast2-control-center-gnome-2.13.2/src/control-center.c 2007-05-23 00:34:10.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/src/control-center.c 2007-08-31 23:24:34.000000000 +0200 @@ -161,7 +161,7 @@ g_signal_connect (bonobo_app, "new-instance", G_CALLBACK (apss_new_instance_cb), app_data); textdomain (YAST_CC_PACKAGE); create_main_window (app_data, widget_theming_name, _("YaST2 Control Center"), - "gnome-control-center", 975, 600, hidden); + "yast", 975, 600, hidden); textdomain (GNOME_MAIN_MENU_PACKAGE); if (bonobo_app) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/src/Makefile.in new/yast2-control-center-gnome-2.13.2/src/Makefile.in --- old/yast2-control-center-gnome-2.13.2/src/Makefile.in 2007-05-23 00:46:15.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/src/Makefile.in 2007-08-24 23:21:26.000000000 +0200 @@ -151,6 +151,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YDOXYGEN = @YDOXYGEN@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-proto-devel
by root＠Hilbert.suse.de 01 Sep '07

01 Sep '07

Hello community, here is the log from the commit of package xorg-x11-proto-devel checked in at Sat Sep 1 13:24:20 CEST 2007. -------- --- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2007-07-13 16:50:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2007-08-31 22:42:52.289897000 +0200 @@ -1,0 +2,7 @@ +Fri Aug 31 22:43:38 CEST 2007 - sndirsch(a)suse.de + +- inputproto 1.4.2.1: + * The inputproto-1.4.2 tarball had a busted configure script, + here are the new ones. + +------------------------------------------------------------------- Old: ---- inputproto-1.4.2.tar.bz2 New: ---- inputproto-1.4.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-proto-devel.spec ++++++ --- /var/tmp/diff_new_pack.l25580/_old 2007-09-01 13:15:34.000000000 +0200 +++ /var/tmp/diff_new_pack.l25580/_new 2007-09-01 13:15:34.000000000 +0200 @@ -13,7 +13,7 @@ Name: xorg-x11-proto-devel Url: http://xorg.freedesktop.org/ Version: 7.2 -Release: 50 +Release: 61 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Development/Libraries/X11 @@ -27,7 +27,7 @@ Source6: fontcacheproto-X11R7.0-0.1.2.tar.bz2 Source7: fontsproto-X11R7.0-2.0.2.tar.bz2 Source8: glproto-1.4.8.tar.bz2 -Source9: inputproto-1.4.2.tar.bz2 +Source9: inputproto-1.4.2.1.tar.bz2 Source10: kbproto-1.0.3.tar.bz2 Source11: printproto-X11R7.0-1.0.3.tar.bz2 Source12: randrproto-1.2.1.tar.bz2 @@ -135,6 +135,10 @@ /usr/share/xcb/ %changelog +* Fri Aug 31 2007 - sndirsch(a)suse.de +- inputproto 1.4.2.1: + * The inputproto-1.4.2 tarball had a busted configure script, + here are the new ones. * Fri Jul 13 2007 - sndirsch(a)suse.de - inputproto-1.4.diff (fixes build for some input drivers): * readded missing defines TS_Raw/TS_Scaled ++++++ inputproto-1.4.2.tar.bz2 -> inputproto-1.4.2.1.tar.bz2 ++++++ ++++ 3525 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/inputproto-1.4.2/configure.ac new/inputproto-1.4.2.1/configure.ac --- old/inputproto-1.4.2/configure.ac 2007-04-26 01:58:32.000000000 +0200 +++ new/inputproto-1.4.2.1/configure.ac 2007-08-31 10:27:51.000000000 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([InputProto], [1.4.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] +AC_INIT([InputProto], [1.4.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xterm
by root＠Hilbert.suse.de 01 Sep '07

01 Sep '07

Hello community, here is the log from the commit of package xterm checked in at Sat Sep 1 13:24:20 CEST 2007. -------- --- xterm/xterm.changes 2007-08-27 21:36:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/xterm/xterm.changes 2007-08-31 23:00:36.000000000 +0200 @@ -1,0 +2,9 @@ +Fri Aug 31 22:35:40 CEST 2007 - mfabian(a)suse.de + +- Bugzilla #306943: add xorg-x11 to BuildRequires because of + ‘bdftopcf’. Let the build fail if ‘bdftopcf’ is missing. +- change app-defaults to use these fonts for wide characters + when the 10x20 font is used. +- bzip2 source tarball. + +------------------------------------------------------------------- Old: ---- xterm.tar.gz New: ---- xterm.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.W26262/_old 2007-09-01 13:15:43.000000000 +0200 +++ /var/tmp/diff_new_pack.W26262/_new 2007-09-01 13:15:43.000000000 +0200 @@ -11,7 +11,7 @@ # norootforbuild Name: xterm -BuildRequires: freetype2-devel update-desktop-files utempter xorg-x11-devel +BuildRequires: freetype2-devel update-desktop-files utempter xorg-x11 xorg-x11-devel BuildRequires: ncurses-devel URL: http://invisible-island.net/xterm/ License: X11/MIT @@ -19,9 +19,9 @@ Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm Autoreqprov: on Version: 229 -Release: 6 +Release: 8 Summary: The basic X terminal program -Source: %name.tar.gz +Source: %name.tar.bz2 Source1: luitx Source3: Backarrow2Delete Source4: Backarrow2BackSpace @@ -178,6 +178,7 @@ %configure make popd +if [ ! -x /usr/bin/bdftopcf ] ; then exit 1; fi for i in *.bdf do /usr/bin/bdftopcf $i | gzip -9 > `basename $i .bdf`.pcf.gz @@ -264,6 +265,12 @@ /usr/share/pixmaps/* %changelog +* Fri Aug 31 2007 - mfabian(a)suse.de +- Bugzilla #306943: add xorg-x11 to BuildRequires because of + ‘bdftopcf’. Let the build fail if ‘bdftopcf’ is missing. +- change app-defaults to use these fonts for wide characters + when the 10x20 font is used. +- bzip2 source tarball. * Mon Aug 27 2007 - sndirsch(a)suse.de - added '*metaSendsEscape: true' to app defaults (Bug #300331) * Mon Aug 13 2007 - sndirsch(a)suse.de ++++++ p_xterm-settings.diff ++++++ --- /var/tmp/diff_new_pack.W26262/_old 2007-09-01 13:15:44.000000000 +0200 +++ /var/tmp/diff_new_pack.W26262/_new 2007-09-01 13:15:44.000000000 +0200 @@ -118,8 +118,8 @@ *fontMenu*font6*Label: Huge -*VT100.font6: 10x20 +!*VT100.font6: 10x20 -+*VT100.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 -+!*VT100.wideFont6: ++*VT100.font6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-100-iso10646-1 ++*VT100.wideFont6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-200-iso10646-1 *fontMenu*fontescape*Label: Escape Sequence *fontMenu*fontsel*Label: Selection !fontescape and fontsel overridden by application ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vm-install
by root＠Hilbert.suse.de 01 Sep '07

01 Sep '07

Hello community, here is the log from the commit of package vm-install checked in at Sat Sep 1 13:15:34 CEST 2007. -------- --- vm-install/vm-install.changes 2007-08-30 01:07:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/vm-install/vm-install.changes 2007-09-01 01:22:08.232630000 +0200 @@ -1,0 +2,15 @@ +Fri Aug 31 11:23:33 MDT 2007 - ccoffing(a)novell.com + +- #305747: Fix bootstrapping of paravirtual SLES 9 SP4 +- #306764: Better error message if NIC model is mistyped +- #296928: MAC was not set when creating VM from existing disk + +------------------------------------------------------------------- +Thu Aug 30 12:31:01 MDT 2007 - ccoffing(a)novell.com + +- #306469: Fix error paths to ensure disks are always unmounted +- #306383: Set TERM=linux, which works well for both xencons and pvfb +- Do not attempt to connect to VNC port if graphics=none +- Write out stdvga setting based on cirrus vs vesa + +------------------------------------------------------------------- @@ -13,0 +29,5 @@ +Fri Aug 17 09:13:51 MDT 2007 - ccoffing(a)novell.com + +- Update translations + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.M24849/_old 2007-09-01 13:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.M24849/_new 2007-09-01 13:15:23.000000000 +0200 @@ -19,7 +19,7 @@ Group: System/Emulators/PC Autoreqprov: yes Version: 0.2.1 -Release: 33 +Release: 34 Summary: Tool to Define a Virtual Machine and Install Its Operating System Source0: %{name}-0.2.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,12 +80,23 @@ %{_datadir}/applications/YaST2/vm-install.desktop %changelog +* Fri Aug 31 2007 - ccoffing(a)novell.com +- #305747: Fix bootstrapping of paravirtual SLES 9 SP4 +- #306764: Better error message if NIC model is mistyped +- #296928: MAC was not set when creating VM from existing disk +* Thu Aug 30 2007 - ccoffing(a)novell.com +- #306469: Fix error paths to ensure disks are always unmounted +- #306383: Set TERM=linux, which works well for both xencons and pvfb +- Do not attempt to connect to VNC port if graphics=none +- Write out stdvga setting based on cirrus vs vesa * Wed Aug 29 2007 - ccoffing(a)novell.com - Update translations * Tue Aug 21 2007 - ccoffing(a)novell.com - #278190: adjust max memory to always be >= initial memory - #296758: call update() before getting spinbox value - Fix some errors in libvirt-style XML file written out +* Fri Aug 17 2007 - ccoffing(a)novell.com +- Update translations * Thu Aug 16 2007 - ccoffing(a)novell.com - #300757: Option for Windows XP/2003 (x64) was not displayed - #296083: If vncviewer is not found, prompt user but don't fail ++++++ vm-install-0.2.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/ChangeLog new/vm-install-0.2.1/ChangeLog --- old/vm-install-0.2.1/ChangeLog 2007-08-30 00:49:41.000000000 +0200 +++ new/vm-install-0.2.1/ChangeLog 2007-08-31 23:11:20.000000000 +0200 @@ -1,5 +1,12 @@ 0.2.1-pre --------- +#305747: Fix bootstrapping of paravirtual SLES 9 SP4 +#296928: MAC was not set when creating VM from existing disk +#306764: Better error message if NIC model is mistyped +#306469: Fix error paths to ensure disks are always unmounted +#306383: Set TERM=linux, which works well for both xencons and pvfb +Do not attempt to connect to VNC if graphics=none +Write out stdvga setting based on cirrus vs vesa Updated translations Fix command-line backwards compatibility: default to sparse disks Support escaping on vm-install's command line, to support iSCSI LUNs diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/man/vm-install.8 new/vm-install-0.2.1/man/vm-install.8 --- old/vm-install-0.2.1/man/vm-install.8 2007-08-21 19:26:52.000000000 +0200 +++ new/vm-install-0.2.1/man/vm-install.8 2007-08-30 20:14:14.000000000 +0200 @@ -79,9 +79,8 @@ \fBvesa\fR (Standard VGA with VESA extensions; only for fully virtualized). .TP .B --graphics-viewer -Defines how the graphics are viewed. May be one of \fBsdl\fR, \fBtext\fR, -or \fBvnc\fR. Defaults to vnc if the VM has graphics support or text if -the VM does not have graphics support. +Defines how the graphics (if any) are viewed. May be \fBsdl\fR or \fBvnc\fR. +Defaults to vnc. .TP .B -m\fR \fIN\fR, \fB--memory\fR \fIN\fR Initial megabytes of RAM to allocate to the VM. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/src/vminstall/job.py new/vm-install-0.2.1/src/vminstall/job.py --- old/vm-install-0.2.1/src/vminstall/job.py 2007-08-16 23:45:44.000000000 +0200 +++ new/vm-install-0.2.1/src/vminstall/job.py 2007-08-31 21:41:06.000000000 +0200 @@ -152,7 +152,10 @@ if self._options.noautoconsole: log.info('Not starting a console due to --no-autoconsole') domid = console.get_domid_from_uuid(self._options.uuid) - self._vncport = console.get_vnc_port_from_domid(domid, timeout=10.0) + if self._options.graphics == 'none': + self._vncport = None + else: + self._vncport = console.get_vnc_port_from_domid(domid, timeout=10.0) log.debug('VNC port is %s' % self._vncport) if self._vncport is not None: self._update_job_file() @@ -165,18 +168,21 @@ log.info('Starting a console, and will wait for it to finish') child = None try_text = False - if self._options.graphics_viewer == 'sdl': - # xm automatically created a viewer, so just wait. - log.debug('Viewer is sdl') - elif self._options.graphics_viewer == 'vnc': - log.debug('Viewer is vnc') - try: - child = console.vnc_console(self.guest, detach=detached) - except NotImplementedError: - try_text = True - except RuntimeError, e: - self._ErrorCB(self, str(e)) - if try_text or self._options.graphics_viewer == 'none': + if self._options.graphics == 'none': + try_text = True + else: + if self._options.graphics_viewer == 'sdl': + # xm automatically created a viewer, so just wait. + log.debug('Viewer is sdl') + elif self._options.graphics_viewer == 'vnc': + log.debug('Viewer is vnc') + try: + child = console.vnc_console(self.guest, detach=detached) + except NotImplementedError: + try_text = True + except RuntimeError, e: + self._ErrorCB(self, str(e)) + if try_text: log.debug('Viewer is text') try: child = console.text_console(self.guest, detach=detached) @@ -203,10 +209,17 @@ self._GetSettingsCB = GetSettingsCB self._ConsoleCB = ConsoleCB self._ErrorCB = ErrorCB - self._ProgressCB = ProgressCB self._cancel = False - progress = util.filtered_progress(lambda f:self._ProgressCB(self, f)) + def _ProgressCB(self, f): + try: + ProgressCB(self, f) + except: + # Do not trust user's progress function to not raise. I can + # do nothing about such an exception, and in fact lower code + # relies on a no-throw guarantee. + pass + progress = util.filtered_progress(lambda f:_ProgressCB(self, f)) try: try: @@ -288,6 +301,10 @@ self._guest = FullVirtGuest(self._options) else: self._guest = ParaVirtGuest(self._options) + + for nic in self._options.nics: + nic.setup() + progress(1.0) def _state_prep_install(self, progress): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/src/vminstall/mount.py new/vm-install-0.2.1/src/vminstall/mount.py --- old/vm-install-0.2.1/src/vminstall/mount.py 2007-06-07 20:31:53.000000000 +0200 +++ new/vm-install-0.2.1/src/vminstall/mount.py 2007-08-30 22:00:08.000000000 +0200 @@ -47,15 +47,15 @@ args = ['/bin/umount', self.mountpoint] log.debug("Unmounting a disk: %s" % str(args)) run(args) - try: - os.rmdir(self.mountpoint) - except: - log.debug("Failed to rmdir mountpoint %s" % (self.mountpoint,)) + os.rmdir(self.mountpoint) self.mountpoint = None def __del__(self): if self.mountpoint: - self.unmount() + try: + self.unmount() + except: + pass class TemporaryNFSMount(TemporaryMount): def __init__(self, server, path): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/src/vminstall/nics.py new/vm-install-0.2.1/src/vminstall/nics.py --- old/vm-install-0.2.1/src/vminstall/nics.py 2007-05-29 21:59:26.000000000 +0200 +++ new/vm-install-0.2.1/src/vminstall/nics.py 2007-08-31 21:29:43.000000000 +0200 @@ -101,7 +101,8 @@ return 'para' return self._model def set_model(self, model): - assert(model is None or model in XenNic.models.keys()) + if model is not None and model not in XenNic.models.keys(): + raise ParamError(err=ParamError.E_INVALID, details='model') self._model = model model = property(get_model, set_model) @@ -125,3 +126,11 @@ else: s += self.mac return s + + def __repr__(self): + r = '' + if self.number is not None: + r += '%d:' % self.number + mac = self.mac or '' + r += '%s,%s,%s,%d' % (self.mac or '', self.bridge or '', self.model or '', self.full_virt) + return r diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/src/vminstall/options.py new/vm-install-0.2.1/src/vminstall/options.py --- old/vm-install-0.2.1/src/vminstall/options.py 2007-08-21 21:27:28.000000000 +0200 +++ new/vm-install-0.2.1/src/vminstall/options.py 2007-09-01 00:21:45.000000000 +0200 @@ -32,8 +32,8 @@ 'disks', # Disk class 'extra_args', # User's install or boot args 'full_virt', - 'graphics', - 'graphics_viewer', # 'sdl', 'vnc' + 'graphics', # 'cirrus', 'none', 'para', 'vesa' + 'graphics_viewer', # 'text', 'sdl', 'vnc' 'initrd', '_install_args', # install-time args calculated by OS 'install', @@ -442,7 +442,7 @@ defaults._runtime_args = vmdefaults.actions().getRuntimeArgs(defaults) if options._runtime_args: defaults._runtime_args += ' %s' % options._runtime_args - + # Now give the OS a chance to voice its opinion: vmdefaults.actions().preprocessOptions(defaults) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/src/vminstall/ParaVirtGuest.py new/vm-install-0.2.1/src/vminstall/ParaVirtGuest.py --- old/vm-install-0.2.1/src/vminstall/ParaVirtGuest.py 2007-07-07 00:30:31.000000000 +0200 +++ new/vm-install-0.2.1/src/vminstall/ParaVirtGuest.py 2007-08-30 21:44:04.000000000 +0200 @@ -136,8 +136,10 @@ mountpoint = mounted_disk.mount() except Exception, e: raise InstSrcError(InstSrcError.E_BAD, details=e.args[0]) - (kfn, ifn) = actions.getInstallImagesFromPath(mountpoint, progress) - mounted_disk.unmount() + try: + (kfn, ifn) = actions.getInstallImagesFromPath(mountpoint, progress) + finally: + mounted_disk.unmount() else: (_, kfn, ifn) = self._get_paravirt_images(vdev, partitions, copy=True, progress=progress) finally: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/src/vminstall/VMLinux.py new/vm-install-0.2.1/src/vminstall/VMLinux.py --- old/vm-install-0.2.1/src/vminstall/VMLinux.py 2007-05-24 17:10:23.000000000 +0200 +++ new/vm-install-0.2.1/src/vminstall/VMLinux.py 2007-09-01 00:33:10.000000000 +0200 @@ -54,11 +54,8 @@ return self.getRuntimeArgs(options) def getRuntimeArgs(self, options): - args = '' - if options.full_virt: - return args - # Only want to set TERM=xterm if PVFB is not supported - #args = 'TERM=xterm' - if options.graphics == 'none': - args += ' xencons=tty' - return args + args = [] + if not options.full_virt: + if options.graphics == 'none': + args.append('xencons=tty') + return ' '.join(args) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/src/vminstall/VMNetWare.py new/vm-install-0.2.1/src/vminstall/VMNetWare.py --- old/vm-install-0.2.1/src/vminstall/VMNetWare.py 2007-08-28 00:14:09.000000000 +0200 +++ new/vm-install-0.2.1/src/vminstall/VMNetWare.py 2007-08-30 21:53:37.000000000 +0200 @@ -32,7 +32,11 @@ Retrieves a Xen-enabled NetWare kernel from the base path, and copies it to a temporary file. Returns the (kernel, None) tuple of filenames.""" - kfn = util.copy_to_temp(open(self._kernel(path), 'r'), prefix='netware.', progress=progress) + kfd = open(self._kernel(path), 'r') + try: + kfn = util.copy_to_temp(kfd, prefix='netware.', progress=progress) + finally: + kfd.close() return (kfn, None) def getRuntimeImagesFromPath(self, root): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/src/vminstall/VMRedHat.py new/vm-install-0.2.1/src/vminstall/VMRedHat.py --- old/vm-install-0.2.1/src/vminstall/VMRedHat.py 2007-07-20 19:41:30.000000000 +0200 +++ new/vm-install-0.2.1/src/vminstall/VMRedHat.py 2007-08-30 21:31:01.000000000 +0200 @@ -34,31 +34,49 @@ """Retrieves a Xen-enabled RedHat kernel and initrd from the URL, and copies them to temporary files. Returns the (kernel, initrd) tuple of filenames.""" + kfd = ifd = None try: - if url.startswith('http://') or url.startswith('ftp://'): - kfd = grabber.urlopen(self._kernel(url)) - ifd = grabber.urlopen(self._initrd(url)) - elif url.startswith('nfs:'): - mnt = mount.TemporaryMount(url[4:]) - mountpoint = mnt.mount(mnt) - kfd = open(self._kernel(mountpoint), 'r') - ifd = open(self._initrd(mountpoint), 'r') - else: - raise InstSrcError(err=InstSrcError.E_UNSUPPORTED, details=url) - except IOError, e: - raise RuntimeError(msg.invalid_url + ': ' + str(e)) - kfn = util.copy_to_temp(kfd, prefix='vmlinuz.', progress=lambda f:progress(f*0.5)) - ifn = util.copy_to_temp(ifd, prefix='initrd.', progress=lambda f:progress(0.5+f*0.5)) + try: + if url.startswith('http://') or url.startswith('ftp://'): + kfd = grabber.urlopen(self._kernel(url)) + ifd = grabber.urlopen(self._initrd(url)) + elif url.startswith('nfs:'): + mnt = mount.TemporaryMount(url[4:]) + mountpoint = mnt.mount(mnt) + kfd = open(self._kernel(mountpoint), 'r') + ifd = open(self._initrd(mountpoint), 'r') + else: + raise InstSrcError(err=InstSrcError.E_UNSUPPORTED, details=url) + kfn = util.copy_to_temp(kfd, prefix='vmlinuz.', progress=lambda f:progress(f*0.5)) + try: + ifn = util.copy_to_temp(ifd, prefix='initrd.', progress=lambda f:progress(0.5+f*0.5)) + except: + os.unlink(kfn) + raise + except IOError, e: + raise RuntimeError(msg.invalid_url + ': ' + str(e)) + finally: + if kfd: kfd.close() + if ifd: ifd.close() return (kfn, ifn) def getInstallImagesFromPath(self, path, progress=lambda f:None): """Retrieves a Xen-enabled RedHat kernel and initrd from the base path, and copies them to temporary files. Returns the (kernel, initrd) tuple of filenames.""" - kfd = open(self._kernel(path), 'r') - ifd = open(self._initrd(path), 'r') - kfn = util.copy_to_temp(kfd, prefix='vmlinuz.', progress=lambda f:progress(f*0.5)) - ifn = util.copy_to_temp(ifd, prefix='initrd.', progress=lambda f:progress(0.5+f*0.5)) + kfd = ifd = None + try: + kfd = open(self._kernel(path), 'r') + ifd = open(self._initrd(path), 'r') + kfn = util.copy_to_temp(kfd, prefix='vmlinuz.', progress=lambda f:progress(f*0.5)) + try: + ifn = util.copy_to_temp(ifd, prefix='initrd.', progress=lambda f:progress(0.5+f*0.5)) + except: + os.unlink(kfn) + raise + finally: + if kfd: kfd.close() + if ifd: ifd.close() return (kfn, ifn) def getInstallArgs(self, options): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/src/vminstall/VMSUSE.py new/vm-install-0.2.1/src/vminstall/VMSUSE.py --- old/vm-install-0.2.1/src/vminstall/VMSUSE.py 2007-08-28 00:14:25.000000000 +0200 +++ new/vm-install-0.2.1/src/vminstall/VMSUSE.py 2007-09-01 00:30:46.000000000 +0200 @@ -132,36 +132,52 @@ progress(1.0) return kfn + def _getMediaRoots(self, root, _open=open): + """Network install sources may be composed of multiple CDs. YaST lists + their location and ordering in ./yast/instorder. Potentially any of + these CDs may contain a PV kernel. + """ + roots = ['.'] + try: + fd = _open('%s/yast/instorder' % root) + try: + roots = fd.readlines() + roots = map(lambda s: s.strip(), roots) + finally: + fd.close() + finally: + log.debug("Media roots: %s" % str(roots)) + return roots + def getInstallImagesFromPath(self, root, progress=lambda f:None): """Retrieves a Xen-enabled SUSE kernel and initrd from the base path, and copies them to temporary files. Returns the (kernel, initrd) tuple of filenames.""" searched = [] arches = caps.compatible_arches() - for a in arches: - k = '/boot/%s/vmlinuz-%s' % (a[0], a[1]) - searched.append(k) - kfn = '%s%s' % (root, k) - ifn = '%s/boot/%s/initrd-%s' % (root, a[0], a[1]) - if os.path.exists(kfn) and os.path.exists(ifn): - log.debug("Unpacked kernel/initrd found: %s %s" % (kfn, ifn)) - kfd = open(kfn, 'r') - try: - ifd = open(ifn, 'r') - except: - kfd.close() - raise - try: - self.kfn = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(f*0.5)) + for mediaroot in self._getMediaRoots(root): + for a in arches: + k = '/boot/%s/vmlinuz-%s' % (a[0], a[1]) + searched.append(k) + kfn = '%s/%s%s' % (root, mediaroot, k) + ifn = '%s/%s/boot/%s/initrd-%s' % (root, mediaroot, a[0], a[1]) + log.debug("Checking for %s..." % kfn) + if os.path.exists(kfn) and os.path.exists(ifn): + log.debug("Unpacked kernel/initrd found: %s %s" % (kfn, ifn)) + kfd = ifd = None try: - self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.5+f*0.5)) - except: - os.unlink(self.kfn) - raise - finally: - kfd.close() - ifd.close() - return (self.kfn, self.ifn) + kfd = open(kfn, 'r') + ifd = open(ifn, 'r') + self.kfn = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(f*0.5)) + try: + self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.5+f*0.5)) + except: + os.unlink(self.kfn) + raise + finally: + if kfd: kfd.close() + if ifd: ifd.close() + return (self.kfn, self.ifn) log.debug("No unpacked kernel/initrd found") index_path = root + '/INDEX.gz' searched.append('/INDEX.gz') @@ -216,22 +232,24 @@ progress(0.1) arches = caps.compatible_arches() - for a in arches: - try: - kfn = '/boot/%s/vmlinuz-%s' % (a[0], a[1]) - ifn = '/boot/%s/initrd-%s' % (a[0], a[1]) - kfd = urlopen(base + kfn) - self.kfn = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(0.1+f*0.45)) - kfd.close() - die_zero(self.kfn) - ifd = urlopen(base + ifn) - self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.55+f*0.45)) - ifd.close() - die_zero(self.kfn) - log.debug("Unpacked kernel/initrd found: %s %s" % (kfn, ifn)) - return (self.kfn, self.ifn) - except: - continue + for mediaroot in self._getMediaRoots(base, urlopen): + for a in arches: + try: + kfn = '/%s/boot/%s/vmlinuz-%s' % (mediaroot, a[0], a[1]) + ifn = '/%s/boot/%s/initrd-%s' % (mediaroot, a[0], a[1]) + log.debug("Checking for %s..." % (base+kfn,)) + kfd = urlopen(base + kfn) + self.kfn = util.copy_to_temp(kfd, prefix='kernel.', progress=lambda f:progress(0.1+f*0.45)) + kfd.close() + die_zero(self.kfn) + ifd = urlopen(base + ifn) + self.ifn = util.copy_to_temp(ifd, prefix='install-initrd.', progress=lambda f:progress(0.55+f*0.45)) + ifd.close() + die_zero(self.kfn) + log.debug("Unpacked kernel/initrd found: %s %s" % (kfn, ifn)) + return (self.kfn, self.ifn) + except: + continue log.debug("No unpacked kernel/initrd found") try: url = base + '/INDEX.gz' @@ -320,7 +338,7 @@ options.os_settings = arg[9:] else: extra_args += arg + ' ' - options.extra_args = extra_args + options.extra_args = extra_args.strip() def setupOsSettings(self, guest, progress=lambda f:None): """Creates a temporary disk image, in which to pass the autoyast diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/src/vminstall/XenGuest.py new/vm-install-0.2.1/src/vminstall/XenGuest.py --- old/vm-install-0.2.1/src/vminstall/XenGuest.py 2007-07-20 18:29:06.000000000 +0200 +++ new/vm-install-0.2.1/src/vminstall/XenGuest.py 2007-08-31 21:41:33.000000000 +0200 @@ -204,6 +204,10 @@ options = map(lambda s: "".join(s.split("'")), options) lines.append('vfb=[\'type=%s,%s\']' % (viewer, ','.join(options))) else: + stdvga = 0 + if self.options.graphics == 'vesa': + stdvga=1 + lines.append('stdvga=%d' % stdvga) lines.append('%s=1' % viewer) lines += options @@ -306,9 +310,6 @@ for i in range(len(disks)): disks[i].setup(lambda f: progress(cum_times[i]/cum_times[-1] + f*cum_times[i+1]/cum_times[-1])) - for nic in self.options.nics: - nic.setup() - def FailedInstall(self): log.info("Installation failed, so destroying VM") self.Stop() diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/vm-install-0.2.1/TODO new/vm-install-0.2.1/TODO --- old/vm-install-0.2.1/TODO 2007-08-25 01:04:19.000000000 +0200 +++ new/vm-install-0.2.1/TODO 2007-08-30 19:05:33.000000000 +0200 @@ -1,3 +1,6 @@ + - If [PV &&] nographics, do not try to attach vnc + - yast/instorder for sles 9 + - tap:aio should be non-sparse - auto-start on boot option - keymap ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit vino
by root＠Hilbert.suse.de 01 Sep '07

01 Sep '07

Hello community, here is the log from the commit of package vino checked in at Sat Sep 1 13:15:27 CEST 2007. -------- --- GNOME/vino/vino.changes 2007-08-10 16:37:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/vino/vino.changes 2007-08-31 18:47:58.858808000 +0200 @@ -1,0 +2,9 @@ +Fri Aug 31 18:47:20 CEST 2007 - maw(a)suse.de + +- Update to version 2.19.90: + + Include hostname in Avahi service name + + Show the configure summary + + Minor fixes + + Updated translations. + +------------------------------------------------------------------- Old: ---- vino-2.19.5.tar.bz2 New: ---- vino-2.19.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vino.spec ++++++ --- /var/tmp/diff_new_pack.r24560/_old 2007-09-01 13:15:17.000000000 +0200 +++ /var/tmp/diff_new_pack.r24560/_new 2007-09-01 13:15:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package vino (Version 2.19.5) +# spec file for package vino (Version 2.19.90) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,8 +16,8 @@ BuildRequires: gnome-panel License: GPL v2 or later Group: System/GUI/GNOME -Version: 2.19.5 -Release: 5 +Version: 2.19.90 +Release: 1 Requires: %{name}-lang = %{version} Summary: GNOME VNC Server Source: vino-%{version}.tar.bz2 @@ -94,6 +94,12 @@ %files lang -f %{name}.lang %changelog +* Fri Aug 31 2007 - maw(a)suse.de +- Update to version 2.19.90: + + Include hostname in Avahi service name + + Show the configure summary + + Minor fixes + + Updated translations. * Fri Aug 10 2007 - coolo(a)suse.de - use %%version after the definition of Version * Tue Aug 07 2007 - maw(a)suse.de ++++++ vino-2.19.5.tar.bz2 -> vino-2.19.90.tar.bz2 ++++++ ++++ 14776 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit totem
by root＠Hilbert.suse.de 01 Sep '07

01 Sep '07

Hello community, here is the log from the commit of package totem checked in at Sat Sep 1 13:15:14 CEST 2007. -------- --- GNOME/totem/totem.changes 2007-08-07 18:09:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/totem/totem.changes 2007-08-31 18:46:18.794969000 +0200 @@ -1,0 +2,32 @@ +Fri Aug 31 18:44:58 CEST 2007 - maw(a)suse.de + +- Update to version 2.19.90: + * Make the default window size bigger on first startup + * Remove most of the flicker from the waiting cursor on startup + * Fix hang on startup with some versions of GCC + * Fix crashes when opening files with non-UTF-8 filenames + * Fix the fullscreen seekbar not working + * Browser plugin: + - Support the .Mac galleries + - Support replaying videos when they're in the browser cache + - Make the glow button behave better when the mouse pointer is + inside it, glow when a new file is ready to play and requires + the user to click play + - Support the video/x-m4v and application/asx mime-types + - Save the volume from video to video + - Naively skip unplayable items in playlists + - Support ASX playlists with starttime + - Fix some really small videos not showing up in the browser + * Playlist parser: + - Add PLA playlist write support + - Only push UTF-8 strings to the applications + - Fix parsing of some complicated relative URLs + - Fix parsing of M3U playlists when the files have spaces in + their name + - Push the starttime and duration properties to applications + from ASX playlists + * xine-lib backend: + - Fix the seekbar not moving when playing an unseekable source + (such as browser streams in the browser plugin) + +------------------------------------------------------------------- Old: ---- totem-2.19.6.tar.bz2 New: ---- totem-2.19.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ totem.spec ++++++ --- /var/tmp/diff_new_pack.V22368/_old 2007-09-01 13:14:26.000000000 +0200 +++ /var/tmp/diff_new_pack.V22368/_new 2007-09-01 13:14:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package totem (Version 2.19.6) +# spec file for package totem (Version 2.19.90) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,8 +18,8 @@ %endif License: GPL v2 or later, LGPL v2 or later Group: Productivity/Multimedia/Video/Players -Version: 2.19.6 -Release: 4 +Version: 2.19.90 +Release: 1 Source0: %{name}-%{version}.tar.bz2 Patch1: totem-dbus060.patch Patch2: totem-1.2.1-desktop.sh.patch @@ -37,7 +37,7 @@ %gconf_schemas_prereq %description -Totem is movie player for the GNOME desktop based on GStreamer (or +Totem is a movie player for the GNOME desktop based on GStreamer (or xine). It features a playlist, a full-screen mode, seek and volume controls, and complete keyboard navigation. @@ -199,6 +199,35 @@ %endif %changelog +* Fri Aug 31 2007 - maw(a)suse.de +- Update to version 2.19.90: + * Make the default window size bigger on first startup + * Remove most of the flicker from the waiting cursor on startup + * Fix hang on startup with some versions of GCC + * Fix crashes when opening files with non-UTF-8 filenames + * Fix the fullscreen seekbar not working + * Browser plugin: + - Support the .Mac galleries + - Support replaying videos when they're in the browser cache + - Make the glow button behave better when the mouse pointer is + inside it, glow when a new file is ready to play and requires + the user to click play + - Support the video/x-m4v and application/asx mime-types + - Save the volume from video to video + - Naively skip unplayable items in playlists + - Support ASX playlists with starttime + - Fix some really small videos not showing up in the browser + * Playlist parser: + - Add PLA playlist write support + - Only push UTF-8 strings to the applications + - Fix parsing of some complicated relative URLs + - Fix parsing of M3U playlists when the files have spaces in + their name + - Push the starttime and duration properties to applications + from ASX playlists + * xine-lib backend: + - Fix the seekbar not moving when playing an unseekable source + (such as browser streams in the browser plugin) * Tue Aug 07 2007 - maw(a)suse.de - Split off a -lang subpackage - s#%%run_ldconfig#/sbin/ldconfig# in %%post and %%postun. ++++++ totem-2.19.6.tar.bz2 -> totem-2.19.90.tar.bz2 ++++++ ++++ 39303 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit strigi
by root＠Hilbert.suse.de 01 Sep '07

01 Sep '07

Hello community, here is the log from the commit of package strigi checked in at Sat Sep 1 13:15:07 CEST 2007. -------- --- strigi/strigi.changes 2007-08-07 22:20:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/strigi/strigi.changes 2007-08-31 19:39:44.570178000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 31 19:39:16 CEST 2007 - dmueller(a)suse.de + +- fix compilation when gcc43 is used + +------------------------------------------------------------------- New: ---- gcc43.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ strigi.spec ++++++ --- /var/tmp/diff_new_pack.u22188/_old 2007-09-01 13:14:23.000000000 +0200 +++ /var/tmp/diff_new_pack.u22188/_new 2007-09-01 13:14:23.000000000 +0200 @@ -19,8 +19,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.vandenoever.info/software/strigi/ Version: 0.5.5 -Release: 1 +Release: 10 Source: strigi-%{version}.tar.bz2 +Patch: gcc43.diff %description strigi is a very fast crawling, very small memory footprint, no @@ -70,6 +71,7 @@ %prep %setup -q +%patch %build RPM_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e "s,-O2,-O0,") @@ -140,6 +142,8 @@ %_libdir/pkgconfig/libstreams.pc %changelog +* Fri Aug 31 2007 - dmueller(a)suse.de +- fix compilation when gcc43 is used * Tue Aug 07 2007 - dmueller(a)suse.de - use the release tarball (0.5.5) * no changes ++++++ gcc43.diff ++++++ ------------------------------------------------------------------------ r699242 | mueller | 2007-08-12 14:24:48 +0200 (Sun, 12 Aug 2007) | 2 lines the usual "daily unbreak compilation" ------------------------------------------------------------------------ --- src/xmlindexer/cgixmlindexer.cpp +++ src/xmlindexer/cgixmlindexer.cpp @@ -24,6 +24,7 @@ #include "xmlindexwriter.h" #include <time.h> #include <iostream> +#include <stdlib.h> // getenv using namespace Strigi; using namespace std; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0