2006-11-06 Damien Carbery <
[email protected]>
* gnome-python.spec: Bump to 2.16.2.
* gnome-speech.spec: Bump to 0.4.6.
* gnome-utils.spec: Bump to 2.16.2. Remove upstream patch,
05-dictionary-multihead.
* patches/gnome-utils-05-dictionary-multihead.diff: Removed, upstream.
--- a/ChangeLog Mon Nov 06 14:08:04 2006 +0000
+++ b/ChangeLog Mon Nov 06 17:15:48 2006 +0000
@@ -1,3 +1,11 @@
+2006-11-06 Damien Carbery <[email protected]>
+
+ * gnome-python.spec: Bump to 2.16.2.
+ * gnome-speech.spec: Bump to 0.4.6.
+ * gnome-utils.spec: Bump to 2.16.2. Remove upstream patch,
+ 05-dictionary-multihead.
+ * patches/gnome-utils-05-dictionary-multihead.diff: Removed, upstream.
+
2006-11-06 Damien Carbery <[email protected]>
* gnome-python.spec: Bump to 2.16.1.
--- a/gnome-python.spec Mon Nov 06 14:08:04 2006 +0000
+++ b/gnome-python.spec Mon Nov 06 17:15:48 2006 +0000
@@ -8,7 +8,7 @@
Name: gnome-python
License: LGPL
Group: System/Library
-Version: 2.16.1
+Version: 2.16.2
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -104,6 +104,9 @@
%changelog -n gnome-python
* Mon Nov 06 2006 - [email protected]
+- Bump to 2.16.2.
+
+* Mon Nov 06 2006 - [email protected]
- Bump to 2.16.1.
* Tue Sep 05 2006 - [email protected]
--- a/gnome-speech.spec Mon Nov 06 14:08:04 2006 +0000
+++ b/gnome-speech.spec Mon Nov 06 17:15:48 2006 +0000
@@ -8,7 +8,7 @@
Name: gnome-speech
License: LGPL
Group: System/Libraries
-Version: 0.4.5
+Version: 0.4.6
Release: 201
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -109,6 +109,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Nov 06 2006 - [email protected]
+- Bump to 0.4.6.
+
* Tue Aug 29 2006 - [email protected]
- Bump to 0.4.5.
--- a/gnome-utils.spec Mon Nov 06 14:08:04 2006 +0000
+++ b/gnome-utils.spec Mon Nov 06 17:15:48 2006 +0000
@@ -8,7 +8,7 @@
Name: gnome-utils
License: GPL
Group: System/GUI/GNOME
-Version: 2.16.1
+Version: 2.16.2
Release: 2
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -22,7 +22,6 @@
Patch2: gnome-utils-02-gnome-screenshot.diff
Patch3: gnome-utils-03-search-menu-entry.diff
Patch4: gnome-utils-04-logview-monitor.diff
-Patch5: gnome-utils-05-dictionary-multihead.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -60,7 +59,6 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%build
%ifos linux
@@ -150,6 +148,9 @@
%{_libdir}/pkgconfig
%changelog
+* Mon Nov 06 2006 - [email protected]
+- Bump to 2.16.2. Remove upstream patch, 05-dictionary-multihead..
+
* Mon Oct 16 2006 - [email protected]
- Remove the '-f' from the 'rm *.la *.a' lines so that any changes to the
module source will be seen as a build error and action can be taken.
--- a/patches/gnome-utils-05-dictionary-multihead.diff Mon Nov 06 14:08:04 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-diff -urN gnome-utils-2.16.1/gnome-dictionary/src/gdict-about.c gnome-utils-2.16.1-hacked/gnome-dictionary/src/gdict-about.c
---- gnome-utils-2.16.1/gnome-dictionary/src/gdict-about.c 2006-06-11 12:35:24.000000000 +0000
-+++ gnome-utils-2.16.1-hacked/gnome-dictionary/src/gdict-about.c 2006-10-17 00:49:36.741533000 +0000
-@@ -83,5 +83,6 @@
- "logo-icon-name", "gnome-dictionary",
- "license", license,
- "wrap-license", TRUE,
-+ "screen", gtk_widget_get_screen (parent),
- NULL);
- }
-diff -urN gnome-utils-2.16.1/gnome-dictionary/src/gdict-applet.c gnome-utils-2.16.1-hacked/gnome-dictionary/src/gdict-applet.c
---- gnome-utils-2.16.1/gnome-dictionary/src/gdict-applet.c 2006-08-20 13:36:20.000000000 +0000
-+++ gnome-utils-2.16.1-hacked/gnome-dictionary/src/gdict-applet.c 2006-10-17 00:48:05.156216000 +0000
-@@ -427,6 +427,8 @@
-
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
- {
-+ gtk_window_set_screen (GTK_WINDOW (priv->window),
-+ gtk_widget_get_screen (GTK_WIDGET (applet)));
- gtk_window_present (GTK_WINDOW (priv->window));
- gtk_widget_grab_focus (priv->defbox);
-
-@@ -744,7 +746,7 @@
- GdictApplet *applet,
- const gchar *cname)
- {
-- gdict_show_pref_dialog (NULL,
-+ gdict_show_pref_dialog (GTK_WIDGET(applet),
- _("Dictionary Preferences"),
- applet->priv->loader);
- }
-@@ -754,7 +756,7 @@
- GdictApplet *applet,
- const gchar *cname)
- {
-- gdict_show_about_dialog (NULL);
-+ gdict_show_about_dialog (GTK_WIDGET(applet));
- }
-
- static void
-diff -urN gnome-utils-2.16.1/gnome-dictionary/src/gdict-pref-dialog.c gnome-utils-2.16.1-hacked/gnome-dictionary/src/gdict-pref-dialog.c
---- gnome-utils-2.16.1/gnome-dictionary/src/gdict-pref-dialog.c 2006-08-20 13:36:20.000000000 +0000
-+++ gnome-utils-2.16.1-hacked/gnome-dictionary/src/gdict-pref-dialog.c 2006-10-17 00:48:05.161519000 +0000
-@@ -715,13 +715,12 @@
- }
-
- void
--gdict_show_pref_dialog (GtkWindow *parent,
-+gdict_show_pref_dialog (GtkWidget *parent,
- const gchar *title,
- GdictSourceLoader *loader)
- {
- GtkWidget *dialog;
-
-- g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
- g_return_if_fail (GDICT_IS_SOURCE_LOADER (loader));
-
- if (parent)
-@@ -742,9 +741,9 @@
- G_CALLBACK (gtk_widget_hide_on_delete),
- NULL);
-
-- if (parent)
-+ if (parent && GTK_IS_WINDOW(parent))
- {
-- gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
-+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW(parent));
- gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
- g_object_set_data_full (G_OBJECT (parent), "gdict-pref-dialog",
- dialog,
-@@ -753,6 +752,8 @@
- else
- global_dialog = dialog;
- }
--
-- gtk_window_present (GTK_WINDOW (dialog));
-+
-+ gtk_window_set_screen (GTK_WINDOW (dialog),
-+ gtk_widget_get_screen (parent));
-+ gtk_window_present (dialog);
- }
-diff -urN gnome-utils-2.16.1/gnome-dictionary/src/gdict-pref-dialog.h gnome-utils-2.16.1-hacked/gnome-dictionary/src/gdict-pref-dialog.h
---- gnome-utils-2.16.1/gnome-dictionary/src/gdict-pref-dialog.h 2006-07-24 00:38:01.000000000 +0000
-+++ gnome-utils-2.16.1-hacked/gnome-dictionary/src/gdict-pref-dialog.h 2006-10-17 00:48:05.163842000 +0000
-@@ -56,7 +56,7 @@
-
- GType gdict_pref_dialog_get_type (void) G_GNUC_CONST;
-
--void gdict_show_pref_dialog (GtkWindow *parent,
-+void gdict_show_pref_dialog (GtkWidget *parent,
- const gchar *title,
- GdictSourceLoader *loader);
-
-diff -urN gnome-utils-2.16.1/gnome-dictionary/src/gdict-window.c gnome-utils-2.16.1-hacked/gnome-dictionary/src/gdict-window.c
---- gnome-utils-2.16.1/gnome-dictionary/src/gdict-window.c 2006-08-25 11:39:48.000000000 +0000
-+++ gnome-utils-2.16.1-hacked/gnome-dictionary/src/gdict-window.c 2006-10-17 00:48:05.283287000 +0000
-@@ -804,7 +804,7 @@
- {
- g_assert (GDICT_IS_WINDOW (window));
-
-- gdict_show_pref_dialog (GTK_WINDOW (window),
-+ gdict_show_pref_dialog (GTK_WIDGET(window),
- _("Dictionary Preferences"),
- window->loader);
- }