2.21.5

9 files changed, 14 insertions, 257 deletions

diff --git a/.cvsignore b/.cvsignore
index 5300989..434ebc3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-panel-2.20.2.tar.bz2
+gnome-panel-2.21.5.tar.bz2
diff --git a/dont-build-clock.patch b/dont-build-clock.patch
deleted file mode 100644
index 4b88fe6..0000000
--- a/dont-build-clock.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -up gnome-panel-2.20.0.1/Makefile.am.replace-clock-by-intlclock gnome-panel-2.20.0.1/Makefile.am
-diff -up gnome-panel-2.20.0.1/applets/Makefile.am.replace-clock-by-intlclock gnome-panel-2.20.0.1/applets/Makefile.am
---- gnome-panel-2.20.0.1/applets/Makefile.am.replace-clock-by-intlclock	2007-10-05 10:04:56.000000000 -0400
-+++ gnome-panel-2.20.0.1/applets/Makefile.am	2007-10-05 10:05:03.000000000 -0400
-@@ -1,5 +1,4 @@
- SUBDIRS =		\
--	clock		\
- 	fish		\
- 	notification_area \
- 	wncklet
diff --git a/gnome-panel-2.19.5-launcher-tooltip.patch b/gnome-panel-2.19.5-launcher-tooltip.patch
deleted file mode 100644
index 60e6e44..0000000
--- a/gnome-panel-2.19.5-launcher-tooltip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up gnome-panel-2.19.5/gnome-panel/panel-util.c.launcher-tooltip gnome-panel-2.19.5/gnome-panel/panel-util.c
---- gnome-panel-2.19.5/gnome-panel/panel-util.c.launcher-tooltip	2007-07-24 13:16:07.000000000 -0400
-+++ gnome-panel-2.19.5/gnome-panel/panel-util.c	2007-07-24 13:16:10.000000000 -0400
-@@ -1580,6 +1580,12 @@ void
- panel_util_set_tooltip_text (GtkWidget  *widget,
- 			     const char *text)
- {
-+        g_signal_handlers_disconnect_matched (widget,
-+                                              G_SIGNAL_MATCH_FUNC,
-+                                              0, 0, NULL,
-+					      panel_util_query_tooltip_cb,
-+                                              NULL);
-+
- 	if (string_empty (text)) {
- 		g_object_set (widget, "has-tooltip", FALSE, NULL);
- 		return;
diff --git a/gnome-panel.spec b/gnome-panel.spec
index ace997f..4ea9186 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -18,22 +18,13 @@
 %define gnome_doc_utils_version 0.3.2
 
 %define use_evolution_data_server 1
-%define build_intlclock 1
 
 Summary: GNOME panel
 Name: gnome-panel
-Version: 2.20.2
-Release: 2%{?dist} 
+Version: 2.21.5
+Release: 1%{?dist} 
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-panel/2.20/%{name}-%{version}.tar.bz2
-# we are upstream for this
-Source1: timezone.tar.gz
-# Novell intlclock, I don't think this has a canonical upstream location
-Source2: intlclock-20071113.tar.gz
-Patch98: timezone-changes.patch
-Patch100: dont-build-clock.patch
-Patch101: intlclock-build-fixes.patch
-Patch102: gweather-api.patch
+Source0: http://download.gnome.org/sources/gnome-panel/2.21/%{name}-%{version}.tar.bz2
 
 Source3: redhat-panel-default-setup.entries
 Source4: gnome-compiler-flags.m4
@@ -90,14 +81,10 @@ BuildRequires: evolution-data-server-devel >= %{evolution_data_server_version}
 BuildRequires: ORBit2-devel >= %{orbit_version}
 BuildRequires: dbus-devel >= %{dbus_version}
 %endif
-
-%if %{build_intlclock}
-# for intlclock
 BuildRequires: PolicyKit-devel
-BuildRequires: gnome-applets-devel 
+BuildRequires: libgweather-devel
 BuildRequires: librsvg2-devel
 BuildRequires: NetworkManager-devel
-%endif
 
 Patch0: gnome-panel-2.19.5-vendor.patch
 Patch1: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch
@@ -157,12 +144,6 @@ Panel Applets using the libpanel-applet library.
 
 %prep
 %setup -q -n %{name}-%{version}
-tar xzf %{SOURCE1}
-pushd timezone
-%patch98 -p1 -b .timezone-changes
-popd
-
-tar xzf %{SOURCE2}
 
 %patch0 -p1 -b .vendor
 %patch1 -p1 -b .speak-to-us-ye-old-wise-fish
@@ -177,10 +158,6 @@ tar xzf %{SOURCE2}
 %patch11 -p1 -b .applet-error
 %patch12 -p1 -b .more-sharp-icons
 
-%patch100 -p1 -b .dont-build-clock
-%patch101 -p1 -b .intlclock-build-fixes
-%patch102 -p1 -b .gweather-api
-
 . %{SOURCE6}
 
 cp -f %{SOURCE3} gnome-panel/panel-default-setup.entries
@@ -204,22 +181,6 @@ autoconf
 
 make
 
-%if %{build_intlclock}
-pushd timezone
-make
-popd
-
-pushd intlclock-1.0
-intltoolize --force --copy
-aclocal
-automake --add-missing
-autoheader
-autoconf
-%configure
-make
-popd
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -227,16 +188,6 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-%if %{build_intlclock}
-pushd timezone
-make DESTDIR=$RPM_BUILD_ROOT install
-popd
-
-pushd intlclock-1.0
-make DESTDIR=$RPM_BUILD_ROOT install
-popd
-%endif
-
 #
 # Create pager and tasklist schemas for compatibility with older
 # configurations which reference the old schema names
@@ -286,7 +237,7 @@ gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /sch
 # Install the schemas
 #
 gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/intlclock.schemas \
+	%{_sysconfdir}/gconf/schemas/clock.schemas \
 	%{_sysconfdir}/gconf/schemas/fish.schemas \
 	%{_sysconfdir}/gconf/schemas/pager.schemas \
 	%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
@@ -311,7 +262,7 @@ gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/intlclock.schemas \
+	%{_sysconfdir}/gconf/schemas/clock.schemas \
 	%{_sysconfdir}/gconf/schemas/fish.schemas \
 	%{_sysconfdir}/gconf/schemas/pager.schemas \
 	%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
@@ -329,7 +280,7 @@ fi
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
   gconftool-2 --makefile-uninstall-rule \
-	%{_sysconfdir}/gconf/schemas/intlclock.schemas \
+	%{_sysconfdir}/gconf/schemas/clock.schemas \
 	%{_sysconfdir}/gconf/schemas/fish.schemas \
 	%{_sysconfdir}/gconf/schemas/pager.schemas \
 	%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
@@ -374,18 +325,10 @@ fi
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_sysconfdir}/gconf/schemas/*.entries
 
-%if %{build_intlclock}
-# intlclock files
 %{_sysconfdir}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 %{_datadir}/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
 %{_datadir}/PolicyKit/policy/gnome-clock-applet-mechanism.policy
-%{_datadir}/intlclock
-%{_libexecdir}/intlclock-applet
-%{_libexecdir}/gnome-clock-applet-mechanism
-%{_bindir}/gnome-clock-applet-mechanism-gtk
-%{_sysconfdir}/gconf/schemas/intlclock.schemas
-%{_libdir}/bonobo/servers/GNOME_IntlClockApplet_Factory.server
-%endif
+%{_datadir}/clock
 
 %files libs
 %{_libdir}/*.so.*
@@ -398,6 +341,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Jan 16 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.5-1
+- Update to 2.21.5
+- Drop separate intlclock
+
 * Thu Dec 13 2007 Matthias Clasen <mclasen@redhat.com> - 2.20.2-2
 - Adapt to libgweather api changes
 
diff --git a/gweather-api.patch b/gweather-api.patch
deleted file mode 100644
index 5b5eed0..0000000
--- a/gweather-api.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c.gweatherapi gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c
---- gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c.gweatherapi	2007-12-13 13:10:34.000000000 +0100
-+++ gnome-panel-2.20.2/intlclock-1.0/src/intlclock-location-tile.c	2007-12-13 13:26:32.000000000 +0100
-@@ -455,10 +455,15 @@ void
- weather_info_setup_tooltip (WeatherInfo *info, GtkTooltip *tooltip)
- {
-         GdkPixbuf *pixbuf = NULL;
-+        GtkIconTheme *theme = NULL;
- 	gchar *conditions, *temp, *apparent, *wind;
- 	gchar *line1, *line2, *line3, *line4, *tip;
-+        const gchar *icon_name;
-  
--        weather_info_get_pixbuf (info, &pixbuf);
-+        icon_name = weather_info_get_icon_name (info);
-+        theme = gtk_icon_theme_get_default ();
-+        pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 48, 0, NULL);
-+
-         if (pixbuf) 
-                 gtk_tooltip_set_icon (tooltip, pixbuf);
- 
-@@ -526,12 +531,16 @@ update_weather_icon (IntlClockLocation *
-         IntlClockLocationTile *tile = data;
-         IntlClockLocationTilePrivate *priv = PRIVATE (tile);
-         GdkPixbuf *pixbuf = NULL;
-+        GtkIconTheme *theme = NULL;
-+        const gchar *icon_name;
-         const gchar *temp = NULL;
-         
-         if (!info || !weather_info_is_valid (info)) 
-                 return;
-  
--        weather_info_get_pixbuf_mini (info, &pixbuf);
-+        icon_name = weather_info_get_icon_name (info);
-+        theme = gtk_icon_theme_get_default ();
-+        pixbuf = gtk_icon_theme_load_icon (theme, icon_name, 16, 0, NULL);
-         temp = weather_info_get_temp_summary (info);
- 
-         if (pixbuf) {
diff --git a/intlclock-build-fixes.patch b/intlclock-build-fixes.patch
deleted file mode 100644
index 9c6f278..0000000
--- a/intlclock-build-fixes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -up gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am.intlclock-build-fixes gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am
---- gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am.intlclock-build-fixes	2007-10-05 11:43:24.000000000 -0400
-+++ gnome-panel-2.20.0.1/intlclock-1.0/src/Makefile.am	2007-10-05 11:46:42.000000000 -0400
-@@ -1,6 +1,8 @@
- ## We put the libpanel-applet dir here for when we build the applet
- ## inside the gnome-panel source tree
- INCLUDES =							\
-+	-I$(srcdir)/../../libpanel-applet			\
-+	-I$(top_builddir)/libpanel-applet			\
- 	$(INTLCLOCK_CFLAGS)					\
- 	-DGNOMELOCALEDIR=\"$(prefix)/$(DATADIRNAME)/locale\"	\
- 	-DEVOLUTION_TEXTDOMAIN=\"evolution-2.12\"		\
-@@ -28,7 +30,6 @@ intlclock-marshallers.c: intlclock-marsh
- intlclock-marshallers.h: intlclock-marshallers.list
- 	glib-genmarshal --prefix _intlclock_marshal --header $< > $@
- 
--noinst_PROGRAMS  = intlclock-standalone
- libexec_PROGRAMS = intlclock-applet
- 
- COMMON_SOURCES =				\
-@@ -75,7 +76,10 @@ intlclock_standalone_SOURCES =			\
- 	$(COMMON_SOURCES)			\
- 	standalone.c
- 
--intlclock_applet_LDADD     = $(INTLCLOCK_LIBS)
-+intlclock_applet_LDADD = 				\
-+	../../libpanel-applet/libpanel-applet-2.la	\	
-+	$(INTLCLOCK_LIBS)
-+
- intlclock_standalone_LDADD = $(INTLCLOCK_LIBS)
- 
- EXTRA_DIST = intlclock-marshallers.list
-diff -up gnome-panel-2.20.0.1/intlclock-1.0/configure.in.intlclock-build-fixes gnome-panel-2.20.0.1/intlclock-1.0/configure.in
---- gnome-panel-2.20.0.1/intlclock-1.0/configure.in.intlclock-build-fixes	2007-10-05 11:43:24.000000000 -0400
-+++ gnome-panel-2.20.0.1/intlclock-1.0/configure.in	2007-10-05 11:43:24.000000000 -0400
-@@ -59,7 +59,7 @@ if test -n "$LIBECAL_REQUIREMENT"; then
- fi
- AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
- 
--PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0 libpanelapplet-2.0 libgnome-2.0 gconf-2.0 $LIBECAL_REQUIREMENT dbus-glib-1 gweather libxml-2.0 polkit polkit-dbus ])
-+PKG_CHECK_MODULES(INTLCLOCK, [ glib-2.0 gobject-2.0 gtk+-2.0 gdk-2.0 librsvg-2.0 libgnome-2.0 libgnomeui-2.0 libbonobo-2.0 gconf-2.0 $LIBECAL_REQUIREMENT dbus-glib-1 gweather libxml-2.0 polkit polkit-dbus ])
- 
- AC_SUBST(INTLCLOCK_CFLAGS)
- AC_SUBST(INTLCLOCK_LIBS)
diff --git a/power-management.patch b/power-management.patch
deleted file mode 100644
index 756744d..0000000
--- a/power-management.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -up gnome-panel-2.19.5/gnome-panel/panel-power-manager.c.power-management gnome-panel-2.19.5/gnome-panel/panel-power-manager.c
---- gnome-panel-2.19.5/gnome-panel/panel-power-manager.c.power-management	2007-07-25 17:55:32.000000000 -0400
-+++ gnome-panel-2.19.5/gnome-panel/panel-power-manager.c	2007-07-25 17:55:37.000000000 -0400
-@@ -129,7 +129,7 @@ panel_power_manager_on_name_owner_change
- 	                                   const char        *new_owner,
- 	                                   PanelPowerManager *manager)
- {
--	if (strcmp (name, "org.gnome.PowerManager") != 0)
-+	if (strcmp (name, "org.freedesktop.PowerManagement") != 0)
- 		return;
- 
- 	if (manager->priv->gpm_proxy != NULL) {
-@@ -189,9 +189,9 @@ panel_power_manager_ensure_gpm_connectio
- 		manager->priv->gpm_proxy =
- 			dbus_g_proxy_new_for_name_owner (
- 					manager->priv->dbus_connection,
--					"org.gnome.PowerManager",
--					"/org/gnome/PowerManager",
--					"org.gnome.PowerManager",
-+					"org.freedesktop.PowerManagement",
-+					"/org/freedesktop/PowerManagement",
-+					"org.freedesktop.PowerManagement",
- 					&connection_error);
- 
- 		if (manager->priv->gpm_proxy == NULL) {
-@@ -324,7 +324,7 @@ panel_power_manager_can_suspend (PanelPo
- 	}
- 
- 	can_suspend = FALSE;
--	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedSuspend",
-+	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanSuspend",
- 				&error,
- 				G_TYPE_INVALID,
- 				G_TYPE_BOOLEAN, &can_suspend, G_TYPE_INVALID)) {
-@@ -355,7 +355,7 @@ panel_power_manager_can_hibernate (Panel
- 	}
- 
- 	can_hibernate = FALSE;
--	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "AllowedHibernate",
-+	if (!dbus_g_proxy_call (manager->priv->gpm_proxy, "CanHibernate",
- 				&error,
- 				G_TYPE_INVALID,
- 				G_TYPE_BOOLEAN, &can_hibernate, G_TYPE_INVALID)) {
diff --git a/sources b/sources
index 769d90b..3f50754 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-400924a82c03ec04f7842348625e1f4a  gnome-panel-2.20.2.tar.bz2
-7c313b9d3d3d659af4abf8119b5ecab7  intlclock-20071113.tar.gz
-717506485ee954b1d7ac6d2bfb3bb4f9  timezone.tar.gz
+967f0fc60b069921095ee642fcea1f55  gnome-panel-2.21.5.tar.bz2
diff --git a/timezone-changes.patch b/timezone-changes.patch
deleted file mode 100644
index 847135b..0000000
--- a/timezone-changes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up timezone/Makefile.timezone-changes timezone/Makefile
---- timezone/Makefile.timezone-changes	2007-09-28 18:44:36.000000000 -0400
-+++ timezone/Makefile	2007-10-05 01:22:40.000000000 -0400
-@@ -11,18 +11,23 @@ gnome-clock-applet-mechanism-gtk : demo.
- 	gcc -g -o gnome-clock-applet-mechanism-gtk `pkg-config --libs --cflags gthread-2.0 dbus-glib-1 gtk+-2.0` demo.c
- 
- install:
--	cp org.gnome.ClockApplet.Mechanism.service /usr/share/dbus-1/system-services
--	cp org.gnome.ClockApplet.Mechanism.conf /etc/dbus-1/system.d
--	cp gnome-clock-applet-mechanism /usr/libexec
--	cp gnome-clock-applet-mechanism-gtk /usr/bin
--	cp gnome-clock-applet-mechanism.policy /usr/share/PolicyKit/policy
-+	../mkinstalldirs $(DESTDIR)/usr/share/dbus-1/system-services
-+	cp org.gnome.ClockApplet.Mechanism.service $(DESTDIR)/usr/share/dbus-1/system-services
-+	../mkinstalldirs $(DESTDIR)/etc/dbus-1/system.d
-+	cp org.gnome.ClockApplet.Mechanism.conf $(DESTDIR)/etc/dbus-1/system.d
-+	../mkinstalldirs $(DESTDIR)/usr/libexec
-+	cp gnome-clock-applet-mechanism $(DESTDIR)/usr/libexec
-+	../mkinstalldirs $(DESTDIR)/usr/bin
-+	cp gnome-clock-applet-mechanism-gtk $(DESTDIR)/usr/bin
-+	../mkinstalldirs $(DESTDIR)/usr/share/PolicyKit/policy
-+	cp gnome-clock-applet-mechanism.policy $(DESTDIR)/usr/share/PolicyKit/policy
- 
- uninstall:
--	rm -f /usr/share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
--	rm -f /etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
--	rm -f /usr/libexec/gnome-clock-applet-mechanism
--	rm -f /usr/bin/gnome-clock-applet-mechanism-gtk
--	rm -f /usr/share/PolicyKit/policy/gnome-clock-applet-mechanism.policy
-+	rm -f $(DESTDIR)/usr/share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-+	rm -f $(DESTDIR)/etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
-+	rm -f $(DESTDIR)/usr/libexec/gnome-clock-applet-mechanism
-+	rm -f $(DESTDIR)/usr/bin/gnome-clock-applet-mechanism-gtk
-+	rm -f $(DESTDIR)/usr/share/PolicyKit/policy/gnome-clock-applet-mechanism.policy
- 
- test:
- 	 dbus-send --system --print-reply --dest=org.gnome.ClockApplet.Mechanism / org.freedesktop.DBus.Introspectable.Introspect