rpms/gnome-applets/devel gnome-applets-2.14.1-cpufreq.patch, NONE, 1.1 gnome-applets.spec, 1.130, 1.131 gnome-applets-2.11.1-cpufreq.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32740

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-2.14.1-cpufreq.patch 
Removed Files:
	gnome-applets-2.11.1-cpufreq.patch 
Log Message:
update patches


gnome-applets-2.14.1-cpufreq.patch:
 cpufreq-applet.c |    2 ++
 cpufreq-popup.c  |    8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

--- NEW FILE gnome-applets-2.14.1-cpufreq.patch ---
--- gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c.cpufreq	2006-04-10 15:12:40.000000000 -0400
+++ gnome-applets-2.14.1/cpufreq/src/cpufreq-applet.c	2006-04-10 15:12:53.000000000 -0400
@@ -272,6 +272,8 @@
         if (!path)
                 return FALSE;
 
+	return TRUE;
+
         if (geteuid () == 0)
                 return TRUE;
 
--- gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c.cpufreq	2006-04-10 15:13:54.000000000 -0400
+++ gnome-applets-2.14.1/cpufreq/src/cpufreq-popup.c	2006-04-10 15:14:41.000000000 -0400
@@ -142,17 +142,11 @@
 cpufreq_popup_set_governor (GtkWidget *widget, gpointer gdata)
 {
 	gchar *governor;
-	gchar *path = NULL;
 	gchar *command;
 
 	governor = (gchar *) gdata;
 
-	path = g_find_program_in_path ("cpufreq-selector");
-
-	if (!path)
-		return;
-
-	command = g_strdup_printf ("%s -g %s", path, governor);
+	command = g_strdup_printf ("/usr/bin/cpufreq-selector -g %s", path, governor);
 
 	g_spawn_command_line_async (command, NULL); /* TODO: error */
 


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gnome-applets.spec	10 Apr 2006 18:04:12 -0000	1.130
+++ gnome-applets.spec	10 Apr 2006 20:58:02 -0000	1.131
@@ -27,10 +27,9 @@
 Patch0:		gnome-applets-2.10.1-use-old-modemlights.patch
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
-Patch4:		gnome-applets-2.11.1-cpufreq.patch
+Patch4:		gnome-applets-2.14.1-cpufreq.patch
 Patch5:	        gnome-applets-2.13.4-warning.patch
 Patch6:	        gnome-applets-2.13.90-stock-ticker.patch
-Patch8:	        gnome-applets-2.13.90-mixer-crash.patch
 Patch9:	        gnome-applets-2.14.0-gswitchit-export-dynamic.patch
 
 URL:		http://www.gnome.org/
@@ -89,7 +88,6 @@
 %patch4 -p1 -b .cpufreq
 %patch5 -p1 -b .warning
 %patch6 -p1 -b .stock-ticker
-%patch8 -p1 -b .mixer-crash
 %patch9 -p1 -b .gswitchit-export-dynamic
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
@@ -201,6 +199,7 @@
 %changelog
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
+- Update patches
 
 * Tue Mar 28 2006 Ray Strode <rstrode at redhat.com> - 2.14.0-3
 - apply patch


--- gnome-applets-2.11.1-cpufreq.patch DELETED ---