[gnome-panel/f14/master] 2.32.0.2
Matthias Clasen
mclasen at fedoraproject.org
Wed Sep 29 14:58:01 UTC 2010
commit 7e37c5057b08f2f198814bcb6955bd94181a4524
Author: Matthias Clasen <mclasen at redhat.com>
Date: Wed Sep 29 10:54:20 2010 -0400
2.32.0.2
.gitignore | 1 +
gnome-panel-libs.patch | 6 ++--
gnome-panel.spec | 16 +++++---------
icon-padding.patch | 52 ++++++++++++++++++++++++------------------------
sources | 2 +-
5 files changed, 37 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d1a41bd..cd4c63a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
gnome-panel-2.31.4.tar.bz2
gnome-panel-2.31.6.tar.bz2
/gnome-panel-2.31.90.tar.bz2
+/gnome-panel-2.32.0.2.tar.bz2
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch
index 90ba286..734ad25 100644
--- a/gnome-panel-libs.patch
+++ b/gnome-panel-libs.patch
@@ -1,6 +1,6 @@
-diff -up gnome-panel-2.31.2/configure.in.libs gnome-panel-2.31.2/configure.in
---- gnome-panel-2.31.2/configure.in.libs 2010-05-26 14:17:31.000000000 -0400
-+++ gnome-panel-2.31.2/configure.in 2010-05-28 01:06:01.347433767 -0400
+diff -up gnome-panel-2.31.2/configure.ac.libs gnome-panel-2.31.2/configure.ac
+--- gnome-panel-2.31.2/configure.ac.libs 2010-05-26 14:17:31.000000000 -0400
++++ gnome-panel-2.31.2/configure.ac 2010-05-28 01:06:01.347433767 -0400
@@ -72,7 +72,7 @@ dnl pkg-config dependency checks
PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0)
diff --git a/gnome-panel.spec b/gnome-panel.spec
index 5f4cc29..5880836 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,11 +21,11 @@
Summary: GNOME panel
Name: gnome-panel
-Version: 2.31.90
-Release: 5%{?dist}
+Version: 2.32.0.2
+Release: 1%{?dist}
URL: http://www.gnome.org
#VCS: git:git://git.gnome.org/gnome-panel
-Source0: http://download.gnome.org/sources/gnome-panel/2.31/%{name}-%{version}.tar.bz2
+Source0: http://download.gnome.org/sources/gnome-panel/2.32/%{name}-%{version}.tar.bz2
Source3: redhat-panel-default-setup.entries
Source4: gnome-compiler-flags.m4
@@ -123,11 +123,6 @@ Patch45: icon-padding.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=537798
Patch47: fix-clock-crash.patch
-Patch48: gnome-panel-libs.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=621413
-Patch49: dont-unload-modules.patch
-
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -174,8 +169,6 @@ Panel Applets using the libpanel-applet library.
%patch43 -p1 -b .panel-padding
%patch45 -p1 -b .icon-padding
%patch47 -p1 -b .fix-clock-crash
-%patch48 -p1 -b .libs
-%patch49 -p1 -b .dont-unload-modules
cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
cp -f %{SOURCE4} m4
@@ -366,6 +359,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
%{_datadir}/gir-1.0/PanelApplet-3.0.gir
%changelog
+* Wed Sep 29 2010 Matthias Clasen <mclasen at redhat.com> - 2.32.0.2-1
+- Update to 2.32.0.2
+
* Mon Sep 27 2010 Matthias Clasen <mclasen at redhat.com> - 2.31.90-5
- Rebuild against newer evolution-data-server
diff --git a/icon-padding.patch b/icon-padding.patch
index 3d719b6..fade92f 100644
--- a/icon-padding.patch
+++ b/icon-padding.patch
@@ -1,6 +1,6 @@
-diff -up gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding gnome-panel-2.31.90/applets/notification_area/main.c
---- gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding 2010-06-22 19:00:27.000000000 -0400
-+++ gnome-panel-2.31.90/applets/notification_area/main.c 2010-09-10 13:51:43.226233000 -0400
+diff -up gnome-panel-2.32.0.2/applets/notification_area/main.c.icon-padding gnome-panel-2.32.0.2/applets/notification_area/main.c
+--- gnome-panel-2.32.0.2/applets/notification_area/main.c.icon-padding 2010-06-22 19:00:27.000000000 -0400
++++ gnome-panel-2.32.0.2/applets/notification_area/main.c 2010-09-29 10:18:00.074194002 -0400
@@ -25,6 +25,7 @@
#include <panel-applet.h>
@@ -78,11 +78,11 @@ diff -up gnome-panel-2.31.90/applets/notification_area/main.c.icon-padding gnome
panel_applet_set_background_widget (applet, GTK_WIDGET (applet));
force_no_focus_padding (GTK_WIDGET (applet));
-diff -up gnome-panel-2.31.90/applets/notification_area/Makefile.am.icon-padding gnome-panel-2.31.90/applets/notification_area/Makefile.am
---- gnome-panel-2.31.90/applets/notification_area/Makefile.am.icon-padding 2010-06-22 19:00:27.000000000 -0400
-+++ gnome-panel-2.31.90/applets/notification_area/Makefile.am 2010-09-10 14:01:14.729233000 -0400
-@@ -78,6 +78,24 @@ org.gnome.panel.applet.NotificationAreaA
- $< > $@
+diff -up gnome-panel-2.32.0.2/applets/notification_area/Makefile.am.icon-padding gnome-panel-2.32.0.2/applets/notification_area/Makefile.am
+--- gnome-panel-2.32.0.2/applets/notification_area/Makefile.am.icon-padding 2010-09-20 11:49:51.000000000 -0400
++++ gnome-panel-2.32.0.2/applets/notification_area/Makefile.am 2010-09-29 10:20:53.180194003 -0400
+@@ -94,6 +94,24 @@ org.gnome.panel.applet.NotificationAreaA
+ $< > $@
endif
+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
@@ -106,9 +106,9 @@ diff -up gnome-panel-2.31.90/applets/notification_area/Makefile.am.icon-padding
uidir = $(datadir)/gnome-panel/ui
ui_DATA = notification-area-menu.xml
-diff -up gnome-panel-2.31.90/applets/notification_area/na-tray.c.icon-padding gnome-panel-2.31.90/applets/notification_area/na-tray.c
---- gnome-panel-2.31.90/applets/notification_area/na-tray.c.icon-padding 2010-06-22 19:00:27.000000000 -0400
-+++ gnome-panel-2.31.90/applets/notification_area/na-tray.c 2010-09-10 13:40:27.216233000 -0400
+diff -up gnome-panel-2.32.0.2/applets/notification_area/na-tray.c.icon-padding gnome-panel-2.32.0.2/applets/notification_area/na-tray.c
+--- gnome-panel-2.32.0.2/applets/notification_area/na-tray.c.icon-padding 2010-06-22 19:00:27.000000000 -0400
++++ gnome-panel-2.32.0.2/applets/notification_area/na-tray.c 2010-09-29 10:18:00.077194002 -0400
@@ -624,6 +624,8 @@ na_tray_constructor (GType type,
{
trays_screens [screen_number].tray_manager = tray_manager;
@@ -135,9 +135,9 @@ diff -up gnome-panel-2.31.90/applets/notification_area/na-tray.c.icon-padding gn
na_tray_force_redraw (NaTray *tray)
{
NaTrayPrivate *priv = tray->priv;
-diff -up gnome-panel-2.31.90/applets/notification_area/na-tray.h.icon-padding gnome-panel-2.31.90/applets/notification_area/na-tray.h
---- gnome-panel-2.31.90/applets/notification_area/na-tray.h.icon-padding 2010-02-09 07:32:08.000000000 -0500
-+++ gnome-panel-2.31.90/applets/notification_area/na-tray.h 2010-09-10 13:40:27.218233000 -0400
+diff -up gnome-panel-2.32.0.2/applets/notification_area/na-tray.h.icon-padding gnome-panel-2.32.0.2/applets/notification_area/na-tray.h
+--- gnome-panel-2.32.0.2/applets/notification_area/na-tray.h.icon-padding 2010-02-09 07:32:08.000000000 -0500
++++ gnome-panel-2.32.0.2/applets/notification_area/na-tray.h 2010-09-29 10:18:00.078194002 -0400
@@ -60,6 +60,8 @@ NaTray *na_tray_new_for_screen
void na_tray_set_orientation (NaTray *tray,
GtkOrientation orientation);
@@ -147,10 +147,10 @@ diff -up gnome-panel-2.31.90/applets/notification_area/na-tray.h.icon-padding gn
void na_tray_force_redraw (NaTray *tray);
G_END_DECLS
-diff -up gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c.icon-padding gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c
---- gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c.icon-padding 2010-06-22 19:00:27.000000000 -0400
-+++ gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c 2010-09-10 13:40:27.220233000 -0400
-@@ -662,6 +662,32 @@ na_tray_manager_set_visual_property (NaT
+diff -up gnome-panel-2.32.0.2/applets/notification_area/na-tray-manager.c.icon-padding gnome-panel-2.32.0.2/applets/notification_area/na-tray-manager.c
+--- gnome-panel-2.32.0.2/applets/notification_area/na-tray-manager.c.icon-padding 2010-09-02 04:29:09.000000000 -0400
++++ gnome-panel-2.32.0.2/applets/notification_area/na-tray-manager.c 2010-09-29 10:18:00.080194002 -0400
+@@ -664,6 +664,32 @@ na_tray_manager_set_visual_property (NaT
#endif
}
@@ -183,7 +183,7 @@ diff -up gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c.icon-pa
#ifdef GDK_WINDOWING_X11
static gboolean
-@@ -707,7 +733,8 @@ na_tray_manager_manage_screen_x11 (NaTra
+@@ -709,7 +735,8 @@ na_tray_manager_manage_screen_x11 (NaTra
na_tray_manager_set_orientation_property (manager);
na_tray_manager_set_visual_property (manager);
@@ -193,7 +193,7 @@ diff -up gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c.icon-pa
window = gtk_widget_get_window (invisible);
timestamp = gdk_x11_get_server_time (window);
-@@ -848,6 +875,20 @@ na_tray_manager_set_orientation (NaTrayM
+@@ -850,6 +877,20 @@ na_tray_manager_set_orientation (NaTrayM
}
}
@@ -214,9 +214,9 @@ diff -up gnome-panel-2.31.90/applets/notification_area/na-tray-manager.c.icon-pa
GtkOrientation
na_tray_manager_get_orientation (NaTrayManager *manager)
{
-diff -up gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h.icon-padding gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h
---- gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h.icon-padding 2010-02-09 07:32:08.000000000 -0500
-+++ gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h 2010-09-10 13:40:27.222233000 -0400
+diff -up gnome-panel-2.32.0.2/applets/notification_area/na-tray-manager.h.icon-padding gnome-panel-2.32.0.2/applets/notification_area/na-tray-manager.h
+--- gnome-panel-2.32.0.2/applets/notification_area/na-tray-manager.h.icon-padding 2010-02-09 07:32:08.000000000 -0500
++++ gnome-panel-2.32.0.2/applets/notification_area/na-tray-manager.h 2010-09-29 10:18:00.081194002 -0400
@@ -55,6 +55,7 @@ struct _NaTrayManager
GtkWidget *invisible;
GdkScreen *screen;
@@ -234,9 +234,9 @@ diff -up gnome-panel-2.31.90/applets/notification_area/na-tray-manager.h.icon-pa
G_END_DECLS
-diff -up gnome-panel-2.31.90/applets/notification_area/notification_area_applet.schemas.in.icon-padding gnome-panel-2.31.90/applets/notification_area/notification_area_applet.schemas.in
---- gnome-panel-2.31.90/applets/notification_area/notification_area_applet.schemas.in.icon-padding 2010-09-10 13:40:27.223233000 -0400
-+++ gnome-panel-2.31.90/applets/notification_area/notification_area_applet.schemas.in 2010-09-10 13:40:27.223233000 -0400
+diff -up gnome-panel-2.32.0.2/applets/notification_area/notification_area_applet.schemas.in.icon-padding gnome-panel-2.32.0.2/applets/notification_area/notification_area_applet.schemas.in
+--- gnome-panel-2.32.0.2/applets/notification_area/notification_area_applet.schemas.in.icon-padding 2010-09-29 10:18:00.082194002 -0400
++++ gnome-panel-2.32.0.2/applets/notification_area/notification_area_applet.schemas.in 2010-09-29 10:18:00.083194002 -0400
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<gconfschemafile>
diff --git a/sources b/sources
index 3feda9b..8541b88 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ced6cb95c57d156cc86d78d34c0325c gnome-panel-2.31.90.tar.bz2
+c5759370aa3dadb050c3f8b6ca1fd1b0 gnome-panel-2.32.0.2.tar.bz2
More information about the scm-commits
mailing list