From a38b2ee79492649766a0ceb6ebf0a2cbc4c457e0 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mar 02 2009 21:51:24 +0000
Subject: 2.15.92


---

diff --git a/.cvsignore b/.cvsignore
index 03333ec..fe50772 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.25.91.tar.bz2
+gnome-applets-2.25.92.tar.bz2
diff --git a/gnome-applets-resizeable.patch b/gnome-applets-resizeable.patch
deleted file mode 100644
index 4a2643b..0000000
--- a/gnome-applets-resizeable.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up gnome-applets-2.25.91/mini-commander/src/command_line.c.resizeable gnome-applets-2.25.91/mini-commander/src/command_line.c
---- gnome-applets-2.25.91/mini-commander/src/command_line.c.resizeable	2009-02-16 19:16:51.000000000 -0500
-+++ gnome-applets-2.25.91/mini-commander/src/command_line.c	2009-02-19 01:54:35.056741392 -0500
-@@ -312,7 +312,7 @@ mc_show_history (GtkWidget *widget,
-      window = gtk_window_new(GTK_WINDOW_POPUP); 
-      gtk_window_set_screen (GTK_WINDOW (window),
- 			    gtk_widget_get_screen (GTK_WIDGET (mc->applet)));
--     gtk_window_set_resizeable(GTK_WINDOW(window), FALSE);
-+     gtk_window_set_resizable(GTK_WINDOW(window), FALSE);
-      gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_COMBO);
-      /* cb */
-      g_signal_connect_after(GTK_OBJECT(window),
-@@ -507,7 +507,7 @@ mc_show_file_browser (GtkWidget *widget,
- void
- mc_create_command_entry (MCData *mc)
- {
--    mc->entry = gtk_entry_new_with_max ();
-+    mc->entry = gtk_entry_new ();
-     gtk_entry_set_max_length (GTK_ENTRY (mc->entry), MC_MAX_COMMAND_LENGTH); 
- 
-     g_signal_connect (mc->entry, "key_press_event",
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 82a0492..970db5e 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.25.91
-Release: 	3%{?dist}
+Version:	2.25.92
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -61,9 +61,6 @@ Patch40:	gnome-applets-null-battstat.patch
 # and keep the mixer hidden away from the add to panel dialog
 Patch41:	gnome-applets-no-mixer-icon.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=572372
-Patch42: 	gnome-applets-resizeable.patch
-
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
@@ -97,7 +94,7 @@ BuildRequires:  gnome-doc-utils
 BuildRequires:  which
 BuildRequires:  libtool autoconf gettext intltool
 BuildRequires:  pkgconfig
-BuildRequires:  gnome-icon-theme 
+BuildRequires:  gnome-icon-theme
 BuildRequires:  libgnomekbd-devel >= %{libgnomekbd_version}
 BuildRequires:  libxslt
 # for patch 39
@@ -133,10 +130,10 @@ Obsoletes:      gnome-cpufreq-applet
 Requires:	pkgconfig
 
 %description
-The gnome-applets package contains small applications which generally 
-run in the background and display their output to the GNOME  panel. 
-It includes a clock, a character palette, load monitors, little toys, 
-and more. 
+The gnome-applets package contains small applications which generally
+run in the background and display their output to the GNOME  panel.
+It includes a clock, a character palette, load monitors, little toys,
+and more.
 
 %prep
 %setup -q
@@ -147,7 +144,6 @@ and more.
 %patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
 %patch41 -p1 -b .no-mixer-icon
-%patch42 -p1 -b .resizeable
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -178,7 +174,7 @@ make
 cd po
 grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
 # some files go missing due to our modemlights surgery
-grep -v "modemlights/GNOME_ModemLights.xml\|modemlights/modemlights.ui\|modemlights/modem-applet.c" POTFILES.keep > POTFILES.keep2  
+grep -v "modemlights/GNOME_ModemLights.xml\|modemlights/modemlights.ui\|modemlights/modem-applet.c" POTFILES.keep > POTFILES.keep2
 mv POTFILES.keep2 POTFILES.in
 intltool-update --pot
 for p in *.po; do
@@ -342,6 +338,9 @@ fi
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Mon Mar  2 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.25.92-1
+- Update to 2.25.92
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:2.25.91-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 75db518..f6f01f0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fe766bc1e01934024140d11870c1766e  gnome-applets-2.25.91.tar.bz2
+6c19de60f92fa619892f16dae8ebf238  gnome-applets-2.25.92.tar.bz2
 ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2