Hello community, here is the log from the commit of package libgnome checked in at Tue Apr 17 00:37:31 CEST 2007. -------- --- GNOME/libgnome/libgnome.changes 2007-03-23 16:09:10.000000000 +0100 +++ /mounts/work_src_done/STABLE/libgnome/libgnome.changes 2007-04-16 16:45:27.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 16 16:44:44 CEST 2007 - sbrabec@suse.cz + +- Do not patch autogenerated files. Fixes default theme and default + soundlist. + +------------------------------------------------------------------- Old: ---- libgnome-2.6-sounds-default.diff libgnome_preconf.dif pixmaps.dif New: ---- libgnome_preconf.diff libgnome-sounds-default.diff pixmaps.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgnome.spec ++++++ --- /var/tmp/diff_new_pack.i29825/_old 2007-04-17 00:37:19.000000000 +0200 +++ /var/tmp/diff_new_pack.i29825/_new 2007-04-17 00:37:19.000000000 +0200 @@ -15,15 +15,15 @@ License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/GNOME Version: 2.18.0 -Release: 1 +Release: 6 Summary: The GNOME 2.x Desktop Base Libraries URL: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: %{name}-%{version}.tar.bz2 -Patch: pixmaps.dif +Patch: pixmaps.diff Patch2: libgnome-default-handlers.patch -Patch3: libgnome_preconf.dif -Patch4: libgnome-2.6-sounds-default.diff +Patch3: libgnome_preconf.diff +Patch4: libgnome-sounds-default.diff Patch6: libgnome-uninitialized-vars.patch Patch7: libgnome-sentinel.patch Patch8: libgnome-va_list-empty.patch @@ -68,7 +68,7 @@ %setup -q %patch -p1 %patch2 -p1 -%patch3 -p1 +%patch3 %patch4 %patch6 %patch7 -p1 @@ -138,6 +138,9 @@ %{_datadir}/gtk-doc/html/libgnome %changelog +* Mon Apr 16 2007 - sbrabec@suse.cz +- Do not patch autogenerated files. Fixes default theme and default + soundlist. * Wed Mar 21 2007 - maw@suse.de - Update to version 2.18.0 - Duplicated #includes removed from several files ++++++ libgnome-default-handlers.patch ++++++ --- /var/tmp/diff_new_pack.i29825/_old 2007-04-17 00:37:20.000000000 +0200 +++ /var/tmp/diff_new_pack.i29825/_new 2007-04-17 00:37:20.000000000 +0200 @@ -1,15 +1,3 @@ -diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' libgnome-2.5.1.orig/schemas/desktop_gnome_applications_browser.schemas libgnome-2.5.1/schemas/desktop_gnome_applications_browser.schemas ---- libgnome-2.5.1.orig/schemas/desktop_gnome_applications_browser.schemas 2003-12-08 09:51:38.000000000 -0500 -+++ libgnome-2.5.1/schemas/desktop_gnome_applications_browser.schemas 2003-12-19 12:51:23.000000000 -0500 -@@ -6,7 +6,7 @@ - <applyto>/desktop/gnome/applications/browser/exec</applyto> - <owner>gnome</owner> - <type>string</type> -- <default>mozilla</default> -+ <default>firefox</default> - <locale name="C"> - <short>Default browser</short> - <long>Default browser for all URLs</long> diff -Nru -x '*~' -x '*.o' -x '*.orig' -x '*.rej' libgnome-2.5.1.orig/schemas/desktop_gnome_applications_browser.schemas.in libgnome-2.5.1/schemas/desktop_gnome_applications_browser.schemas.in --- libgnome-2.5.1.orig/schemas/desktop_gnome_applications_browser.schemas.in 2003-12-08 09:51:38.000000000 -0500 +++ libgnome-2.5.1/schemas/desktop_gnome_applications_browser.schemas.in 2003-12-19 12:51:23.000000000 -0500 ++++++ libgnome_preconf.diff ++++++ --- schemas/desktop_gnome_background.schemas.in +++ schemas/desktop_gnome_background.schemas.in @@ -16,7 +16,7 @@ <applyto>/desktop/gnome/background/picture_options</applyto> <owner>gnome</owner> <type>string</type> - <default>wallpaper</default> + <default>stretched</default> <locale name="C"> <short>Picture Options</short> <long>Determines how the image set by wallpaper_filename is @@ -29,7 +29,7 @@ <applyto>/desktop/gnome/background/picture_filename</applyto> <owner>gnome</owner> <type>string</type> - <default></default> + <default>/usr/share/wallpapers/default-1600x1200.jpg</default> <locale name="C"> <short>Picture Filename</short> <long>File to use for the background image</long> @@ -51,7 +51,7 @@ <applyto>/desktop/gnome/background/primary_color</applyto> <owner>gnome</owner> <type>string</type> - <default>#76848F</default> + <default>#39374b</default> <locale name="C"> <short>Primary Color</short> <long>Left or Top color when drawing gradients, or the solid color.</long> @@ -62,7 +62,7 @@ <applyto>/desktop/gnome/background/secondary_color</applyto> <owner>gnome</owner> <type>string</type> - <default>#7F7F7F</default> + <default>#42528f</default> <locale name="C"> <short>Secondary Color</short> <long>Right or Bottom color when drawing gradients, not used for solid color.</long> --- schemas/desktop_gnome_file_views.schemas.in +++ schemas/desktop_gnome_file_views.schemas.in @@ -6,7 +6,7 @@ <applyto>/desktop/gnome/file_views/icon_theme</applyto> <owner>gnome</owner> <type>string</type> - <default>crux_teal</default> + <default>Industrial</default> <locale name="C"> <short>File Icon Theme</short> <long>Theme used for displaying file icons</long> --- schemas/desktop_gnome_interface.schemas.in.in +++ schemas/desktop_gnome_interface.schemas.in.in @@ -130,7 +130,7 @@ <applyto>/desktop/gnome/interface/icon_theme</applyto> <owner>gnome</owner> <type>string</type> - <default>gnome</default> + <default>Industrial</default> <locale name="C"> <short>Icon Theme</short> <long>Icon theme to use for the panel, nautilus etc.</long> @@ -141,7 +141,7 @@ <applyto>/desktop/gnome/interface/gtk_theme</applyto> <owner>gnome</owner> <type>string</type> - <default>Clearlooks</default> + <default>Gilouche</default> <locale name="C"> <short>Gtk+ Theme</short> <long>Basename of the default theme used by gtk+.</long> ++++++ libgnome-sounds-default.diff ++++++ --- gnome-data/gnome-2.soundlist.in +++ gnome-data/gnome-2.soundlist.in @@ -10,21 +10,21 @@ _description=Log out [info] -file=info.wav +file= _description=Informational message [warning] -file=warning.wav +file= _description=Warning message [error] -file=error.wav +file=warning.wav _description=Error message [question] -file=question.wav +file= _description=Question dialog [generic] -file=generic.wav +file= _description=Miscellaneous message --- gnome-data/gtk-events-2.soundlist.in +++ gnome-data/gtk-events-2.soundlist.in @@ -2,13 +2,13 @@ _description=User interface events [clicked] -file=gtk-events/clicked.wav +file= _description=Click on command button [activate] -file=gtk-events/activate.wav +file= _description=Choose menu item [toggled] -file=gtk-events/toggled.wav +file= _description=Select check box --- schemas/desktop_gnome_sound.schemas.in +++ schemas/desktop_gnome_sound.schemas.in @@ -29,7 +29,7 @@ <applyto>/desktop/gnome/sound/enable_esd</applyto> <owner>gnome</owner> <type>bool</type> - <default>false</default> + <default>true</default> <locale name="C"> <short>Enable ESD</short> <long>Enable sound server startup.</long> @@ -40,7 +40,7 @@ <applyto>/desktop/gnome/sound/event_sounds</applyto> <owner>gnome</owner> <type>bool</type> - <default>false</default> + <default>true</default> <locale name="C"> <short>Sounds for events</short> <long>Whether to play sounds on user events.</long> ++++++ pixmaps.diff ++++++ diff -ruN libgnome-2.2.0.1/libgnome/gnome-program.c libgnome-n/libgnome/gnome-program.c --- libgnome-2.2.0.1/libgnome/gnome-program.c Thu Feb 13 14:20:27 2003 +++ libgnome-n/libgnome/gnome-program.c Thu Feb 13 15:27:14 2003 @@ -996,16 +996,21 @@ ADD_FILENAME (fnbuf); } } - if (retval != NULL && ret_locations == NULL) + if (retval != NULL && ret_locations == NULL ) goto out; /* Now check the GNOME_PATH. */ for (ptr = program->_priv->gnome_path; search_path && ptr && *ptr; ptr++) { g_snprintf (fnbuf, sizeof (fnbuf), "%s%s/%s", *ptr, prefix_rel, file_name); +/* printf("%s%s/%s",*ptr,prefix_rel, file_name); */ - if (!only_if_exists || g_file_test (fnbuf, G_FILE_TEST_EXISTS)) - ADD_FILENAME (fnbuf); + if (!only_if_exists || g_file_test (fnbuf, G_FILE_TEST_EXISTS)) + { ADD_FILENAME (fnbuf); } else { + g_snprintf (fnbuf, sizeof (fnbuf), "%s/%s", + *ptr,file_name); + if (!only_if_exists || g_file_test (fnbuf, G_FILE_TEST_EXISTS)) + ADD_FILENAME (fnbuf); } } if (retval && !ret_locations) goto out; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org