2.29.5

5 files changed, 15 insertions, 40 deletions

diff --git a/.cvsignore b/.cvsignore
index 9670514..66ad5a9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.28.0.tar.bz2
+gnome-applets-2.29.5.tar.bz2
diff --git a/gnome-applets-2.18.0-fix-find.patch b/gnome-applets-2.18.0-fix-find.patch
deleted file mode 100644
index 0be4ed5..0000000
--- a/gnome-applets-2.18.0-fix-find.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gnome-applets-2.18.0/gweather/gweather-pref.c.fix-find	2007-03-30 14:41:33.000000000 -0400
-+++ gnome-applets-2.18.0/gweather/gweather-pref.c	2007-03-30 16:59:27.000000000 -0400
-@@ -618,8 +618,10 @@
- 
- 	if (go_parent) {
- 		iter_parent = *iter;
--		if (gtk_tree_model_iter_parent (model, iter, &iter_parent) && gtk_tree_model_iter_next (model, iter)) {
--			return find_location (model, iter, location, TRUE);
-+                while (gtk_tree_model_iter_parent (model, iter, &iter_parent)) {
-+			if (gtk_tree_model_iter_next (model, iter))
-+				return find_location (model, iter, location, TRUE);
-+			iter_parent = *iter;
- 		}
- 	}
- 
diff --git a/gnome-applets.spec b/gnome-applets.spec
index f586c22..95496a9 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -32,13 +32,13 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.28.0
+Version:	2.29.5
 Release: 	2%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
 URL:		http://www.gnome.org/
-Source: 	http://download.gnome.org/sources/%{name}/2.28/%{name}-%{version}.tar.bz2
+Source: 	http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
 Source2:	gnome-applets-2.9.3.1-modemlights.tar.bz2
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,9 +48,6 @@ Patch2:		gnome-applets-2.23.3-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
 Patch11:        gnome-applets-2.15.1.1-dont-require-display.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=424639
-Patch31:        gnome-applets-2.18.0-fix-find.patch
-
 Patch34:        ppp-includes.patch
 Patch35:        modemlights-libgnome.patch
 
@@ -141,7 +138,6 @@ and more.
 %patch2 -p1 -b .use-builtin-apm
 %patch11 -p1 -b .dont-require-display
 
-%patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
 %patch41 -p1 -b .no-mixer-icon
 %patch42 -p1 -b .stickynotes-null
@@ -346,6 +342,9 @@ fi
 
 
 %changelog
+* Sun Jan 17 2010 Matthias Clasen <mclasen@redhat.com> - 1:2.29.5-1
+- Update to 2.29.5
+
 * Tue Oct 27 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.28.0-2
 - Fix a help file seriesid clash between accessx-status and invest-applet
 
diff --git a/modemlights-libgnome.patch b/modemlights-libgnome.patch
index 7c69fd0..65bc674 100644
--- a/modemlights-libgnome.patch
+++ b/modemlights-libgnome.patch
@@ -1,30 +1,21 @@
-diff -up gnome-applets-2.25.90/configure.in.modemlights-libgnome gnome-applets-2.25.90/configure.in
---- gnome-applets-2.25.90/configure.in.modemlights-libgnome	2009-02-03 21:58:39.000000000 -0500
-+++ gnome-applets-2.25.90/configure.in	2009-02-03 21:59:31.000000000 -0500
-@@ -14,6 +14,8 @@ dnl ************************************
- GTK_REQUIRED=2.13.0
- GLIB_REQUIRED=2.18.0
- GIO_REQUIRED=2.15.3
-+LIBGNOME_REQUIRED=2.8.0
-+LIBGNOMEUI_REQUIRED=2.8.0
- GCONF_REQUIRED=2.8.0
- SCROLLKEEPER_REQUIRED=0.1.4
- LIBPANEL_REQUIRED=2.13.4
-@@ -120,6 +122,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS, libpane
+diff -up gnome-applets-2.29.5/configure.in.modemlights-libgnome gnome-applets-2.29.5/configure.in
+--- gnome-applets-2.29.5/configure.in.modemlights-libgnome	2010-01-17 16:37:16.249288488 -0500
++++ gnome-applets-2.29.5/configure.in	2010-01-17 16:39:50.185529959 -0500
+@@ -120,6 +120,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS, libpane
  AC_SUBST(GNOME_APPLETS_CFLAGS)
  AC_SUBST(GNOME_APPLETS_LIBS)
  
 +dnl -- check for libgnome (required) ------------------------------------------
-+PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
++PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 libgnomeui-2.0)
 +AC_SUBST(GNOME_LIBS2_CFLAGS)
 +AC_SUBST(GNOME_LIBS2_LIBS)
 +
  dnl -- check for gnome-desktop (required) -------------------------------------
  PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
  AC_SUBST(GNOMEDESKTOP_CFLAGS)
-diff -up gnome-applets-2.25.90/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.25.90/modemlights/Makefile.am
---- gnome-applets-2.25.90/modemlights/Makefile.am.modemlights-libgnome	2004-11-04 06:44:55.000000000 -0500
-+++ gnome-applets-2.25.90/modemlights/Makefile.am	2009-02-03 21:57:24.000000000 -0500
+diff -up gnome-applets-2.29.5/modemlights/Makefile.am.modemlights-libgnome gnome-applets-2.29.5/modemlights/Makefile.am
+--- gnome-applets-2.29.5/modemlights/Makefile.am.modemlights-libgnome	2004-11-04 06:44:55.000000000 -0500
++++ gnome-applets-2.29.5/modemlights/Makefile.am	2010-01-17 16:37:16.326303959 -0500
 @@ -2,6 +2,7 @@ SUBDIRS = docs
  
  INCLUDES = -I. -I$(srcdir) 				\
diff --git a/sources b/sources
index 25f6211..008ae07 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9eb00e9dc468d2c5c71b70c9fb2b751c  gnome-applets-2.28.0.tar.bz2
+0bd6c765fe5e5514a1fa69d7088cc1b0  gnome-applets-2.29.5.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2