November 2008 - openSUSE Commits - openSUSE Mailing Lists

commit simple-ccsm
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package simple-ccsm checked in at Fri Nov 28 16:03:54 CET 2008. -------- --- simple-ccsm/simple-ccsm.changes 2008-11-21 13:58:47.000000000 +0100 +++ simple-ccsm/simple-ccsm.changes 2008-11-27 19:45:36.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 27 19:44:35 CET 2008 - rodrigo(a)novell.com + +- Improve rollback mechanism with a timeout'ed dialog, which + restores previous settings if something goes wrong + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ simple-ccsm.spec ++++++ --- /var/tmp/diff_new_pack.X20888/_old 2008-11-28 16:03:21.000000000 +0100 +++ /var/tmp/diff_new_pack.X20888/_new 2008-11-28 16:03:21.000000000 +0100 @@ -24,7 +24,7 @@ Group: System/X11/Utilities PreReq: %fillup_prereq Version: 0.7.8 -Release: 9 +Release: 10 Requires: compiz python-compizconfig python-xml compiz-manager compiz-fusion-plugins-main compizconfig-settings-manager Summary: Simple Settings Manager for Compiz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,6 +82,9 @@ %{py_sitedir}/* %changelog +* Thu Nov 27 2008 rodrigo(a)novell.com +- Improve rollback mechanism with a timeout'ed dialog, which + restores previous settings if something goes wrong * Fri Nov 21 2008 rodrigo(a)novell.com - If running compiz fails, disable desktop effects (bnc#407729) * Fri Nov 14 2008 rodrigo(a)novell.com ++++++ simple-ccsm-cm-dry.patch ++++++ --- /var/tmp/diff_new_pack.X20888/_old 2008-11-28 16:03:21.000000000 +0100 +++ /var/tmp/diff_new_pack.X20888/_new 2008-11-28 16:03:21.000000000 +0100 @@ -2,7 +2,24 @@ =================================================================== --- simple-ccsm.in.orig +++ simple-ccsm.in -@@ -1220,10 +1220,7 @@ class MainWin: +@@ -1213,6 +1213,16 @@ class MainWin: + self.Notebook.set_sensitive(running) + self.ProfileChooser.set_sensitive(running) + ++ def EffectsEnabledDialogResponse(self, response, dialog): ++ if response != gtk.RESPONSE_OK: ++ self.EnableEffectsButton.set_active(False) ++ os.system("killall -9 compiz") ++ ++ dialog.destroy() ++ ++ def EffectsEnabledDialogTimeout(self, dialog): ++ self.EffectsEnabledDialogResponse(gtk.RESPONSE_CANCEL, dialog) ++ + def EnableDesktopEffectsChanged(self, widget): + if self.Block > 0: + return +@@ -1220,10 +1230,7 @@ class MainWin: enabled = self.EnableEffectsButton.get_active() if enabled: # First try to check if compiz can be run @@ -14,17 +31,51 @@ # Dry run detected problems, warn the user dialog = gtk.Dialog () dialog.set_title("Error") -@@ -1268,6 +1265,9 @@ class MainWin: +@@ -1231,11 +1238,11 @@ class MainWin: + label = gtk.Label(_("Desktop effects are not supported on your current hardware / configuration. Would you like to cancel enabling of desktop effects or run them anyway?")) + label.set_line_wrap(True) + dialog.vbox.pack_start(label, +- gtk.TRUE, +- gtk.FALSE, ++ True, ++ False, + 3) + dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL) +- dialog.add_button("Run anyway", gtk.RESPONSE_OK) ++ dialog.add_button(_("Run anyway"), gtk.RESPONSE_OK) + dialog.show_all() + response = dialog.run() + dialog.destroy() +@@ -1267,7 +1274,7 @@ class MainWin: + # Start compiz cmd = CompizStartCommand.split(" ") - subprocess.Popen(cmd) -+ if subprocess.returncode != 0: -+ self.EnableEffectsButton.set_active(False) -+ return +- subprocess.Popen(cmd) ++ proc = subprocess.Popen(cmd) # Enable compiz in kde try: -@@ -1297,8 +1297,10 @@ class MainWin: +@@ -1284,6 +1291,19 @@ class MainWin: + os.remove(path) + except (IOError, OSError): + pass ++ ++ # Show a timeout dialog to rollback if there's any problem ++ dialog = gtk.Dialog() ++ dialog.set_title(_("Desktop effects enabled")) ++ dialog.set_border_width(6) ++ label = gtk.Label(_("Do you want to keep these settings or return to the previous settings? In 10 seconds, previous settings will be restored if you don't aknowledge the changes to your configuration")) ++ label.set_line_wrap(True) ++ dialog.vbox.pack_start(label, True, False, 3) ++ dialog.add_button(_("Keep previous settings"), gtk.RESPONSE_CANCEL) ++ dialog.add_button(_("Use new settings"), gtk.RESPONSE_OK) ++ dialog.connect("response", self.EffectsEnabledDialogResponse, dialog) ++ dialog.show_all() ++ gobject.timeout_add(10000, self.EffectsEnabledDialogTimeout, dialog) + else: + fallbackWM = "" + if GnomeSession in os.environ and os.environ[GnomeSession]: +@@ -1297,8 +1317,10 @@ class MainWin: subprocess.Popen(cmd) # Reset window manager config for KDE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 scim
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package scim checked in at Fri Nov 28 16:03:11 CET 2008. -------- --- scim/scim.changes 2008-10-07 13:05:02.000000000 +0200 +++ scim/scim.changes 2008-11-25 17:22:20.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 25 17:22:20 CET 2008 - sbrabec(a)suse.cz + +- Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim.spec ++++++ --- /var/tmp/diff_new_pack.Y19239/_old 2008-11-28 16:02:56.000000000 +0100 +++ /var/tmp/diff_new_pack.Y19239/_new 2008-11-28 16:02:56.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ graphviz gtk2-devel intltool libgnomeui-devel libxslt perl-XML-Parser update-desktop-files Summary: Smart Chinese/Common Input Method platform Version: 1.4.7 -Release: 163 +Release: 164 License: LGPL v2.1 or later Group: System/I18n/Chinese AutoReqProv: on @@ -292,6 +292,8 @@ %{_includedir}/scim-1.0 %changelog +* Tue Nov 25 2008 sbrabec(a)suse.cz +- Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164). * Tue Oct 07 2008 mfabian(a)suse.de - don’t use libtoolize and autoreconf for openSUSE > 11.0 (fixes build in Factory). ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.Y19239/_old 2008-11-28 16:02:56.000000000 +0100 +++ /var/tmp/diff_new_pack.Y19239/_new 2008-11-28 16:02:56.000000000 +0100 @@ -1,3 +1,4 @@ scim prereq "/usr/bin/touch" post "touch var/adm/SuSEconfig/run-gtk" + supplements "packageand(scim:gtk2-<targettype>)" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 scim-bridge
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package scim-bridge checked in at Fri Nov 28 16:03:08 CET 2008. -------- --- scim-bridge/scim-bridge.changes 2008-10-14 19:59:58.000000000 +0200 +++ scim-bridge/scim-bridge.changes 2008-11-25 17:45:20.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 25 17:44:54 CET 2008 - sbrabec(a)suse.cz + +- Supplement gtk2-32bit/gtk2-64bit and qt3-32bit/qt3-64bit in + baselibs.conf (bnc#354164). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-bridge.spec ++++++ --- /var/tmp/diff_new_pack.E19429/_old 2008-11-28 16:02:59.000000000 +0100 +++ /var/tmp/diff_new_pack.E19429/_new 2008-11-28 16:02:59.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: docbook-xsl-stylesheets doxygen gtk2-devel intltool libqt4-devel qt3-devel scim-devel Summary: Scim Bridge Version: 0.4.15 -Release: 3 +Release: 4 License: LGPL v2.1 or later Group: System/I18n/Japanese AutoReqProv: on @@ -173,6 +173,9 @@ %qt4_plugindir/inputmethods/im-scim-bridge*.so %changelog +* Tue Nov 25 2008 sbrabec(a)suse.cz +- Supplement gtk2-32bit/gtk2-64bit and qt3-32bit/qt3-64bit in + baselibs.conf (bnc#354164). * Tue Oct 14 2008 mfabian(a)suse.de - add "intltoolize --force -c --automake" to fix build in Factory. * Mon Oct 06 2008 pwu(a)suse.de @@ -222,5 +225,5 @@ openSUSE build service). * Wed Apr 18 2007 mfabian(a)suse.de - fix typo in start script. -* Tue Apr 17 2007 mfabian(a)suse.de +* Mon Apr 16 2007 mfabian(a)suse.de - new package: scim-bridge version 0.4.10. ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.E19429/_old 2008-11-28 16:02:59.000000000 +0100 +++ /var/tmp/diff_new_pack.E19429/_new 2008-11-28 16:02:59.000000000 +0100 @@ -1,2 +1,4 @@ scim-bridge-qt + supplements "packageand(scim-bridge-qt:qt3-<targettype>)" scim-bridge-gtk + supplements "packageand(scim-bridge-gtk:gtk2-<targettype>)" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sblim-cmpi-xenvm-builder
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package sblim-cmpi-xenvm-builder checked in at Fri Nov 28 16:02:47 CET 2008. -------- --- sblim-cmpi-xenvm-builder/sblim-cmpi-xenvm-builder.changes 2008-08-26 16:52:01.000000000 +0200 +++ sblim-cmpi-xenvm-builder/sblim-cmpi-xenvm-builder.changes 2008-11-26 00:29:43.000000000 +0100 @@ -1,0 +2,24 @@ +Fri Nov 7 07:45:00 MST 2008 - jcarey(a)novell.com + +- Fixed Bug where an invalid AutomaticRecoveryAction property was + being return when the property was not specified. + +------------------------------------------------------------------- +Mon Nov 3 16:21:47 MST 2008 - jcarey(a)novell.com + +- Changed to log the vm-install command line to syslog if the + VM_BUILDER_DEBUG environment variable is set. + +------------------------------------------------------------------- +Sun Oct 19 14:37:33 MDT 2008 - jcarey(a)novell.com + +- Changed so debug trace messages would be printed out if the + VM_BUILDER_DEBUG environment variable is set. Even if the + package had not been built with debug enabled. + +------------------------------------------------------------------- +Tue Sep 8 13:50:33 MDT 2008 - jcarey(a)novell.com + +- Added support for on_reboot, on_poweroff and on_crash + +------------------------------------------------------------------- @@ -12,0 +37,4 @@ + +------------------------------------------------------------------- +Mon Aug 22 15:33:00 MDT 2008 - jcarey(a)novell.com + @@ -25 +52,0 @@ - calling whatdependson for head-i586 Old: ---- sblim-cmpi-xenvm-builder-1.0.1.tar.gz New: ---- sblim-cmpi-xenvm-builder-1.0.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-xenvm-builder.spec ++++++ --- /var/tmp/diff_new_pack.A15485/_old 2008-11-28 16:00:54.000000000 +0100 +++ /var/tmp/diff_new_pack.A15485/_new 2008-11-28 16:00:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package sblim-cmpi-xenvm-builder (Version 1.0.1) +# spec file for package sblim-cmpi-xenvm-builder (Version 1.0.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ %define tarname sblim-cmpi-xenvm-builder Url: http://www.omc-project.org # Increment the version every time the source code changes. -Version: 1.0.1 -Release: 2 +Version: 1.0.3 +Release: 1 Group: System/Management Summary: Linux CIM providers for CMPI instrumentation of virtual machine creation PreReq: coreutils @@ -112,6 +112,18 @@ %{_datadir}/mof/%{name}/* %changelog +* Fri Nov 07 2008 jcarey(a)novell.com +- Fixed Bug where an invalid AutomaticRecoveryAction property was + being return when the property was not specified. +* Mon Nov 03 2008 jcarey(a)novell.com +- Changed to log the vm-install command line to syslog if the + VM_BUILDER_DEBUG environment variable is set. +* Sun Oct 19 2008 jcarey(a)novell.com +- Changed so debug trace messages would be printed out if the + VM_BUILDER_DEBUG environment variable is set. Even if the + package had not been built with debug enabled. +* Mon Sep 08 2008 jcarey(a)novell.com +- Added support for on_reboot, on_poweroff and on_crash * Tue Aug 26 2008 npaxton(a)novell.com - Include the provider .reg file in tarball * Mon Aug 25 2008 npaxton(a)novell.com @@ -119,6 +131,7 @@ - Changed registration to use sblim-specific tools, as provider-register.sh, and other previous attempts to abstract, have introduced problems. +* Fri Aug 22 2008 jcarey(a)novell.com - Added VNC password to install * Thu Jul 10 2008 npaxton(a)novell.com - Added BuildRequires on sblim-sfcb for specific cimom, ++++++ sblim-cmpi-xenvm-builder-1.0.1.tar.gz -> sblim-cmpi-xenvm-builder-1.0.3.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sblim-cmpi-xenvm-builder-1.0.1/configure new/sblim-cmpi-xenvm-builder-1.0.3/configure --- old/sblim-cmpi-xenvm-builder-1.0.1/configure 2008-08-26 16:48:27.000000000 +0200 +++ new/sblim-cmpi-xenvm-builder-1.0.3/configure 2008-10-19 22:33:41.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for sblim-cmpi-xenvm-builder 1.0.1. +# Generated by GNU Autoconf 2.59 for sblim-cmpi-xenvm-builder 1.0.3. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -421,8 +421,8 @@ # Identity of this package. PACKAGE_NAME='sblim-cmpi-xenvm-builder' PACKAGE_TARNAME='sblim-cmpi-xenvm-builder' -PACKAGE_VERSION='1.0.1' -PACKAGE_STRING='sblim-cmpi-xenvm-builder 1.0.1' +PACKAGE_VERSION='1.0.3' +PACKAGE_STRING='sblim-cmpi-xenvm-builder 1.0.3' PACKAGE_BUGREPORT='' ac_unique_file="src" @@ -953,7 +953,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 sblim-cmpi-xenvm-builder 1.0.1 to adapt to many kinds of systems. +\`configure' configures sblim-cmpi-xenvm-builder 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1019,7 +1019,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sblim-cmpi-xenvm-builder 1.0.1:";; + short | recursive ) echo "Configuration of sblim-cmpi-xenvm-builder 1.0.3:";; esac cat <<\_ACEOF @@ -1161,7 +1161,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -sblim-cmpi-xenvm-builder configure 1.0.1 +sblim-cmpi-xenvm-builder configure 1.0.3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1175,7 +1175,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sblim-cmpi-xenvm-builder $as_me 1.0.1, which was +It was created by sblim-cmpi-xenvm-builder $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1818,7 +1818,7 @@ # Define the identity of the package. PACKAGE='sblim-cmpi-xenvm-builder' - VERSION='1.0.1' + VERSION='1.0.3' cat >>confdefs.h <<_ACEOF @@ -25445,7 +25445,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by sblim-cmpi-xenvm-builder $as_me 1.0.1, which was +This file was extended by sblim-cmpi-xenvm-builder $as_me 1.0.3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25511,7 +25511,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -sblim-cmpi-xenvm-builder config.status 1.0.1 +sblim-cmpi-xenvm-builder config.status 1.0.3 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/sblim-cmpi-xenvm-builder-1.0.1/configure.ac new/sblim-cmpi-xenvm-builder-1.0.3/configure.ac --- old/sblim-cmpi-xenvm-builder-1.0.1/configure.ac 2008-08-26 16:47:19.000000000 +0200 +++ new/sblim-cmpi-xenvm-builder-1.0.3/configure.ac 2008-10-19 22:33:19.000000000 +0200 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.57) -AC_INIT(sblim-cmpi-xenvm-builder, 1.0.1) +AC_INIT(sblim-cmpi-xenvm-builder, 1.0.3) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src]) AC_CONFIG_HEADER([config.h]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sblim-cmpi-xenvm-builder-1.0.1/mof/XEN_VMBuilderVirtualSystemCreationData.mof new/sblim-cmpi-xenvm-builder-1.0.3/mof/XEN_VMBuilderVirtualSystemCreationData.mof --- old/sblim-cmpi-xenvm-builder-1.0.1/mof/XEN_VMBuilderVirtualSystemCreationData.mof 2008-07-18 18:44:08.000000000 +0200 +++ new/sblim-cmpi-xenvm-builder-1.0.3/mof/XEN_VMBuilderVirtualSystemCreationData.mof 2008-09-09 22:41:39.000000000 +0200 @@ -87,7 +87,9 @@ "key:value pairs within each element of the array, if the user so desires.")] String ExtraConfigInfo[]; - [Description("Extra arguments used for the VM Install. May not need.")] + [Description("Additional arguments to pass to the paravirtualized OS. " + "Note that the tool will automatically generate the necessary " + "OS-specific arguments to bootstrap the installation.")] string ExtraInstallArgs; [Description("A string containing the URL where the install source " @@ -116,5 +118,44 @@ "windowsvistax64", "opensuse", "winserver2008", "winserver2008x64" }] uint32 OSType; + + [Description("Behaviour of a domain when it is powered off. " + "Possible values: " + "Destroy: Domain is cleaned up as normal" + "Restart: Domain is started in place of the old one" + "Preserve: No clean-up s done until the domain is manually destroyed" + "Rename-Restart: Old domain is not cleaned up, but is renamed and " + "a new domain started in its place. " + "Default is 'Destroy'."), + ValueMap{"0", "1", "2", "3"}, + Values{"Destroy", "Restart", "Preserve", "Rename-Restart"}] + uint16 OnPowerOff; + + [Description("Behaviour of a domain when it is rebooted. " + "Possible values: " + "Destroy: Domain is cleaned up as normal" + "Restart: Domain is started in place of the old one" + "Preserve: No clean-up s done until the domain is manually destroyed" + "Rename-Restart: Old domain is not cleaned up, but is renamed and " + "a new domain started in its place. " + "Default is 'Restart'."), + ValueMap{"0", "1", "2", "3"}, + Values{"Destroy", "Restart", "Preserve", "Rename-Restart"}] + uint16 OnReboot; + + [Description("Behaviour of a domain when it crashes. " + "Possible values: " + "Destroy: Domain is cleaned up as normal" + "Restart: Domain is started in place of the old one" + "Preserve: No clean-up s done until the domain is manually destroyed" + "Rename-Restart: Old domain is not cleaned up, but is renamed and " + "a new domain started in its place. " + "Coredump-Destroy: Dump the crashed domain's core and then destroy. " + "Coredump-Restart: Dump the crashed domain's core and the restart. " + "Default is 'Restart'."), + ValueMap{"0", "1", "2", "3", "4", "5"}, + Values{"Destroy", "Restart", "Preserve", "Rename-Restart", + "Coredump-Destroy", "Coredump-Restart"}] + uint16 OnCrash; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/builder-job.c new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/builder-job.c --- old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/builder-job.c 2008-06-19 23:06:45.000000000 +0200 +++ new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/builder-job.c 2008-10-19 22:29:44.000000000 +0200 @@ -157,7 +157,7 @@ memset(pinfo, 0, sizeof(*pinfo)); if (cmpiutilExecuteProcessAndGatherOutputAndError((char* const*)cmd, NULL, &output, &output_size, -1, NULL, NULL, -1, NULL, &status, -1) == 0) { - //DEBUGOUT("vm-install-jobs -s returned %d - %s\n", status, output); + DEBUGOUT("vm-install-jobs -s returned %d - %s\n", status, output); unsigned int num_elements; lines = cmpiutilStrTokenize(output, "\r\n", &num_elements); if (lines) { @@ -739,11 +739,10 @@ Init( CMPIInstanceMI* self) { + set_debug_for_env(); DEBUGOUT("Initialize() called\n"); - DEBUGOUT("Deleting job xref recs that no longer exist\n"); db_delete_dead_job_recs(NULL); - DEBUGOUT("Leaving Initialize()\n"); } @@ -775,6 +774,7 @@ MethodInit( CMPIMethodMI * self) { + set_debug_for_env(); DEBUGOUT("MethodInitialize() called\n"); // do work here if necessary @@ -916,6 +916,7 @@ AssocInit( CMPIAssociationMI* self) { + set_debug_for_env(); DEBUGOUT("AssocInit() called"); DEBUGOUT("Leaving AssocInit()\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/builder-service.c new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/builder-service.c --- old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/builder-service.c 2008-07-18 18:44:08.000000000 +0200 +++ new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/builder-service.c 2008-11-04 00:19:30.000000000 +0100 @@ -527,6 +527,7 @@ Init( CMPIInstanceMI* self) { + set_debug_for_env(); DEBUGOUT("Initialize() called\n"); DEBUGOUT("Leaving Initialize()\n"); @@ -560,6 +561,7 @@ MethodInit( CMPIMethodMI * self) { + set_debug_for_env(); DEBUGOUT("MethodInitialize() called\n"); // do work here if necessary @@ -593,15 +595,71 @@ CMPIStatus* pstatus) { FILE* fd = cmpiutilCreateTempFile(filename, filename_length); + if (!fd) { + CMPIUTIL_SETSTATUS(_broker, pstatus, CMPI_RC_ERROR_SYSTEM, + "Failed to create temp file for response file"); + return NULL; + } + size_t rflen = strlen(rf); if (fwrite(rf, sizeof(char), rflen, fd) != rflen) { fclose(fd); unlink(filename); CMPIUTIL_SETSTATUS(_broker, pstatus, CMPI_RC_ERROR_SYSTEM, - "Failed to create temp file for response file"); + "Failed writing contents of response file"); + return NULL; + } + fclose(fd); + return filename; +} + +/*****************************************************************************/ +char* +create_settings_file(cmpiutilStrArray* lines, char *filename, + size_t filename_length, CMPIStatus* pstatus) +{ + int i, sz, len; + const char* iserr = NULL; + const char* line; + const char* hdr = "<domain type='xen'>"; + const char* trlr = "</domain>"; + FILE* fd = cmpiutilCreateTempFile(filename, filename_length); + if (!fd) { + CMPIUTIL_SETSTATUS(_broker, pstatus, CMPI_RC_ERROR_SYSTEM, + "Failed to create temp file for VM settings"); return NULL; } + + for(;;) { + len = strlen(hdr); + if (fwrite(hdr, sizeof(char), len, fd) != len) { + iserr = "Failed to write XML to vm-settings file"; + break; + } + sz = cmpiutilStrArray_size(lines); + for(i = 0; i < sz; i++) { + line = cmpiutilStrArray_get_element(lines, i); + len = strlen(line); + if (fwrite(line, sizeof(char), len, fd) != len) { + iserr = "Failed to write XML to vm-settings file"; + break; + } + } + if (!iserr) { + len = strlen(trlr); + if (fwrite(trlr, sizeof(char), len, fd) != len) + iserr = "Failed to write XML to vm-settings file"; + } + break; + } + fclose(fd); + if (iserr) { + unlink(filename); + CMPIUTIL_SETSTATUS(_broker, pstatus, CMPI_RC_ERROR_SYSTEM, iserr); + return NULL; + } + return filename; } @@ -617,16 +675,22 @@ CMPIStatus *pstatus) { CMPIData data; - cmpiutilStrArray *pstra; + cmpiutilStrArray *pstra, *vm_settings = NULL; const char *iid = NULL; const char *os_type; char wkbfr[256]; char rspbfr[PATH_MAX]; + char settingsbfr[PATH_MAX]; char *response_file = NULL; + char *settings_file = NULL; int cc, i; size_t output_size; char* output; CMPIObjectPath *jobref = NULL; + static const char* on_actions[] = { + "destroy", "restart", "preserve", "rename-restart", + "coredump-destroy", "coredump-restart" + }; DEBUGOUT("start_create_vm() called...\n"); data = CMGetProperty(cdci, "InstanceID", NULL); @@ -819,14 +883,68 @@ } } + vm_settings = cmpiutilStrArray_create(); + if (!vm_settings) { + if (response_file) { + unlink(response_file); + } + cmpiutilStrArray_destroy(pstra); + CMPIUTIL_SETSTATUS(_broker, pstatus, CMPI_RC_ERROR_SYSTEM, + "Failed to create string array for vm settings"); + return NULL; + } + + /**** OnPowerOff ****/ + data = CMGetProperty(cdci, "OnPowerOff", NULL); + if (!CMIsNullValue(data)) { + snprintf(wkbfr, sizeof(wkbfr), "<on_poweroff>%s</on_poweroff>", on_actions[data.value.uint16]); + cmpiutilStrArray_append(vm_settings, wkbfr); + } + + /**** OnReboot ****/ + data = CMGetProperty(cdci, "OnReboot", NULL); + if (!CMIsNullValue(data)) { + snprintf(wkbfr, sizeof(wkbfr), "<on_reboot>%s</on_reboot>", on_actions[data.value.uint16]); + cmpiutilStrArray_append(vm_settings, wkbfr); + } + + /**** OnCrash ****/ + data = CMGetProperty(cdci, "OnCrash", NULL); + if (!CMIsNullValue(data)) { + snprintf(wkbfr, sizeof(wkbfr), "<on_crash>%s</on_crash>", on_actions[data.value.uint16]); + cmpiutilStrArray_append(vm_settings, wkbfr); + } + + /* If OnPowerOff/OnReboot/OnCrash specified then create a vm-settings file */ + if (cmpiutilStrArray_size(vm_settings) > 0) + { + settings_file = create_settings_file(vm_settings, settingsbfr, + sizeof(settingsbfr), pstatus); + if (!settings_file) { + if (response_file) { + unlink(response_file); + } + cmpiutilStrArray_destroy(vm_settings); + cmpiutilStrArray_destroy(pstra); + return NULL; + } + cmpiutilStrArray_append(pstra, "--vm-settings"); + cmpiutilStrArray_append(pstra, settings_file); + } + cmpiutilStrArray_destroy(vm_settings); + /* Execute vm-install with the constructed command line */ -#ifdef XEN_VMBUILDER_DEBUG - printf("Executing:\n"); - for(i = 0; pstra->strs[i]; i++) { - printf("%s ", pstra->strs[i]); + if (is_debug()) { + cmpiutilStrBuf* cmdBuf = cmpiutilStrBuf_create(); + cmpiutilStrBuf_set(cmdBuf, "VM Builder Executing: ", 0); + for(i = 0; pstra->strs[i]; i++) { + cmpiutilStrBuf_cat(cmdBuf, pstra->strs[i], 0); + cmpiutilStrBuf_cat(cmdBuf, " ", 0); + } + DEBUGOUT("%s\n", cmdBuf->bfr); + CMLogMessage(_broker, 1, "VMBuilder Provider", cmdBuf->bfr, NULL); + cmpiutilStrBuf_destroy(cmdBuf); } - printf("\n"); -#endif output = NULL; DEBUGOUT("Calling vm-install...\n"); @@ -845,11 +963,9 @@ } else { prv->uint32 = (CMPIUint32)WEXITSTATUS(cc); DEBUGOUT("vm-install failed status: %u\n", prv->uint32); -#ifdef XEN_VMBUILDER_DEBUG if(output) { - printf("vm-install output: %s\n", output); + DEBUGOUT("vm-install output: %s\n", output); } -#endif } } else { strerror_r(errno, wkbfr, sizeof(wkbfr)); @@ -864,49 +980,60 @@ free(output); } cmpiutilStrArray_destroy(pstra); - DEBUGOUT("checking for existence response file\n"); - if (response_file) { - DEBUGOUT("Should have response file %s\n", response_file); - if (jobref) { - DEBUGOUT("There is a job reference, so waiting for right state\n"); - /* - * Wait until Job state reaches the 'INSTALL' and then delete - * the response file. - */ - CMPIInstance *jobci; - CMPIStatus lstatus; - int fail_count = 0; - DEBUGOUT("Entering GetInstance loop for Job instance...\n"); - while(fail_count < 10) { - cmpiutilMilliSleep(1000); - jobci = CBGetInstance(_broker, context, jobref, NULL, - &lstatus); - if (jobci == NULL) { - DEBUGOUT("GetInstance for Job returned NULL. " - "Inc fail count\n"); - fail_count++; + + /* If a jobref was returned, wait for it to get beyond + * the 'SETTINGS' state before any clean up. + */ + if (jobref) { + DEBUGOUT("There is a job reference, so waiting for right state\n"); + /* + * Wait until Job state goes beyond the 'SETTINGS' state. + */ + CMPIInstance *jobci; + CMPIStatus lstatus; + int fail_count = 0; + DEBUGOUT("Entering GetInstance loop for Job instance...\n"); + while(fail_count < 10) { + cmpiutilMilliSleep(1000); + jobci = CBGetInstance(_broker, context, jobref, NULL, + &lstatus); + if (jobci == NULL) { + DEBUGOUT("GetInstance for Job returned NULL. " + "Inc fail count\n"); + fail_count++; + continue; + } + data = CMGetProperty(jobci, "JobStatus", NULL); + if (!CMIsNullValue(data)) { + const char *p = CMGetCharPtr(data.value.string); + if (strcasecmp(p, "SETTINGS") == 0) { + DEBUGOUT("Still to soon to delete Response file\n"); continue; } - data = CMGetProperty(jobci, "JobStatus", NULL); - if (!CMIsNullValue(data)) { - const char *p = CMGetCharPtr(data.value.string); - if (strcasecmp(p, "SETTINGS") == 0) { - DEBUGOUT("Still to soon to delete Response file\n"); - continue; - } - DEBUGOUT("Install state allows for response file " - "delete\n"); - break; - } else { - DEBUGOUT("Job instance has NULL JobStatus property. " - "Inc Fail count\n"); - fail_count++; - } + DEBUGOUT("Install state allows for response file " + "delete\n"); + break; + } else { + DEBUGOUT("Job instance has NULL JobStatus property. " + "Inc Fail count\n"); + fail_count++; } } + } + + DEBUGOUT("checking for existence response file\n"); + if (response_file) { + DEBUGOUT("Should have response file %s\n", response_file); DEBUGOUT("Deleting response file: %s\n", response_file); unlink(response_file); } + + DEBUGOUT("checking for existence of settings file\n"); + if (settings_file) { + DEBUGOUT("Should have settings file %s\n", settings_file); + DEBUGOUT("Deleting settings file: %s\n", settings_file); + unlink(settings_file); + } DEBUGOUT("start_create_vm() returning\n"); return jobref; } @@ -1045,6 +1172,7 @@ AssocInit( CMPIAssociationMI* self) { + set_debug_for_env(); DEBUGOUT("AssocInit() called"); DEBUGOUT("Leaving AssocInit()\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/owning-job.c new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/owning-job.c --- old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/owning-job.c 2008-06-19 23:06:45.000000000 +0200 +++ new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/owning-job.c 2008-10-19 22:30:46.000000000 +0200 @@ -414,6 +414,7 @@ Init( CMPIInstanceMI* self) { + set_debug_for_env(); DEBUGOUT("Initialize() called\n"); db_delete_dead_job_recs(NULL); @@ -453,6 +454,7 @@ AssocInit( CMPIAssociationMI* self) { + set_debug_for_env(); DEBUGOUT("AssocInit() called"); DEBUGOUT("Leaving AssocInit()\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/setting-define-build.c new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/setting-define-build.c --- old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/setting-define-build.c 2008-06-19 23:06:45.000000000 +0200 +++ new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/setting-define-build.c 2008-10-19 22:31:05.000000000 +0200 @@ -436,6 +436,7 @@ Init( CMPIInstanceMI* self) { + set_debug_for_env(); DEBUGOUT("Initialize() called\n"); db_delete_dead_job_recs(NULL); @@ -475,6 +476,7 @@ AssocInit( CMPIAssociationMI* self) { + set_debug_for_env(); DEBUGOUT("AssocInit() called"); DEBUGOUT("Leaving AssocInit()\n"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/vmbuilder-db.c new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/vmbuilder-db.c --- old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/vmbuilder-db.c 2008-08-18 21:39:18.000000000 +0200 +++ new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/vmbuilder-db.c 2008-09-04 22:29:59.000000000 +0200 @@ -86,6 +86,23 @@ "VirtType INTEGER," "VirtualSystemIdentifier TEXT," "VirtualSystemType TEXT," + //-- 0: Destroy + //-- 1: Restart + //-- 2: Preserve + //-- 3: Rename-Restart + "OnPowerOff INTEGER," + //-- 0: Destroy + //-- 1: Restart + //-- 2: Preserve + //-- 3: Rename-Restart + "OnReboot INTEGER," + //-- 0: Destroy + //-- 1: Restart + //-- 2: Preserve + //-- 3: Rename-Restart + //-- 4: Coredump-Destroy + //-- 5: Coredump-Restart + "OnCrash INTEGER," "PRIMARY KEY(InstanceID COLLATE NOCASE));" "CREATE TABLE Job(" "JobName TEXT NOT NULL," diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/vmbuilder-util.c new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/vmbuilder-util.c --- old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/vmbuilder-util.c 2008-06-19 23:06:45.000000000 +0200 +++ new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/vmbuilder-util.c 2008-10-20 18:18:14.000000000 +0200 @@ -1,6 +1,9 @@ #include "vmbuilder-util.h" #include <stdio.h> +#include <stdarg.h> +#include <stdlib.h> + #include <errno.h> #include <cmpidt.h> #include <cmpift.h> @@ -8,6 +11,54 @@ #include <cmpiutil/string.h> #include <cmpiutil/exec.h> + +#ifdef XEN_VMBUILDER_DEBUG +static int _is_debug = 1; +#else +static int _is_debug = 0; +#endif + +/******************************************************************************/ +int +is_debug() +{ + return _is_debug; +} + +/******************************************************************************/ +void +set_debug_for_env() +{ + const char* penv = getenv("VM_BUILDER_DEBUG"); + if (NULL != penv) + { + if (strncmp(penv, "0", 1) + && strncasecmp(penv, "false", 5)) + _is_debug = 1; + else + _is_debug = 0; + } +#ifndef XEN_VMBUILDER_DEBUG + else + { + _is_debug = 0; + } +#endif +} + +/******************************************************************************/ +void +vmbuilder_debug_out(const char* fmt, ...) +{ + if (_is_debug) + { + va_list ap; + va_start(ap, fmt); + vfprintf(stdout, fmt, ap); + va_end(ap); + } +} + /******************************************************************************/ CMPIArray* str2UInt16Array(const CMPIBroker* broker, const char* str) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/vmbuilder-util.h new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/vmbuilder-util.h --- old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/vmbuilder-util.h 2008-06-19 23:06:45.000000000 +0200 +++ new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/vmbuilder-util.h 2008-10-20 18:18:36.000000000 +0200 @@ -24,12 +24,10 @@ void set_dt_prop(const CMPIBroker* broker, VMBDBCtx dbctx, int col_ndx, CMPIInstance* instance, const char* prop_name, CMPIBoolean isInterval); char** get_job_names(); +int is_debug(); +void set_debug_for_env(); +void vmbuilder_debug_out(const char* fmt, ...); -/* If built for debug, enable tracing */ -#ifdef XEN_VMBUILDER_DEBUG -#define DEBUGOUT(fmt, args...) printf(fmt,## args) -#else -#define DEBUGOUT(fmt, args...) -#endif +#define DEBUGOUT(fmt, args...) vmbuilder_debug_out(fmt,## args) #endif /* VMBUILDER_UTIL_H_GUARD */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/vmcreation-data.c new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/vmcreation-data.c --- old/sblim-cmpi-xenvm-builder-1.0.1/src/providers/vm-builder/vmcreation-data.c 2008-08-18 21:39:18.000000000 +0200 +++ new/sblim-cmpi-xenvm-builder-1.0.3/src/providers/vm-builder/vmcreation-data.c 2008-11-07 15:49:45.000000000 +0100 @@ -99,7 +99,10 @@ "VNCPassword," \ "VirtType," \ "VirtualSystemIdentifier," \ - "VirtualSystemType" + "VirtualSystemType," \ + "OnPowerOff," \ + "OnReboot," \ + "OnCrash" const char* all_cd_fields_query_with_where = "SELECT "CSV_FIELDS" FROM CreationData " "WHERE InstanceID=%Q;"; @@ -145,7 +148,10 @@ CDF_VNCPassword, CDF_VirtType, CDF_VirtualSystemIdentifier, - CDF_VirtualSystemType + CDF_VirtualSystemType, + CDF_OnPowerOff, + CDF_OnReboot, + CDF_OnCrash }; /* @@ -231,6 +237,51 @@ /*****************************************************************************/ static CMPIrc +valid_on_power_off(const CMPIData *pdata, CMPIStatus* pstatus) +{ + CMSetStatus(pstatus, CMPI_RC_OK); + if (!CMIsNullValue((*pdata))) { + if (pdata->value.uint16 > 3) { + CMSetStatusWithChars(_broker, pstatus, + CMPI_RC_ERR_INVALID_PARAMETER, + "Invalid 'OnPowerOff' property"); + } + } + return pstatus->rc; +} + +/*****************************************************************************/ +static CMPIrc +valid_on_reboot(const CMPIData *pdata, CMPIStatus* pstatus) +{ + CMSetStatus(pstatus, CMPI_RC_OK); + if (!CMIsNullValue((*pdata))) { + if (pdata->value.uint16 > 3) { + CMSetStatusWithChars(_broker, pstatus, + CMPI_RC_ERR_INVALID_PARAMETER, + "Invalid 'OnReboot' property"); + } + } + return pstatus->rc; +} + +/*****************************************************************************/ +static CMPIrc +valid_on_crash(const CMPIData *pdata, CMPIStatus* pstatus) +{ + CMSetStatus(pstatus, CMPI_RC_OK); + if (!CMIsNullValue((*pdata))) { + if (pdata->value.uint16 > 5) { + CMSetStatusWithChars(_broker, pstatus, + CMPI_RC_ERR_INVALID_PARAMETER, + "Invalid 'OnCrash' property"); + } + } + return pstatus->rc; +} + +/*****************************************************************************/ +static CMPIrc valid_automatic_recovery_action(const CMPIData *pdata, CMPIStatus* pstatus) { CMSetStatus(pstatus, CMPI_RC_OK); @@ -275,44 +326,61 @@ } /*****************************************************************************/ -static void +static int add_u8_prop_to_query(cmpiutilStrBuf* pstrbuf, const CMPIInstance* instance, const char* prop_name) { + int cc = 0; CMPIData data = CMGetProperty(instance, prop_name, NULL); if (!CMIsNullValue(data)) { char wkbfr[32]; snprintf(wkbfr, sizeof(wkbfr), "%u,", data.value.uint8); cmpiutilStrBuf_cat(pstrbuf, wkbfr, 0); + cc = 1; } else { cmpiutilStrBuf_cat(pstrbuf, "NULL,", 0); } + return cc; } /*****************************************************************************/ -static void +static int add_u16_prop_to_query(cmpiutilStrBuf* pstrbuf, const CMPIInstance* instance, - const char* prop_name, CMPIData *pdata) + const char* prop_name, CMPIData *pdata, int endstmt) { + int cc = 0; CMPIData data; + const char* pnnfmt; + const char* pnullfmt; if (!pdata) { pdata = &data; } + + if (endstmt) { + pnnfmt = "%d"; + pnullfmt = "NULL"; + } else { + pnnfmt = "%d,"; + pnullfmt = "NULL,"; + } *pdata = CMGetProperty(instance, prop_name, NULL); if (!CMIsNullValue((*pdata))) { char wkbfr[32]; - snprintf(wkbfr, sizeof(wkbfr), "%u,", pdata->value.uint16); + snprintf(wkbfr, sizeof(wkbfr), pnnfmt, pdata->value.uint16); cmpiutilStrBuf_cat(pstrbuf, wkbfr, 0); + cc = 1; } else { - cmpiutilStrBuf_cat(pstrbuf, "NULL,", 0); + cmpiutilStrBuf_cat(pstrbuf, pnullfmt, 0); } + return cc; } /*****************************************************************************/ -static void +static int add_u32_prop_to_query(cmpiutilStrBuf* pstrbuf, const CMPIInstance* instance, const char* prop_name, CMPIData* pdata) { + int cc = 0; CMPIData data; if (!pdata) { pdata = &data; @@ -323,16 +391,19 @@ char wkbfr[32]; snprintf(wkbfr, sizeof(wkbfr), "%u,", pdata->value.uint32); cmpiutilStrBuf_cat(pstrbuf, wkbfr, 0); + cc = 1; } else { cmpiutilStrBuf_cat(pstrbuf, "NULL,", 0); } + return cc; } /*****************************************************************************/ -static void +static int add_str_prop_to_query(cmpiutilStrBuf* pstrbuf, const CMPIInstance* instance, const char* prop_name, int endstmt) { + int cc = 0; CMPIData data; const char* pnnfmt; const char* pnullfmt; @@ -347,16 +418,19 @@ if (!CMIsNullValue(data)) { char *p = (char*) CMGetCharPtr(data.value.string); db_sql_insert(pstrbuf, pnnfmt, p); + cc = 1; } else { cmpiutilStrBuf_cat(pstrbuf, pnullfmt, 0); } + return cc; } /*****************************************************************************/ -static void +static int add_stra_prop_to_query(cmpiutilStrBuf* pstrbuf, const CMPIInstance* instance, const char* prop_name) { + int cc = 0; CMPIData data = CMGetProperty(instance, prop_name, NULL); if (!CMIsNullValue(data)) { cmpiutilStrBuf* lstrbuf = stringArray2Str(_broker, data.value.array); @@ -366,9 +440,11 @@ } else { cmpiutilStrBuf_cat(pstrbuf, "NULL,", 0); } + cc = 1; } else { cmpiutilStrBuf_cat(pstrbuf, "NULL,", 0); } + return cc; } @@ -444,6 +520,9 @@ set_u32_prop(dbctx, CDF_VirtType, instance, "VirtType"); set_str_prop(dbctx, CDF_VirtualSystemIdentifier, instance, "VirtualSystemIdentifier"); set_str_prop(dbctx, CDF_VirtualSystemType, instance, "VirtualSystemType"); + set_u16_prop(dbctx, CDF_OnPowerOff, instance, "OnPowerOff"); + set_u16_prop(dbctx, CDF_OnReboot, instance, "OnReboot"); + set_u16_prop(dbctx, CDF_OnCrash, instance, "OnCrash"); } /****************************************************************************** @@ -644,7 +723,7 @@ /*****************************************************************************/ -void +int mod_add_u16_prop(cmpiutilStrArray* pstra, const CMPIInstance* modified_instance, const char* prop_name, const char** properties, CMPIData* pdata) { @@ -655,7 +734,7 @@ pdata = &data; } if (!get_mod_property(modified_instance, prop_name, properties, pdata)) { - return; + return 0; } if (!CMIsNullValue((*pdata))) { snprintf(wkbfr, sizeof(wkbfr), "%s=%u", prop_name, pdata->value.uint16); @@ -663,17 +742,18 @@ snprintf(wkbfr, sizeof(wkbfr), "%s=NULL", prop_name); } cmpiutilStrArray_append(pstra, wkbfr); + return 1; } /*****************************************************************************/ -void +int mod_add_u8_prop(cmpiutilStrArray* pstra, const CMPIInstance* modified_instance, const char* prop_name, const char** properties) { char wkbfr[256]; CMPIData data; if (!get_mod_property(modified_instance, prop_name, properties, &data)) { - return; + return 0; } if (!CMIsNullValue(data)) { snprintf(wkbfr, sizeof(wkbfr), "%s=%u", prop_name, data.value.uint8); @@ -681,16 +761,17 @@ snprintf(wkbfr, sizeof(wkbfr), "%s=NULL", prop_name); } cmpiutilStrArray_append(pstra, wkbfr); + return 1; } /*****************************************************************************/ -void +int mod_add_str_prop(cmpiutilStrArray* pstra, const CMPIInstance* modified_instance, const char* prop_name, const char** properties) { CMPIData data; if (!get_mod_property(modified_instance, prop_name, properties, &data)) { - return; + return 0; } if (!CMIsNullValue(data)) { char *p = (char*) CMGetCharPtr(data.value.string); @@ -702,16 +783,17 @@ snprintf(wkbfr, sizeof(wkbfr), "%s=NULL", prop_name); cmpiutilStrArray_append(pstra, wkbfr); } + return 1; } /*****************************************************************************/ -void +int mod_add_stra_prop(cmpiutilStrArray* pstra, const CMPIInstance* modified_instance, const char* prop_name, const char** properties) { CMPIData data; if (!get_mod_property(modified_instance, prop_name, properties, &data)) { - return; + return 0; } if (!CMIsNullValue(data)) { cmpiutilStrBuf* lstrbuf = stringArray2Str(_broker, data.value.array); @@ -730,10 +812,11 @@ snprintf(wkbfr, sizeof(wkbfr), "%s=NULL", prop_name); cmpiutilStrArray_append(pstra, wkbfr); } + return 1; } /*****************************************************************************/ -void +int mod_add_u32_prop(cmpiutilStrArray* pstra, const CMPIInstance* modified_instance, const char* prop_name, const char** properties, CMPIData* pdata) { @@ -744,7 +827,7 @@ pdata = &data; } if (!get_mod_property(modified_instance, prop_name, properties, pdata)) { - return; + return 0; } if (!CMIsNullValue((*pdata))) { snprintf(wkbfr, sizeof(wkbfr), "%s=%u", prop_name, pdata->value.uint32); @@ -752,6 +835,7 @@ snprintf(wkbfr, sizeof(wkbfr), "%s=NULL", prop_name); } cmpiutilStrArray_append(pstra, wkbfr); + return 1; } /****************************************************************************** @@ -833,20 +917,23 @@ return status; } - mod_add_u16_prop(pstra, modified_instance, "AutoMaticRecoveryAction", properties, &data); - if (valid_automatic_recovery_action(&data, &status) != CMPI_RC_OK) { - cmpiutilStrArray_destroy(pstra); - return status; + if (mod_add_u16_prop(pstra, modified_instance, "AutoMaticRecoveryAction", properties, &data)) { + if (valid_automatic_recovery_action(&data, &status) != CMPI_RC_OK) { + cmpiutilStrArray_destroy(pstra); + return status; + } } - mod_add_u16_prop(pstra, modified_instance, "AutoMaticShutdownAction", properties, &data); - if (valid_automatic_shutdown_action(&data, &status) != CMPI_RC_OK) { - cmpiutilStrArray_destroy(pstra); - return status; + if (mod_add_u16_prop(pstra, modified_instance, "AutoMaticShutdownAction", properties, &data)) { + if (valid_automatic_shutdown_action(&data, &status) != CMPI_RC_OK) { + cmpiutilStrArray_destroy(pstra); + return status; + } } - mod_add_u16_prop(pstra, modified_instance, "AutoMaticStartupAction", properties, &data); - if (valid_automatic_startup_action(&data, &status) != CMPI_RC_OK) { - cmpiutilStrArray_destroy(pstra); - return status; + if (mod_add_u16_prop(pstra, modified_instance, "AutoMaticStartupAction", properties, &data)) { + if (valid_automatic_startup_action(&data, &status) != CMPI_RC_OK) { + cmpiutilStrArray_destroy(pstra); + return status; + } } if (get_mod_property(modified_instance, "AutoMaticStartupActionDelay", properties, &data)) { if (!CMIsNullValue(data)) { @@ -868,10 +955,11 @@ "AutomaticStartupActionSequenceNumber", properties, NULL); mod_add_str_prop(pstra, modified_instance, "CPUArchitecture", properties); mod_add_str_prop(pstra, modified_instance, "Caption", properties); - mod_add_u16_prop(pstra, modified_instance, "ChangeableType", properties, &data); - if (valid_changeable_type(&data, &status) != CMPI_RC_OK) { - cmpiutilStrArray_destroy(pstra); - return status; + if (mod_add_u16_prop(pstra, modified_instance, "ChangeableType", properties, &data)) { + if (valid_changeable_type(&data, &status) != CMPI_RC_OK) { + cmpiutilStrArray_destroy(pstra); + return status; + } } mod_add_str_prop(pstra, modified_instance, "ConfigurationDataRoot", properties); mod_add_str_prop(pstra, modified_instance, "ConfigurationFile", properties); @@ -898,15 +986,17 @@ mod_add_str_prop(pstra, modified_instance, "ElementName", properties); mod_add_stra_prop(pstra, modified_instance, "ExtraConfigInfo", properties); mod_add_str_prop(pstra, modified_instance, "ExtraInstallArgs", properties); - mod_add_u32_prop(pstra, modified_instance, "GraphicsType", properties, &data); - if (valid_graphics_type(&data, &status) != CMPI_RC_OK) { - cmpiutilStrArray_destroy(pstra); - return status; + if (mod_add_u32_prop(pstra, modified_instance, "GraphicsType", properties, &data)) { + if (valid_graphics_type(&data, &status) != CMPI_RC_OK) { + cmpiutilStrArray_destroy(pstra); + return status; + } } - mod_add_u32_prop(pstra, modified_instance, "GraphicsViewerType", properties, &data); - if (valid_graphics_viewer_type(&data, &status) != CMPI_RC_OK) { - cmpiutilStrArray_destroy(pstra); - return status; + if (mod_add_u32_prop(pstra, modified_instance, "GraphicsViewerType", properties, &data)) { + if (valid_graphics_viewer_type(&data, &status) != CMPI_RC_OK) { + cmpiutilStrArray_destroy(pstra); + return status; + } } mod_add_str_prop(pstra, modified_instance, "LogDataRoot", properties); mod_add_u32_prop(pstra, modified_instance, "MaxMemory", properties, NULL); @@ -914,10 +1004,11 @@ mod_add_stra_prop(pstra, modified_instance, "Nics", properties); mod_add_stra_prop(pstra, modified_instance, "Notes", properties); mod_add_u8_prop(pstra, modified_instance, "NumVCPUs", properties); - mod_add_u32_prop(pstra, modified_instance, "OSType", properties, &data); - if (valid_os_type(&data, &status) != CMPI_RC_OK) { - cmpiutilStrArray_destroy(pstra); - return status; + if (mod_add_u32_prop(pstra, modified_instance, "OSType", properties, &data)) { + if (valid_os_type(&data, &status) != CMPI_RC_OK) { + cmpiutilStrArray_destroy(pstra); + return status; + } } mod_add_str_prop(pstra, modified_instance, "RecoveryFile", properties); mod_add_str_prop(pstra, modified_instance, "ResponseFile", properties); @@ -927,14 +1018,32 @@ mod_add_str_prop(pstra, modified_instance, "SwapFileDataRoot", properties); mod_add_u32_prop(pstra, modified_instance, "VNCPort", properties, NULL); mod_add_str_prop(pstra, modified_instance, "VNCPassword", properties); - mod_add_u32_prop(pstra, modified_instance, "VirtType", properties, &data); - if (valid_virt_type(&data, &status) != CMPI_RC_OK) { - cmpiutilStrArray_destroy(pstra); - return status; + if (mod_add_u32_prop(pstra, modified_instance, "VirtType", properties, &data)) { + if (valid_virt_type(&data, &status) != CMPI_RC_OK) { + cmpiutilStrArray_destroy(pstra); + return status; + } } mod_add_str_prop(pstra, modified_instance, "VirtualSystemIdentifier", properties); mod_add_str_prop(pstra, modified_instance, "VirtualSystemType", properties); - + if (mod_add_u16_prop(pstra, modified_instance, "OnPowerOff", properties, &data)) { + if (valid_on_power_off(&data, &status) != CMPI_RC_OK) { + cmpiutilStrArray_destroy(pstra); + return status; + } + } + if (mod_add_u16_prop(pstra, modified_instance, "OnReboot", properties, &data)) { + if (valid_on_reboot(&data, &status) != CMPI_RC_OK) { + cmpiutilStrArray_destroy(pstra); + return status; + } + } + if (mod_add_u16_prop(pstra, modified_instance, "OnCrash", properties, &data)) { + if (valid_on_crash(&data, &status) != CMPI_RC_OK) { + cmpiutilStrArray_destroy(pstra); + return status; + } + } pstrbuf = cmpiutilStrBuf_create(); if (!pstrbuf) { CMSetStatusWithChars(_broker, &status, CMPI_RC_ERROR_SYSTEM, @@ -1024,20 +1133,23 @@ cmpiutilStrBuf_cat(pstrbuf, ") VALUES (", 0); db_sql_insert(pstrbuf, "%Q,", iid); - add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticRecoveryAction", &data); - if (valid_automatic_recovery_action(&data, &status) != CMPI_RC_OK) { - cmpiutilStrBuf_destroy(pstrbuf); - return status; + if (add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticRecoveryAction", &data, 0)) { + if (valid_automatic_recovery_action(&data, &status) != CMPI_RC_OK) { + cmpiutilStrBuf_destroy(pstrbuf); + return status; + } } - add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticShutdownAction", &data); - if (valid_automatic_shutdown_action(&data, &status) != CMPI_RC_OK) { - cmpiutilStrBuf_destroy(pstrbuf); - return status; + if (add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticShutdownAction", &data, 0)) { + if (valid_automatic_shutdown_action(&data, &status) != CMPI_RC_OK) { + cmpiutilStrBuf_destroy(pstrbuf); + return status; + } } - add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticStartupAction", &data); - if (valid_automatic_startup_action(&data, &status) != CMPI_RC_OK) { - cmpiutilStrBuf_destroy(pstrbuf); - return status; + if (add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticStartupAction", &data, 0)) { + if (valid_automatic_startup_action(&data, &status) != CMPI_RC_OK) { + cmpiutilStrBuf_destroy(pstrbuf); + return status; + } } data = CMGetProperty(newinstance, "AutoMaticStartupActionDelay", NULL); if (!CMIsNullValue(data)) { @@ -1056,13 +1168,14 @@ cmpiutilStrBuf_cat(pstrbuf, "NULL,", 0); } - add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticStartupActionSequenceNumber", NULL); + add_u16_prop_to_query(pstrbuf, newinstance, "AutoMaticStartupActionSequenceNumber", NULL, 0); add_str_prop_to_query(pstrbuf, newinstance, "CPUArchitecture", 0); add_str_prop_to_query(pstrbuf, newinstance, "Caption", 0); - add_u16_prop_to_query(pstrbuf, newinstance, "ChangeableType", &data); - if (valid_changeable_type(&data, &status) != CMPI_RC_OK) { - cmpiutilStrBuf_destroy(pstrbuf); - return status; + if (add_u16_prop_to_query(pstrbuf, newinstance, "ChangeableType", &data, 0)) { + if (valid_changeable_type(&data, &status) != CMPI_RC_OK) { + cmpiutilStrBuf_destroy(pstrbuf); + return status; + } } add_str_prop_to_query(pstrbuf, newinstance, "ConfigurationDataRoot", 0); add_str_prop_to_query(pstrbuf, newinstance, "ConfigurationFile", 0); @@ -1091,15 +1204,17 @@ add_str_prop_to_query(pstrbuf, newinstance, "ElementName", 0); add_stra_prop_to_query(pstrbuf, newinstance, "ExtraConfigInfo"); add_str_prop_to_query(pstrbuf, newinstance, "ExtraInstallArgs", 0); - add_u32_prop_to_query(pstrbuf, newinstance, "GraphicsType", &data); - if (valid_graphics_type(&data, &status) != CMPI_RC_OK) { - cmpiutilStrBuf_destroy(pstrbuf); - return status; + if (add_u32_prop_to_query(pstrbuf, newinstance, "GraphicsType", &data)) { + if (valid_graphics_type(&data, &status) != CMPI_RC_OK) { + cmpiutilStrBuf_destroy(pstrbuf); + return status; + } } - add_u32_prop_to_query(pstrbuf, newinstance, "GraphicsViewerType", &data); - if (valid_graphics_viewer_type(&data, &status) != CMPI_RC_OK) { - cmpiutilStrBuf_destroy(pstrbuf); - return status; + if (add_u32_prop_to_query(pstrbuf, newinstance, "GraphicsViewerType", &data)) { + if (valid_graphics_viewer_type(&data, &status) != CMPI_RC_OK) { + cmpiutilStrBuf_destroy(pstrbuf); + return status; + } } add_str_prop_to_query(pstrbuf, newinstance, "LogDataRoot", 0); add_u32_prop_to_query(pstrbuf, newinstance, "MaxMemory", NULL); @@ -1107,10 +1222,11 @@ add_stra_prop_to_query(pstrbuf, newinstance, "Nics"); add_stra_prop_to_query(pstrbuf, newinstance, "Notes"); add_u8_prop_to_query(pstrbuf, newinstance, "NumVCPUs"); - add_u32_prop_to_query(pstrbuf, newinstance, "OSType", &data); - if (valid_os_type(&data, &status) != CMPI_RC_OK) { - cmpiutilStrBuf_destroy(pstrbuf); - return status; + if (add_u32_prop_to_query(pstrbuf, newinstance, "OSType", &data)) { + if (valid_os_type(&data, &status) != CMPI_RC_OK) { + cmpiutilStrBuf_destroy(pstrbuf); + return status; + } } add_str_prop_to_query(pstrbuf, newinstance, "RecoveryFile", 0); add_str_prop_to_query(pstrbuf, newinstance, "ResponseFile", 0); @@ -1120,15 +1236,36 @@ add_str_prop_to_query(pstrbuf, newinstance, "SwapFileDataRoot", 0); add_u32_prop_to_query(pstrbuf, newinstance, "VNCPort", NULL); add_str_prop_to_query(pstrbuf, newinstance, "VNCPassword", 0); - add_u32_prop_to_query(pstrbuf, newinstance, "VirtType", &data); - if (valid_virt_type(&data, &status) != CMPI_RC_OK) { - cmpiutilStrBuf_destroy(pstrbuf); - return status; + if (add_u32_prop_to_query(pstrbuf, newinstance, "VirtType", &data)) { + if (valid_virt_type(&data, &status) != CMPI_RC_OK) { + cmpiutilStrBuf_destroy(pstrbuf); + return status; + } } add_str_prop_to_query(pstrbuf, newinstance, "VirtualSystemIdentifier", 0); - add_str_prop_to_query(pstrbuf, newinstance, "VirtualSystemType", 1); + add_str_prop_to_query(pstrbuf, newinstance, "VirtualSystemType", 0); + if (add_u16_prop_to_query(pstrbuf, newinstance, "OnPowerOff", &data, 0)) { + if (valid_on_power_off(&data, &status) != CMPI_RC_OK) { + cmpiutilStrBuf_destroy(pstrbuf); + return status; + } + } + if (add_u16_prop_to_query(pstrbuf, newinstance, "OnReboot", &data, 0)) { + if (valid_on_reboot(&data, &status) != CMPI_RC_OK) { + cmpiutilStrBuf_destroy(pstrbuf); + return status; + } + } + if (add_u16_prop_to_query(pstrbuf, newinstance, "OnCrash", &data, 1)) { + if (valid_on_crash(&data, &status) != CMPI_RC_OK) { + cmpiutilStrBuf_destroy(pstrbuf); + return status; + } + } cmpiutilStrBuf_cat(pstrbuf, ");", 0); + DEBUGOUT("SQL: %s\n", pstrbuf->bfr); + if (db_exec(pstrbuf->bfr, wkbfr, sizeof(wkbfr)) < 0LL) { DEBUGOUT("CreateInstance(): failed inserting record into " "database: %s", wkbfr); @@ -1236,6 +1373,7 @@ Init( CMPIInstanceMI* self) { + set_debug_for_env(); DEBUGOUT("Initialize() called\n"); /* Delete jobs xref recs for jobs that no longer exist */ @@ -1272,6 +1410,7 @@ MethodInit( CMPIMethodMI * self) { + set_debug_for_env(); DEBUGOUT("MethodInitialize() called\n"); // do work here if necessary ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 sax2
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package sax2 checked in at Fri Nov 28 16:00:46 CET 2008. -------- --- sax2/sax2.changes 2008-11-23 08:17:49.000000000 +0100 +++ sax2/sax2.changes 2008-11-28 12:53:20.000000000 +0100 @@ -1,0 +2,23 @@ +Fri Nov 28 12:52:36 CET 2008 - sndirsch(a)suse.de + +- Radeon 9200 needs 'Option "BusType" "PCI"' on EFIKA/Pegasos PPC + boards (bnc #449938) + +------------------------------------------------------------------- +Fri Nov 28 01:42:10 CET 2008 - sndirsch(a)suse.de + +- use intel driver again, now with Option 'ExaNoComposite' + (bfo #18270) + +------------------------------------------------------------------- +Wed Nov 26 16:50:20 CET 2008 - ms(a)suse.de + +- fixed sysp processing on multiple devices (bnc #448209) + +------------------------------------------------------------------- +Wed Nov 26 14:54:24 CET 2008 - sndirsch(a)suse.de + +- use 'vesa' driver for some POS Intel devices (bnc #448656) +- use NoVirtual profile for Radeon Mobility M6 LY (bnc #448909) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sax2.spec ++++++ --- /var/tmp/diff_new_pack.wV8380/_old 2008-11-28 15:59:51.000000000 +0100 +++ /var/tmp/diff_new_pack.wV8380/_new 2008-11-28 15:59:51.000000000 +0100 @@ -50,7 +50,7 @@ PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq Summary: SuSE advanced X Window System-configuration Version: 8.1 -Release: 541 +Release: 542 Group: System/X11/Utilities License: GPL v2 or later Source: sax2.tar.bz2 @@ -527,6 +527,17 @@ %endif %changelog +* Fri Nov 28 2008 sndirsch(a)suse.de +- Radeon 9200 needs 'Option "BusType" "PCI"' on EFIKA/Pegasos PPC + boards (bnc #449938) +* Fri Nov 28 2008 sndirsch(a)suse.de +- use intel driver again, now with Option 'ExaNoComposite' + (bfo #18270) +* Wed Nov 26 2008 ms(a)suse.de +- fixed sysp processing on multiple devices (bnc #448209) +* Wed Nov 26 2008 sndirsch(a)suse.de +- use 'vesa' driver for some POS Intel devices (bnc #448656) +- use NoVirtual profile for Radeon Mobility M6 LY (bnc #448909) * Sun Nov 23 2008 sndirsch(a)suse.de - added 1600x900 as selectable resolution (bnc #447990) * Fri Nov 21 2008 sndirsch(a)suse.de ++++++ sax2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/libsax/process.cpp new/sax/libsax/process.cpp --- old/sax/libsax/process.cpp 2008-06-24 03:17:53.000000000 +0200 +++ new/sax/libsax/process.cpp 2008-11-26 16:56:00.000000000 +0100 @@ -316,6 +316,9 @@ foreach (line,data) { int id = 0; // QString line (in); + if (line.isEmpty()) { + continue; + } QStringList tokens = QStringList::split ( "=>", line ); QString idstr = tokens.first(); QString data = tokens.last(); @@ -330,6 +333,7 @@ addID (id); val = val.stripWhiteSpace(); key = key.stripWhiteSpace(); + //printf ("+++ %s %s\n",key.toLatin1().data(),val.toLatin1().data()); if (key == "Vesa") { vesa.append (val); vesa.append (","); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/svnbuild new/sax/svnbuild --- old/sax/svnbuild 2008-11-23 08:21:51.000000000 +0100 +++ new/sax/svnbuild 2008-11-28 12:54:30.000000000 +0100 @@ -1 +1 @@ -1779 +1782 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/arch/Identity.map.i386 new/sax/sysp/maps/arch/Identity.map.i386 --- old/sax/sysp/maps/arch/Identity.map.i386 2008-11-14 18:30:16.000000000 +0100 +++ new/sax/sysp/maps/arch/Identity.map.i386 2008-11-28 12:51:48.000000000 +0100 @@ -209,8 +209,8 @@ NAME=ATI&DEVICE=Mach64 VT&VID=0x1002&DID=0x5654&SERVER=ati&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT NAME=ATI&DEVICE=Radeon LW&VID=0x1002&DID=0x4c57&SERVER=radeon&EXT=&OPT=&RAW=Option "XAANoOffscreenPixmaps" "true"&PROFILE=NoVirtual&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT NAME=ATI&DEVICE=Radeon LW&VID=0x1002&DID=0x4c57&SERVER=radeon&EXT=dri&OPT=&RAW=Option "XAANoOffscreenPixmaps" "true"&PROFILE=NoVirtual&SCRIPT3D=&PACKAGE3D=&FLAG=3D -NAME=ATI&DEVICE=Radeon LY&VID=0x1002&DID=0x4c59&SERVER=radeon&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT -NAME=ATI&DEVICE=Radeon LY&VID=0x1002&DID=0x4c59&SERVER=radeon&EXT=dri&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=3D +NAME=ATI&DEVICE=Radeon LY&VID=0x1002&DID=0x4c59&SERVER=radeon&EXT=&OPT=&RAW=&PROFILE=NoVirtual&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT +NAME=ATI&DEVICE=Radeon LY&VID=0x1002&DID=0x4c59&SERVER=radeon&EXT=dri&OPT=&RAW=&PROFILE=NoVirtual&SCRIPT3D=&PACKAGE3D=&FLAG=3D NAME=ATI&DEVICE=Radeon LZ&VID=0x1002&DID=0x4c5a&SERVER=radeon&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT NAME=ATI&DEVICE=Radeon LZ&VID=0x1002&DID=0x4c5a&SERVER=radeon&EXT=dri&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=3D NAME=ATI&DEVICE=RV200 QW&VID=0x1002&DID=0x5157&SERVER=radeon&EXT=&OPT=norenderaccel&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT @@ -559,6 +559,9 @@ # IBM Cards #-----------------------------------# NAME=IBM&DEVICE=855 GM&VID=0x8086&DID=0x3582&SERVER=vesa&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=0x8086&SUBDEVICE=0x3582 +NAME=IBM&DEVICE=i845&VID=0x8086&DID=0x2562&SERVER=vesa&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=0x8086&SUBDEVICE=0x2562 +NAME=IBM&DEVICE=915 G&VID=0x8086&DID=0x2582&SERVER=vesa&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=0x8086&SUBDEVICE=0x2582 +NAME=IBM&DEVICE=855 GM (POS)&VID=0x8086&DID=0x3582&SERVER=vesa&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=0x8086&SUBDEVICE=0x3582 #-----------------------------------# # Imstt Cards @@ -567,6 +570,12 @@ NAME=Imstt&DEVICE=Imstt3D&VID=0x10e0&DID=0x9135&SERVER=imstt&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT #-----------------------------------# +# Intec Cards +#-----------------------------------# +NAME=Intec&DEVICE=845&VID=0x8086&DID=0x2562&SERVER=intel&EXT=&OPT=EXANoComposite&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT +NAME=Intec&DEVICE=845&VID=0x8086&DID=0x2562&SERVER=intel&EXT=&OPT=EXANoComposite&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=3D + +#-----------------------------------# # Intel Corporation Cards #-----------------------------------# NAME=Intel&DEVICE=82810 CGC &VID=0x8086&DID=0x7121&SERVER=intel&EXT=&OPT=&RAW=&PROFILE=Depth16,NoVirtual&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/arch/Identity.map.ppc new/sax/sysp/maps/arch/Identity.map.ppc --- old/sax/sysp/maps/arch/Identity.map.ppc 2008-11-14 18:30:17.000000000 +0100 +++ new/sax/sysp/maps/arch/Identity.map.ppc 2008-11-28 12:51:48.000000000 +0100 @@ -300,6 +300,7 @@ NAME=ATI&DEVICE=RADEON X550&VID=0x1002&DID=0x5B63&SERVER=radeon&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT NAME=ATI&DEVICE=MOBILITY RADEON X600SE&VID=0x1002&DID=0x5462&SERVER=radeon&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT NAME=ATI&DEVICE=Radeon XPRESS 200M 5A62 (PCIE) - Toshiba&VID=0x1002&DID=0x5a62&SERVER=fbdev&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=0x1179&SUBDEVICE=0xff31 +NAME=ATI&DEVICE=RV280 5960 (PPC)&VID=0x1002&DID=0x5960&SERVER=radeon&EXT=&OPT=&RAW=Option "BusType" "PCI"&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=0x1043&SUBDEVICE=0x004c #-----------------------------------# # Chips and Technologies Cards diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/sysp/maps/Identity.map new/sax/sysp/maps/Identity.map --- old/sax/sysp/maps/Identity.map 2008-11-14 18:30:17.000000000 +0100 +++ new/sax/sysp/maps/Identity.map 2008-11-28 12:51:48.000000000 +0100 @@ -209,8 +209,8 @@ NAME=ATI&DEVICE=Mach64 VT&VID=0x1002&DID=0x5654&SERVER=ati&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT NAME=ATI&DEVICE=Radeon LW&VID=0x1002&DID=0x4c57&SERVER=radeon&EXT=&OPT=&RAW=Option "XAANoOffscreenPixmaps" "true"&PROFILE=NoVirtual&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT NAME=ATI&DEVICE=Radeon LW&VID=0x1002&DID=0x4c57&SERVER=radeon&EXT=dri&OPT=&RAW=Option "XAANoOffscreenPixmaps" "true"&PROFILE=NoVirtual&SCRIPT3D=&PACKAGE3D=&FLAG=3D -NAME=ATI&DEVICE=Radeon LY&VID=0x1002&DID=0x4c59&SERVER=radeon&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT -NAME=ATI&DEVICE=Radeon LY&VID=0x1002&DID=0x4c59&SERVER=radeon&EXT=dri&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=3D +NAME=ATI&DEVICE=Radeon LY&VID=0x1002&DID=0x4c59&SERVER=radeon&EXT=&OPT=&RAW=&PROFILE=NoVirtual&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT +NAME=ATI&DEVICE=Radeon LY&VID=0x1002&DID=0x4c59&SERVER=radeon&EXT=dri&OPT=&RAW=&PROFILE=NoVirtual&SCRIPT3D=&PACKAGE3D=&FLAG=3D NAME=ATI&DEVICE=Radeon LZ&VID=0x1002&DID=0x4c5a&SERVER=radeon&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT NAME=ATI&DEVICE=Radeon LZ&VID=0x1002&DID=0x4c5a&SERVER=radeon&EXT=dri&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=3D NAME=ATI&DEVICE=RV200 QW&VID=0x1002&DID=0x5157&SERVER=radeon&EXT=&OPT=norenderaccel&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT @@ -559,6 +559,9 @@ # IBM Cards #-----------------------------------# NAME=IBM&DEVICE=855 GM&VID=0x8086&DID=0x3582&SERVER=vesa&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=0x8086&SUBDEVICE=0x3582 +NAME=IBM&DEVICE=i845&VID=0x8086&DID=0x2562&SERVER=vesa&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=0x8086&SUBDEVICE=0x2562 +NAME=IBM&DEVICE=915 G&VID=0x8086&DID=0x2582&SERVER=vesa&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=0x8086&SUBDEVICE=0x2582 +NAME=IBM&DEVICE=855 GM (POS)&VID=0x8086&DID=0x3582&SERVER=vesa&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT&SUBVENDOR=0x8086&SUBDEVICE=0x3582 #-----------------------------------# # Imstt Cards @@ -567,6 +570,12 @@ NAME=Imstt&DEVICE=Imstt3D&VID=0x10e0&DID=0x9135&SERVER=imstt&EXT=&OPT=&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT #-----------------------------------# +# Intec Cards +#-----------------------------------# +NAME=Intec&DEVICE=845&VID=0x8086&DID=0x2562&SERVER=intel&EXT=&OPT=EXANoComposite&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT +NAME=Intec&DEVICE=845&VID=0x8086&DID=0x2562&SERVER=intel&EXT=&OPT=EXANoComposite&RAW=&PROFILE=&SCRIPT3D=&PACKAGE3D=&FLAG=3D + +#-----------------------------------# # Intel Corporation Cards #-----------------------------------# NAME=Intel&DEVICE=82810 CGC &VID=0x8086&DID=0x7121&SERVER=intel&EXT=&OPT=&RAW=&PROFILE=Depth16,NoVirtual&SCRIPT3D=&PACKAGE3D=&FLAG=DEFAULT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 samba
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package samba checked in at Fri Nov 28 16:00:44 CET 2008. -------- --- samba/samba.changes 2008-11-07 14:59:30.000000000 +0100 +++ samba/samba.changes 2008-11-27 14:15:22.394882000 +0100 @@ -1,0 +2,5 @@ +Thu Nov 27 14:15:19 CET 2008 - ro(a)suse.de + +- update baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.wW9957/_old 2008-11-28 16:00:06.000000000 +0100 +++ /var/tmp/diff_new_pack.wW9957/_new 2008-11-28 16:00:06.000000000 +0100 @@ -26,7 +26,7 @@ License: GPL v3 or later Url: http://www.samba.org/ Version: 3.2.4 -Release: 4 +Release: 5 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.wW9957/_old 2008-11-28 16:00:06.000000000 +0100 +++ /var/tmp/diff_new_pack.wW9957/_new 2008-11-28 16:00:06.000000000 +0100 @@ -51,7 +51,7 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.2.4 -Release: 4 +Release: 5 Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 Recommends: cron logrotate @@ -611,7 +611,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 243 +Release: 244 Requires: perl-ldap %description -n ldapsmb @@ -658,7 +658,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 0.3.6b -Release: 247 +Release: 248 Provides: samba3-vscan = 0.3.6b Obsoletes: samba3-vscan Requires: samba = %{samba_ver} @@ -1659,6 +1659,8 @@ %endif %changelog +* Thu Nov 27 2008 ro(a)suse.de +- update baselibs.conf * Thu Nov 06 2008 anschneider(a)suse.de - Add SuSEfirewall2 services config file to open Netbios and Samba ports on post-10.2 systems; (bnc#247344). ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.wW9957/_old 2008-11-28 16:00:06.000000000 +0100 +++ /var/tmp/diff_new_pack.wW9957/_new 2008-11-28 16:00:06.000000000 +0100 @@ -1,4 +1,3 @@ -libsmbclient libsmbclient0 libtalloc1 libtdb1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rubygems
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package rubygems checked in at Fri Nov 28 15:59:39 CET 2008. -------- --- rubygems/rubygems.changes 2008-09-29 17:01:38.000000000 +0200 +++ rubygems/rubygems.changes 2008-11-28 12:20:00.425526000 +0100 @@ -1,0 +2,74 @@ +Wed Nov 26 12:40:00 CET 2008 - mrueckert(a)suse.de + +- added rubygems macros file for rpm with 2 macros for easier gem + packaging %gem_install and %gem_cleanup. + %gem_install calls gem install with the correct parameters. + %gem_cleanup will delete makefiles and intermediate build files + like object files. + +------------------------------------------------------------------- +Fri Nov 21 21:27:25 CET 2008 - mrueckert(a)suse.de + +- update to rubyems 1.3.1 + * Disregard ownership of ~ under Windows while creating ~/.gem. + Fixes issues related to no uid support under Windows. + * Fix requires for Gem::inflate, Gem::deflate, etc. + * Make Gem.dir respect :gemhome value from config. (Note: this + feature may be removed since it is hard to implement on 1.9.) + * Silence PATH warning. + Deprecation Notices: + * Gem::manage_gems will be removed on or after March 2009. +- additional changes from rubyems 1.3.0 + * RubyGems doesn't print LOCAL/REMOTE titles for `gem query` and + friends if stdout is not a TTY, except with --both. + * Added Gem.find_files, allows a gem to discover features + provided by other gems. + * RubyGems now installs gems into ~/.gem if GEM_HOME is not + writable. Use --no-user-install command-line switch to disable + this behavior. + * Fetching specs for update now uses If-Modified-Since requests. + * RubyGems now updates the ri cache when the rdoc gem is + installed and documentation is generated. + * RubyGems now uses the regexp we already have for `gem list + --installed`. Bug #20876 by Nick Hoffman. + * Platform is now forced to Gem::Platform::RUBY when nil or blank + in the indexer. Fixes various uninstallable gems. + * Fix HTTPS support. Patch #21072 by Alex Arnell. + * RubyGems checks for support of development dependencies for + #to_ruby. Bug #20778 by Evan Weaver. + * Now specifications from the future can be loaded. + * `gem lock --strict` works again. Patch #21814 by Sven + Engelhardt. + * `gem help install` now describes _version_ argument to + executable stubs + * `gem help environment` describes environment variables and + ~/.gemrc and /etc/gemrc + * On-disk gemspecs are now read in UTF-8 and written with a UTF-8 + magic comment + * lib/rubygems/remote_fetcher.rb + - Now uses ~/.gem/cache if the cache dir in GEM_HOME is not + writable. +- additional changes from 1.2.0 + * RubyGems no longer performs bulk updates and instead only + fetches the gemspec files it needs. Alternate sources will + need to upgrade to RubyGems 1.2 to allow RubyGems to take + advantage of the new metadata updater. If a pre 1.2 remote + source is in the sources list, RubyGems will revert to the bulk + update code for compatibility. + * RubyGems now has runtime and development dependency types. Use + #add_development_dependency and #add_runtime_dependency. All + typeless dependencies are considered to be runtime + dependencies. + * RubyGems will now require rubygems/defaults/operating_system.rb + and rubygems/defaults/#{RBX_ENGINE}.rb if they exist. This + allows packagers and ruby implementers to add custom behavior + to RubyGems via these files. (If the RubyGems API is + insufficient, please suggest improvements via the RubyGems + list.) + * /etc/gemrc (and windows equivalent) for global settings + * `gem stale` command that lists gems by last access time + * File modes from gems are now honored, patch #19737 + * `gem install --no-wrappers` followed by `gem install + --wrappers` no longer overwrites executables + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rubygems-1.1.1_buildroot.patch rubygems-1.1.1_install_into_buildroot.patch rubygems-1.1.1.tar.bz2 New: ---- rubygems-1.3.1_buildroot.patch rubygems-1.3.1_install_into_buildroot.patch rubygems-1.3.1.tar.bz2 rubygems.macros ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygems.spec ++++++ --- /var/tmp/diff_new_pack.hB4978/_old 2008-11-28 15:59:01.000000000 +0100 +++ /var/tmp/diff_new_pack.hB4978/_new 2008-11-28 15:59:01.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package rubygems (Version 1.1.1) +# spec file for package rubygems (Version 1.3.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: rubygems -Version: 1.1.1 +Version: 1.3.1 Release: 1 # License: Other uncritical OpenSource License @@ -35,8 +35,9 @@ Source: rubygems-%{version}.tar.bz2 Source1: gem_build_cleanup Source2: rubygems-rpmlintrc -Patch: rubygems-1.1.1_install_into_buildroot.patch -Patch1: rubygems-1.1.1_buildroot.patch +Source3: rubygems.macros +Patch: rubygems-1.3.1_install_into_buildroot.patch +Patch1: rubygems-1.3.1_buildroot.patch # Summary: The Ruby standard for publishing and managing third party libraries @@ -66,7 +67,8 @@ %setup -n %{name}-%{version} %patch %patch1 -find test -type f -perm 0755 -print0 | xargs chmod -v a-x +find test -type f -perm 0755 -print0 | xargs -r0 chmod -v a-x +find -name '._*' -print -delete %build @@ -74,14 +76,16 @@ GEM_HOME=%{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/ \ ruby -rvendor-specific setup.rb --buildroot=%{buildroot} %{__install} -D -m 0755 %{S:1} %{buildroot}%{_bindir}/gem_build_cleanup +%{__install} -D -m 0644 %{S:3} %{buildroot}/etc/rpm/macros.rubygems %clean %{__rm} -rf %{buildroot}; %files %defattr(-,root,root) +%config(noreplace) /etc/rpm/macros.rubygems %doc ChangeLog GPL.txt LICENSE.txt README TODO -%doc test/ pkgs/ +%doc test/ pkgs/ doc/* %{_bindir}/gem_build_cleanup %{_bindir}/gem %dir %{_libdir}/ruby/vendor_ruby/%{rb_ver}/rbconfig/ @@ -97,6 +101,74 @@ %{_libdir}/ruby/gems/%{rb_ver}/doc/rubygems-%{version} %changelog +* Wed Nov 26 2008 mrueckert(a)suse.de +- added rubygems macros file for rpm with 2 macros for easier gem + packaging %%gem_install and %%gem_cleanup. + %%gem_install calls gem install with the correct parameters. + %%gem_cleanup will delete makefiles and intermediate build files + like object files. +* Fri Nov 21 2008 mrueckert(a)suse.de +- update to rubyems 1.3.1 + * Disregard ownership of ~ under Windows while creating ~/.gem. + Fixes issues related to no uid support under Windows. + * Fix requires for Gem::inflate, Gem::deflate, etc. + * Make Gem.dir respect :gemhome value from config. (Note: this + feature may be removed since it is hard to implement on 1.9.) + * Silence PATH warning. + Deprecation Notices: + * Gem::manage_gems will be removed on or after March 2009. +- additional changes from rubyems 1.3.0 + * RubyGems doesn't print LOCAL/REMOTE titles for `gem query` and + friends if stdout is not a TTY, except with --both. + * Added Gem.find_files, allows a gem to discover features + provided by other gems. + * RubyGems now installs gems into ~/.gem if GEM_HOME is not + writable. Use --no-user-install command-line switch to disable + this behavior. + * Fetching specs for update now uses If-Modified-Since requests. + * RubyGems now updates the ri cache when the rdoc gem is + installed and documentation is generated. + * RubyGems now uses the regexp we already have for `gem list + --installed`. Bug #20876 by Nick Hoffman. + * Platform is now forced to Gem::Platform::RUBY when nil or blank + in the indexer. Fixes various uninstallable gems. + * Fix HTTPS support. Patch #21072 by Alex Arnell. + * RubyGems checks for support of development dependencies for + [#]to_ruby. Bug #20778 by Evan Weaver. + * Now specifications from the future can be loaded. + * `gem lock --strict` works again. Patch #21814 by Sven + Engelhardt. + * `gem help install` now describes _version_ argument to + executable stubs + * `gem help environment` describes environment variables and + ~/.gemrc and /etc/gemrc + * On-disk gemspecs are now read in UTF-8 and written with a UTF-8 + magic comment + * lib/rubygems/remote_fetcher.rb + - Now uses ~/.gem/cache if the cache dir in GEM_HOME is not + writable. +- additional changes from 1.2.0 + * RubyGems no longer performs bulk updates and instead only + fetches the gemspec files it needs. Alternate sources will + need to upgrade to RubyGems 1.2 to allow RubyGems to take + advantage of the new metadata updater. If a pre 1.2 remote + source is in the sources list, RubyGems will revert to the bulk + update code for compatibility. + * RubyGems now has runtime and development dependency types. Use + [#]add_development_dependency and #add_runtime_dependency. All + typeless dependencies are considered to be runtime + dependencies. + * RubyGems will now require rubygems/defaults/operating_system.rb + and rubygems/defaults/#{RBX_ENGINE}.rb if they exist. This + allows packagers and ruby implementers to add custom behavior + to RubyGems via these files. (If the RubyGems API is + insufficient, please suggest improvements via the RubyGems + list.) + * /etc/gemrc (and windows equivalent) for global settings + * `gem stale` command that lists gems by last access time + * File modes from gems are now honored, patch #19737 + * `gem install --no-wrappers` followed by `gem install + --wrappers` no longer overwrites executables * Tue Jun 03 2008 mrueckert(a)suse.de - update to rubygems 1.1.1 * Gem.prefix now returns non-nil only when RubyGems was installed @@ -208,7 +280,7 @@ patch from the mailinglist * Sun Oct 01 2006 mrueckert(a)suse.de - install into vendor_ruby -* Fri Jun 30 2006 mrueckert(a)suse.de +* Thu Jun 29 2006 mrueckert(a)suse.de - package %%{_libdir}/ruby/%%{rb_ver}/rbconfig * Thu Jun 29 2006 mrueckert(a)suse.de - update to version 0.9.0: @@ -249,12 +321,12 @@ * Fixed prefix handling for native expressions (patch by Aaron Patterson). * Fixed several Upgrade => Update typos. -* Wed Jun 21 2006 mrueckert(a)suse.de +* Tue Jun 20 2006 mrueckert(a)suse.de - no longer bump the version. we use a virtual provide now to make sure the --build-root patch is applied -* Tue Jun 20 2006 ro(a)suse.de +* Mon Jun 19 2006 ro(a)suse.de - fix filelist for last change -* Tue Jun 20 2006 mrueckert(a)suse.de +* Mon Jun 19 2006 mrueckert(a)suse.de - added %%{_libdir}/ruby/gems/%%{rb_ver}/doc/ * Wed Jun 07 2006 mrueckert(a)suse.de - added rubygems-0.8.11_buildroot.patch: @@ -262,12 +334,12 @@ Backport of my patch against CVS HEAD * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Fri Sep 02 2005 mrueckert(a)suse.de +* Thu Sep 01 2005 mrueckert(a)suse.de - dont install into site_ruby - remove the site_ruby entries * Mon Aug 22 2005 mrueckert(a)suse.de - added missing %%dir entry in the file list -* Mon Aug 22 2005 ro(a)suse.de +* Sun Aug 21 2005 ro(a)suse.de - added ruby-devel to nfb * Tue Aug 16 2005 mrueckert(a)suse.de - Update to version 0.8.11 ++++++ rubygems-1.1.1_buildroot.patch -> rubygems-1.3.1_buildroot.patch ++++++ --- rubygems/rubygems-1.1.1_buildroot.patch 2008-09-29 17:01:37.000000000 +0200 +++ rubygems/rubygems-1.3.1_buildroot.patch 2008-11-28 12:20:00.409024000 +0100 @@ -1,7 +1,7 @@ Index: lib/rubygems/install_update_options.rb =================================================================== ---- lib/rubygems/install_update_options.rb.orig 2008-02-20 20:27:40.000000000 +0100 -+++ lib/rubygems/install_update_options.rb 2008-06-03 17:40:05.081140605 +0200 +--- lib/rubygems/install_update_options.rb.orig 2008-06-24 20:56:30.000000000 +0200 ++++ lib/rubygems/install_update_options.rb 2008-11-21 23:29:36.949017634 +0100 @@ -31,6 +31,12 @@ module Gem::InstallUpdateOptions options[:bin_dir] = File.expand_path(value) end @@ -17,52 +17,63 @@ 'install') do |value, options| Index: lib/rubygems/installer.rb =================================================================== ---- lib/rubygems/installer.rb.orig 2008-03-29 02:10:33.000000000 +0100 -+++ lib/rubygems/installer.rb 2008-06-03 17:40:29.530633867 +0200 -@@ -75,7 +75,13 @@ class Gem::Installer +--- lib/rubygems/installer.rb.orig 2008-10-10 20:22:39.000000000 +0200 ++++ lib/rubygems/installer.rb 2008-11-21 23:30:35.937015743 +0100 +@@ -106,9 +106,10 @@ class Gem::Installer @format_executable = options[:format_executable] @security_policy = options[:security_policy] @wrappers = options[:wrappers] - @bin_dir = options[:bin_dir] + @bin_dir = options[:bin_dir] || Gem.bindir(@gem_home) + @development = options[:development] + @source_index = options[:source_index] + @build_root = options[:build_root] + + begin + @format = Gem::Format.from_file_by_path @gem, @security_policy +@@ -116,6 +117,13 @@ class Gem::Installer + raise Gem::InstallError, "invalid gem format for #{@gem}" + end + ++ + unless @build_root.nil? or @build_root == "" + @build_root = Pathname.new((a)build_root).expand_path + @gem_home = File.join(@build_root,@gem_home) + @bin_dir = File.join(@build_root,@bin_dir) + end - ++ begin - @format = Gem::Format.from_file_by_path @gem, @security_policy + FileUtils.mkdir_p @gem_home + rescue Errno::EACCESS, Errno::ENOTDIR Index: lib/rubygems/commands/install_command.rb =================================================================== ---- lib/rubygems/commands/install_command.rb.orig 2008-03-28 22:29:50.000000000 +0100 -+++ lib/rubygems/commands/install_command.rb 2008-06-03 17:40:05.213148667 +0200 -@@ -60,6 +60,7 @@ class Gem::Commands::InstallCommand < Ge +--- lib/rubygems/commands/install_command.rb.orig 2008-09-10 23:55:28.000000000 +0200 ++++ lib/rubygems/commands/install_command.rb 2008-11-21 23:29:36.977015529 +0100 +@@ -72,6 +72,7 @@ version is also installed. :format_executable => options[:format_executable], :ignore_dependencies => options[:ignore_dependencies], :install_dir => options[:install_dir], + :build_root => options[:build_root], :security_policy => options[:security_policy], :wrappers => options[:wrappers], - :bin_dir => options[:bin_dir] + :bin_dir => options[:bin_dir], Index: lib/rubygems/dependency_installer.rb =================================================================== ---- lib/rubygems/dependency_installer.rb.orig 2008-04-05 03:10:11.000000000 +0200 -+++ lib/rubygems/dependency_installer.rb 2008-06-03 17:40:05.313154775 +0200 -@@ -43,6 +43,7 @@ class Gem::DependencyInstaller - @format_executable = options[:format_executable] - @ignore_dependencies = options[:ignore_dependencies] +--- lib/rubygems/dependency_installer.rb.orig 2008-08-12 23:50:22.000000000 +0200 ++++ lib/rubygems/dependency_installer.rb 2008-11-21 23:29:36.997016383 +0100 +@@ -65,6 +65,7 @@ class Gem::DependencyInstaller + @installed_gems = [] + @install_dir = options[:install_dir] || Gem.dir + @build_root = options[:build_root] - @security_policy = options[:security_policy] - @wrappers = options[:wrappers] - @bin_dir = options[:bin_dir] -@@ -203,6 +204,7 @@ class Gem::DependencyInstaller - :format_executable => @format_executable, + @cache_dir = options[:cache_dir] || @install_dir + end + +@@ -241,6 +242,7 @@ class Gem::DependencyInstaller + :format_executable => @format_executable, :ignore_dependencies => @ignore_dependencies, - :install_dir => @install_dir, -+ :build_root => @build_root, - :security_policy => @security_policy, - :wrappers => @wrappers, - :bin_dir => @bin_dir + :install_dir => @install_dir, ++ :build_root => @build_root, + :security_policy => @security_policy, + :source_index => @source_index, + :user_install => @user_install, ++++++ rubygems-1.1.1_install_into_buildroot.patch -> rubygems-1.3.1_install_into_buildroot.patch ++++++ --- rubygems/rubygems-1.1.1_install_into_buildroot.patch 2008-09-29 17:01:37.000000000 +0200 +++ rubygems/rubygems-1.3.1_install_into_buildroot.patch 2008-11-28 12:20:00.409024000 +0100 @@ -1,51 +1,61 @@ Index: setup.rb =================================================================== ---- setup.rb.orig 2008-04-02 01:22:20.000000000 +0200 -+++ setup.rb 2008-06-03 17:09:33.941352779 +0200 -@@ -37,6 +37,9 @@ if ARGV.include? '--help' or ARGV.includ - puts " --prefix=DIR Prefix path for installing RubyGems" - puts " Will not affect gem repository location" - puts -+ puts " --buildroot=DIR Temporary root directory for the installation (for packager)" -+ puts " Will not affect gem repository" -+ puts - puts " --no-format-executable Force installation as `gem`" - puts - puts " --no-rdoc Don't build RDoc for RubyGems" -@@ -97,11 +100,34 @@ else - lib_dir = File.join prefix, 'lib' - bin_dir = File.join prefix, 'bin' - -- mkdir_p lib_dir -- mkdir_p bin_dir -+# mkdir_p lib_dir -+# mkdir_p bin_dir -+ end -+end -+ -+unless ARGV.grep(/^--buildroot/).empty? then -+ prefix = nil -+ -+ prefix_arg = ARGV.grep(/^--buildroot=/).first -+ if prefix_arg =~ /^--buildroot=(.*)/ then -+ prefix = $1 -+ else -+ path_index = ARGV.index '--buildroot' -+ prefix = ARGV[path_index + 1] +--- setup.rb.orig 2008-07-11 10:08:08.000000000 +0200 ++++ setup.rb 2008-11-21 22:00:26.465514960 +0100 +@@ -29,7 +29,8 @@ opts = GetoptLong.new( + [ '--no-rdoc', GetoptLong::NO_ARGUMENT ], + [ '--no-ri', GetoptLong::NO_ARGUMENT ], + [ '--vendor', GetoptLong::NO_ARGUMENT ], +- [ '--destdir', GetoptLong::REQUIRED_ARGUMENT ] ++ [ '--destdir', GetoptLong::REQUIRED_ARGUMENT ], ++ [ '--buildroot', GetoptLong::REQUIRED_ARGUMENT ] + ) + + prefix = '' +@@ -63,6 +64,8 @@ Options: + (Requires Ruby 1.8.7) + --destdir Root directory to install rubygems into + Used mainly for packaging RubyGems ++ (For backwards compatibility we also ++ support --buildroot.) + HELP + exit 0 + +@@ -87,6 +90,8 @@ HELP + + when '--destdir' + install_destdir = File.expand_path(arg) ++ when '--buildroot' ++ install_destdir = File.expand_path(arg) end -+ -+ prefix = File.expand_path prefix -+ -+ raise "invalid --buildroot #{prefix.inspect}" if prefix.nil? -+ -+ # we can be sure it is not nil here -+ bin_dir = File.join(prefix, bin_dir) -+ lib_dir = File.join(prefix, lib_dir) end -+mkdir_p lib_dir -+mkdir_p bin_dir -+ - Dir.chdir 'lib' do - lib_files = Dir[File.join('**', '*rb')] +@@ -95,11 +100,11 @@ require 'rbconfig' + require 'tmpdir' + require 'pathname' + ++top_dir = Pathname.new(RbConfig::TOPDIR || RbConfig::CONFIG["prefix"]) + unless install_destdir.empty? then + default_dir = Pathname.new(Gem.default_dir) +- top_dir = Pathname.new(RbConfig::TOPDIR) + ENV['GEM_HOME'] ||= File.join(install_destdir, +- default_dir.relative_path_from(top_dir)) ++ default_dir) + end + + include FileUtils::Verbose +@@ -137,12 +142,11 @@ else + end + + unless install_destdir.empty? +- top_dir = Pathname.new(RbConfig::TOPDIR) + lib_dir_p = Pathname.new(lib_dir) + bin_dir_p = Pathname.new(bin_dir) + +- lib_dir = File.join install_destdir, lib_dir_p.relative_path_from(top_dir) +- bin_dir = File.join install_destdir, bin_dir_p.relative_path_from(top_dir) ++ lib_dir = File.join install_destdir, lib_dir_p ++ bin_dir = File.join install_destdir, bin_dir_p + end + mkdir_p lib_dir ++++++ rubygems-1.1.1.tar.bz2 -> rubygems-1.3.1.tar.bz2 ++++++ ++++ 15942 lines of diff (skipped) ++++++ rubygems.macros ++++++ %gem_install /usr/bin/gem install --local --verbose --local --build-root=%{buildroot} %gem_cleanup /usr/bin/gem_build_cleanup %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_name}-%{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 ruby
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package ruby checked in at Fri Nov 28 15:59:35 CET 2008. -------- --- ruby/ruby.changes 2008-09-06 14:39:27.000000000 +0200 +++ ruby/ruby.changes 2008-11-21 20:37:50.973017000 +0100 @@ -1,0 +2,12 @@ +Fri Nov 21 20:37:17 CET 2008 - mrueckert(a)suse.de + +- add ruby-1.8.7-p72_topdir.patch: + Config::TOPDIR was broken on lib64 systems as the code was + assuming $prefix/lib. + +------------------------------------------------------------------- +Fri Nov 21 17:03:25 CET 2008 - mrueckert(a)suse.de + +- added more ruby macros in /etc/rpm/macros.ruby + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- ruby-1.8.7-p72_topdir.patch ruby.macros ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ruby.spec ++++++ --- /var/tmp/diff_new_pack.zN2265/_old 2008-11-28 15:57:03.000000000 +0100 +++ /var/tmp/diff_new_pack.zN2265/_new 2008-11-28 15:57:03.000000000 +0100 @@ -20,7 +20,7 @@ Name: ruby Version: 1.8.7.p72 -Release: 1 +Release: 5 # %define pkg_version 1.8.7 %define patch_level p72 @@ -61,12 +61,14 @@ Patch5: ruby_1.8.6.p36_date_remove_privat.patch Patch6: ruby-pedantic-headers.diff Patch7: ruby-1.8.7-p72_vendor_specific.patch +Patch8: ruby-1.8.7-p72_topdir.patch # vendor ruby files taken from: # http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/ Source3: site-specific.rb Source4: vendor-specific.rb # Source5: ruby-rpmlintrc +Source6: ruby.macros %if 0%{?with_bleak_house} #Source6: bleak_house-%{bleak_house_version}.tar.bz2 %endif @@ -235,6 +237,7 @@ %patch5 %patch6 %patch7 +%patch8 %if 0%{?with_bleak_house} for patch in valgrind configure gc ; do patch -p0 < bleak_house-%{bleak_house_version}/ruby/${patch}.patch @@ -342,6 +345,7 @@ %fdupes %{buildroot} %endif chmod -v a-x %{buildroot}%{_libdir}/ruby/%{rb_ver}/%{rb_arch}/*.h +%{__install} -D -m 0644 %{S:6} %{buildroot}/etc/rpm/macros.ruby %post -p /sbin/ldconfig @@ -349,6 +353,7 @@ %files %defattr(-,root,root) +%config(noreplace) /etc/rpm/macros.ruby %{_bindir}/* %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/%{rb_ver} @@ -518,6 +523,12 @@ %doc %{_docdir}/%{name}/examples %changelog +* Fri Nov 21 2008 mrueckert(a)suse.de +- add ruby-1.8.7-p72_topdir.patch: + Config::TOPDIR was broken on lib64 systems as the code was + assuming $prefix/lib. +* Fri Nov 21 2008 mrueckert(a)suse.de +- added more ruby macros in /etc/rpm/macros.ruby * Sat Sep 06 2008 mrueckert(a)suse.de - update to 1.8.7p72 vendor_ruby support now officially included @@ -539,7 +550,7 @@ - Fixes File access vulnerability of WEBrick (CVE-2008-1145) (bnc#368618) - ensure that the rss module adds the xml namespace -* Fri Dec 07 2007 mrueckert(a)suse.de +* Thu Dec 06 2007 mrueckert(a)suse.de - update to 1.8.6.p111 bugfix release. important changes: - ssl fixes (see notes on the ssl patch below) @@ -574,7 +585,7 @@ * avoid executing shell in the testsuite * moved definition of rb_thread_status() to avoid errors in C++ extensions. -* Mon Aug 06 2007 mrueckert(a)suse.de +* Sun Aug 05 2007 mrueckert(a)suse.de - update to 1.8.6.p36: many bugfixes and library updates. hilights: === Library updates (outstanding ones only) @@ -788,7 +799,7 @@ this leads to trouble with our build system. * Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Mon Jan 16 2006 kukuk(a)suse.de +* Sun Jan 15 2006 kukuk(a)suse.de - Use eaccess() from glibc [#143291] * Sun Jan 15 2006 mrueckert(a)suse.de - disabled the big test suite as we trigger @@ -797,7 +808,7 @@ - Update to 1.8.4 - dont run with --default-kcode=utf8 triggers a bug in the test suite -* Fri Sep 23 2005 mrueckert(a)suse.de +* Thu Sep 22 2005 mrueckert(a)suse.de - update to 1.8.3 - updated patches for 1.8.3 - ruby-doc tarball now included as tar.bz2 @@ -857,7 +868,7 @@ * Mon Feb 02 2004 mge(a)suse.de - update to 1.8.1 also fixes Bug #34226: Readline support missing from ruby -* Sun Jan 11 2004 adrian(a)suse.de +* Sat Jan 10 2004 adrian(a)suse.de - add %%defattr * Mon Aug 04 2003 mge(a)suse.de - update tp 1.8.0 @@ -896,7 +907,7 @@ * Wed Dec 13 2000 schwab(a)suse.de - Add %%suse_update_config. - Fix computation of stack limit. -* Tue Dec 05 2000 mge(a)suse.de +* Mon Dec 04 2000 mge(a)suse.de - update to 1.6.1, manual 1.4.6 * Thu Jul 06 2000 mge(a)suse.de - initial SuSE RPM ++++++ ruby-1.8.7-p72_topdir.patch ++++++ Index: mkconfig.rb =================================================================== --- mkconfig.rb.orig 2008-11-21 19:55:28.000000000 +0100 +++ mkconfig.rb 2008-11-21 20:34:41.653180779 +0100 @@ -22,6 +22,7 @@ def (config = "").write(arg) end $stdout = config +configured_prefix = "" fast = {'prefix'=>TRUE, 'ruby_install_name'=>TRUE, 'INSTALL'=>TRUE, 'EXEEXT'=>TRUE} print %[ # This file was created by #{mkconfig} when ruby was built. Any @@ -86,6 +87,7 @@ File.foreach "config.status" do |line| val.gsub!(/ +(?!-)/, "=") if name == "configure_args" && /mswin32/ =~ RUBY_PLATFORM val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump if /^prefix$/ =~ name + configured_prefix = val val = "(TOPDIR || DESTDIR + #{val})" end v = " CONFIG[\"#{name}\"] #{vars[name] ? '<< "\n"' : '='} #{val}\n" @@ -103,7 +105,7 @@ end drive = File::PATH_SEPARATOR == ';' prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM -print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n" +print " TOPDIR = #{configured_prefix}\n" print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n" print " CONFIG = {}\n" print " CONFIG[\"DESTDIR\"] = DESTDIR\n" ++++++ ruby.macros ++++++ %rb_arch %(echo %{_host_cpu}-linux | sed -e "s/i686/i586/" -e "s/armv5tel/armv4l/" -e "s/hppa2.0/hppa/") %rb_ver %(/usr/bin/ruby -e 'puts VERSION.sub(/\\\.\\\d$/, "")') # %rb_dir %{_libdir}/ruby/ %rb_libdir %{_libdir}/ruby/%{rb_ver}/ %rb_archdir %{_libdir}/ruby/%{rb_ver}/%{rb_arch} # %rb_sitedir %{_libdir}/ruby/site_ruby %rb_sitelib %{rb_sitedir}/%{rb_ver} %rb_sitearch %{rb_sitedir}/%{rb_ver}/%{rb_arch} # %rb_vendordir %{_libdir}/ruby/vendor_ruby %rb_vendorlib %{rb_vendordir}/%{rb_ver} %rb_vendorarch %{rb_vendordir}/%{rb_ver}/%{rb_arch} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rpcbind
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package rpcbind checked in at Fri Nov 28 15:58:52 CET 2008. -------- --- rpcbind/rpcbind.changes 2008-11-05 14:50:23.000000000 +0100 +++ rpcbind/rpcbind.changes 2008-11-26 14:19:26.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 26 14:18:06 CET 2008 - mkoenig(a)suse.de + +- specify runlevel in chkconfig check [bnc#444663] + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpcbind.spec ++++++ --- /var/tmp/diff_new_pack.ck1262/_old 2008-11-28 15:56:37.000000000 +0100 +++ /var/tmp/diff_new_pack.ck1262/_new 2008-11-28 15:56:37.000000000 +0100 @@ -24,7 +24,7 @@ Group: Productivity/Networking/System AutoReqProv: on Version: 0.1.6+git20080930 -Release: 2 +Release: 3 Summary: Transport independent RPC portmapper Url: http://nfsv4.bullopensource.org/doc/tirpc_rpcbind.php Source: %{name}-%{version}.tar.bz2 @@ -86,8 +86,8 @@ %pre # upgrade case from portmap -if test -x /sbin/portmap && chkconfig -c portmap; then - chkconfig -f -s portmap off +if test -x /sbin/portmap && chkconfig -c portmap 3; then + /sbin/insserv -f -r portmap fi %preun @@ -113,6 +113,8 @@ %{_datadir}/omc/svcinfo.d/rpcbind.xml %changelog +* Wed Nov 26 2008 mkoenig(a)suse.de +- specify runlevel in chkconfig check [bnc#444663] * Wed Nov 05 2008 mkoenig(a)suse.de - fix version comparison in Obsoletes [bnc#440313] - disable portmap service in pre script to avoid problems when ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 qtcurve-gtk2
by root＠Hilbert.suse.de 28 Nov '08

28 Nov '08

Hello community, here is the log from the commit of package qtcurve-gtk2 checked in at Fri Nov 28 15:56:50 CET 2008. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2008-10-19 03:49:22.000000000 +0200 +++ qtcurve-gtk2/qtcurve-gtk2.changes 2008-11-25 17:55:09.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 25 17:22:26 CET 2008 - sbrabec(a)suse.cz + +- Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.Sq1132/_old 2008-11-28 15:56:34.000000000 +0100 +++ /var/tmp/diff_new_pack.Sq1132/_new 2008-11-28 15:56:34.000000000 +0100 @@ -25,7 +25,7 @@ Group: System/GUI/GNOME Summary: QtCurve style for Gtk2 Version: 0.59.7 -Release: 1 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-Gtk2-%{version}.tar.bz2 Patch2: fixme.diff @@ -81,6 +81,8 @@ %pref/share/themes/QtCurve %changelog +* Tue Nov 25 2008 sbrabec(a)suse.cz +- Supplement gtk2-32bit/gtk2-64bit in baselibs.conf (bnc#354164). * Sun Oct 19 2008 mboman(a)suse.de - Update to version 0.59.7: + Read tooltip colours from qt config file. ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.Sq1132/_old 2008-11-28 15:56:34.000000000 +0100 +++ /var/tmp/diff_new_pack.Sq1132/_new 2008-11-28 15:56:34.000000000 +0100 @@ -1 +1,2 @@ qtcurve-gtk2 + supplements "packageand(qtcurve-gtk2:gtk2-<targettype>)" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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