2008-01-15 Damien Carbery <
[email protected]>
* base-specs/gnome-panel.spec, base-specs/libwnck.spec,
base-specs/gnome-desktop.spec: Bump to 2.21.5.
* patches/gnome-panel-02-fish-applet.diff,
patches/gnome-desktop-01-jds-about-branding.diff: Rework.
* base-specs/gnome-menus.spec: Bump to 2.21.5. Remove upstream patch,
04-gio.
* patches/gnome-menus-04-gio.diff: Removed, upstream.
--- a/ChangeLog Tue Jan 15 09:06:40 2008 +0000
+++ b/ChangeLog Tue Jan 15 14:33:12 2008 +0000
@@ -1,3 +1,13 @@
+2008-01-15 Damien Carbery <[email protected]>
+
+ * base-specs/gnome-panel.spec, base-specs/libwnck.spec,
+ base-specs/gnome-desktop.spec: Bump to 2.21.5.
+ * patches/gnome-panel-02-fish-applet.diff,
+ patches/gnome-desktop-01-jds-about-branding.diff: Rework.
+ * base-specs/gnome-menus.spec: Bump to 2.21.5. Remove upstream patch,
+ 04-gio.
+ * patches/gnome-menus-04-gio.diff: Removed, upstream.
+
2008-01-15 Damien Carbery <[email protected]>
* base-specs/gnome-terminal.spec, base-specs/gnome-games.spec,
--- a/base-specs/gnome-desktop.spec Tue Jan 15 09:06:40 2008 +0000
+++ b/base-specs/gnome-desktop.spec Tue Jan 15 14:33:12 2008 +0000
@@ -1,7 +1,7 @@
#
# spec file for package gnome-desktop
#
-# Copyright 2007 Sun Microsystems, Inc.
+# Copyright 2008 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,7 +11,7 @@
Name: gnome-desktop
License: LGPL
Group: System/Libraries/GNOME
-Version: 2.21.4
+Version: 2.21.5
Release: 1
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -175,6 +175,8 @@
%{_libdir}/libgnome-desktop-2.so
%changelog
+* Tue Jan 15 2008 - [email protected]
+- Bump to 2.21.5.
* Wed Dec 19 2007 - [email protected]
- Bump to 2.21.4.
* Tue Nov 13 2007 - [email protected]
--- a/base-specs/gnome-menus.spec Tue Jan 15 09:06:40 2008 +0000
+++ b/base-specs/gnome-menus.spec Tue Jan 15 14:33:12 2008 +0000
@@ -9,7 +9,7 @@
Name: gnome-menus
License: LGPL
Group: System/GUI/GNOME
-Version: 2.21.3
+Version: 2.21.5
Release: 3
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -22,8 +22,6 @@
Patch2: gnome-menus-02-application-submenu-rename.diff
# date:2006-04-28 owner:gman type:branding
Patch3: gnome-menus-03-preferences.diff
-# date:2008-01-09 owner:dcarbery type:bug state:upstream
-Patch4: gnome-menus-04-gio.diff
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -72,7 +70,6 @@
%if %option_with_sun_branding
%patch3 -p1
%endif
-%patch4 -p1
%build
%ifos linux
@@ -144,6 +141,9 @@
%{_includedir}/gnome-menus/*
%changelog
+* Tue Jan 15 2008 - [email protected]
+- Bump to 2.21.5. Remove upstream patch, 04-gio.
+
* Tue Jan 08 2008 - [email protected]
- Add upstream patch, 04-gio, to use correct gio variable type.
--- a/base-specs/gnome-panel.spec Tue Jan 15 09:06:40 2008 +0000
+++ b/base-specs/gnome-panel.spec Tue Jan 15 14:33:12 2008 +0000
@@ -1,7 +1,7 @@
#
# spec file for package gnome-panel
#
-# Copyright 2007 Sun Microsystems, Inc.
+# Copyright 2008 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,12 +11,12 @@
Name: gnome-panel
License: GPL
Group: System/GUI/GNOME
-Version: 2.20.1
+Version: 2.21.5
Release: 2
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
Summary: The GNOME Panel
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.20/gnome-panel-%{version}.tar.bz2
+Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-panel/2.21/gnome-panel-%{version}.tar.bz2
%if %option_with_sun_branding
Source1: gnome-main-menu.png
%endif
@@ -243,6 +243,8 @@
%{_mandir}/man3/*
%changelog
+* Tue Jan 15 2008 - [email protected]
+- Bump to 2.21.5.
* Mon Dec 10 2007 - [email protected]
- Add patch which fixes : bugster:6632252 bugzilla:342474
* Fri Nov 09 2007 - [email protected]
--- a/base-specs/libwnck.spec Tue Jan 15 09:06:40 2008 +0000
+++ b/base-specs/libwnck.spec Tue Jan 15 14:33:12 2008 +0000
@@ -1,7 +1,7 @@
#
# spec file for package libwnck
#
-# Copyright (c) 2005 Sun Microsystems, Inc.
+# Copyright (c) 2008 Sun Microsystems, Inc.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,7 +10,7 @@
Name: libwnck
License: GPL
Group: System/Libraries/GNOME
-Version: 2.21.2.1
+Version: 2.21.5
Release: 2
Distribution: Java Desktop System
Vendor: Sun Microsystems, Inc.
@@ -112,6 +112,8 @@
%{_datadir}/gtk-doc
%changelog
+* Tue Jan 15 2008 - [email protected]
+- Bump to 2.21.5.
* Wed Nov 14 2007 - [email protected]
- Bump to 2.21.2.1.
* Tue Nov 13 2007 - [email protected]
--- a/patches/gnome-desktop-01-jds-about-branding.diff Tue Jan 15 09:06:40 2008 +0000
+++ b/patches/gnome-desktop-01-jds-about-branding.diff Tue Jan 15 14:33:12 2008 +0000
@@ -1,5 +1,5 @@
---- gnome-desktop-2.21.2.old/Makefile.am 2007-11-19 17:16:14.655547000 +0000
-+++ gnome-desktop-2.21.2/Makefile.am 2007-11-19 17:17:29.263500000 +0000
+--- gnome-desktop-2.21.5.old/Makefile.am 2007-11-19 17:16:14.655547000 +0000
++++ gnome-desktop-2.21.5/Makefile.am 2007-11-19 17:17:29.263500000 +0000
@@ -1,5 +1,10 @@
ACLOCAL_AMFLAGS = -I m4
@@ -301,15 +301,15 @@
self.width = current_x + 10
self.height = current_y
-@@ -856,7 +882,7 @@
+@@ -906,7 +906,7 @@
main_box.pack_start (welcome_label)
descriptions_label = VertAnimatedLabel (self.description_messages,
-- 300, 120, 8000, "%s")
-+ 402, 184, 8000, "%s")
+- 300, 120,
++ 402, 184,
+ DESCRIPTION_DELAY, "%s")
welcome_label.connect ("button-press-event",
descriptions_label.on_button_press)
- box = gtk.EventBox ()
@@ -929,6 +955,7 @@
"minor" : "",
"micro" : "",
--- a/patches/gnome-menus-04-gio.diff Tue Jan 15 09:06:40 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
---- trunk/libmenu/menu-monitor-gio.c 2007/12/14 14:53:01 810
-+++ trunk/libmenu/menu-monitor-gio.c 2008/01/08 12:41:59 825
-@@ -68,8 +68,8 @@
- void
- menu_monitor_backend_register_monitor (MenuMonitor *monitor)
- {
-- GObject *backend = NULL;
- GFile *file;
-+ GFileMonitor *file_monitor;
-
- file = g_file_new_for_path (menu_monitor_get_path (monitor));
-
-@@ -82,47 +82,33 @@
- }
-
- if (menu_monitor_get_is_directory (monitor))
-- {
-- GDirectoryMonitor *dmonitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL);
--
-- if (dmonitor)
-- backend = G_OBJECT (dmonitor);
-- }
-+ file_monitor = g_file_monitor_directory (file, G_FILE_MONITOR_NONE, NULL);
- else
-- {
-- GFileMonitor *fmonitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL);
--
-- if (fmonitor)
-- backend = G_OBJECT (fmonitor);
-- }
-+ file_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL);
-
- g_object_unref (G_OBJECT (file));
-
-- if (backend == NULL)
-+ if (file_monitor == NULL)
- {
- menu_verbose ("Not adding %s monitor on '%s', failed to create monitor\n",
- menu_monitor_get_is_directory (monitor) ? "directory" : "file",
- menu_monitor_get_path (monitor));
- return;
- }
--
-- g_signal_connect (backend, "changed", G_CALLBACK (monitor_callback), monitor);
-
-- menu_monitor_set_backend_data (monitor, backend);
-+ g_signal_connect (file_monitor, "changed", G_CALLBACK (monitor_callback), monitor);
-+
-+ menu_monitor_set_backend_data (monitor, file_monitor);
- }
-
- void
- menu_monitor_backend_unregister_monitor (MenuMonitor *monitor)
- {
-- GObject *backend;
-+ GFileMonitor *file_monitor;
-
-- if ((backend = G_OBJECT (menu_monitor_get_backend_data (monitor))) != NULL)
-+ if ((file_monitor = menu_monitor_get_backend_data (monitor)) != NULL)
- {
-- if (G_IS_FILE_MONITOR (backend))
-- g_file_monitor_cancel (G_FILE_MONITOR (backend));
-- else
-- g_directory_monitor_cancel (G_DIRECTORY_MONITOR (backend));
--
-- g_object_unref (backend);
-+ g_file_monitor_cancel (file_monitor);
-+ g_object_unref (file_monitor);
- }
- }
--- a/patches/gnome-panel-02-fish-applet.diff Tue Jan 15 09:06:40 2008 +0000
+++ b/patches/gnome-panel-02-fish-applet.diff Tue Jan 15 14:33:12 2008 +0000
@@ -7,17 +7,17 @@
notification_area \
wncklet
---- gnome-panel-2.19.5.old/configure.in 2007-01-29 15:36:28.151347000 +0000
-+++ gnome-panel-2.19.5/configure.in 2007-01-29 15:38:18.742484000 +0000
-@@ -289,7 +289,6 @@
- applets/Makefile
+--- gnome-panel-2.21.5.old/configure.in 2007-01-29 15:36:28.151347000 +0000
++++ gnome-panel-2.21.5/configure.in 2007-01-29 15:38:18.742484000 +0000
+@@ -339,7 +339,6 @@
applets/clock/Makefile
applets/clock/e-map/Makefile
+ applets/clock/pixmaps/Makefile
-applets/fish/Makefile
applets/notification_area/Makefile
applets/wncklet/Makefile
doc/Makefile
-@@ -296,22 +296,17 @@
+@@ -347,22 +347,17 @@
doc/reference/panel-applet/Makefile
help/Makefile
help/clock/Makefile