diff --git a/.cvsignore b/.cvsignore index 7f2a23f..5b20d80 100644 --- a/.cvsignore +++ b/.cvsignore @@ -10,3 +10,4 @@ gnome-applets-2.16.0.tar.bz2 gnome-applets-2.16.0.1.tar.bz2 gnome-applets-2.16.1.tar.bz2 gnome-applets-2.16.2.tar.bz2 +gnome-applets-2.17.1.tar.bz2 diff --git a/gnome-applets-2.16.1-desktop-files.patch b/gnome-applets-2.16.1-desktop-files.patch index 97bfd1f..0899c7f 100644 --- a/gnome-applets-2.16.1-desktop-files.patch +++ b/gnome-applets-2.16.1-desktop-files.patch @@ -7,17 +7,3 @@ -Categories=Application;Office;Spreadsheet; +Categories=Office;Spreadsheet; +NoDisplay=true ---- gnome-applets-2.16.1/libgswitchit/gswitchit-plugins.desktop.in.in.desktop-files 2006-10-24 00:22:34.000000000 -0400 -+++ gnome-applets-2.16.1/libgswitchit/gswitchit-plugins.desktop.in.in 2006-10-24 00:23:59.000000000 -0400 -@@ -7,9 +7,10 @@ - Terminal=false - Type=Application - StartupNotify=true --Categories=Application;System;Settings;AdvancedSettings; -+Categories=System;Settings; - OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=gnome-applets - X-GNOME-Bugzilla-Component=keyboard indicator (gswitchit) - X-GNOME-Bugzilla-Version=@VERSION@ -+NoDisplay=true diff --git a/gnome-applets-2.17.1-cpufreq.patch b/gnome-applets-2.17.1-cpufreq.patch new file mode 100644 index 0000000..22cc41f --- /dev/null +++ b/gnome-applets-2.17.1-cpufreq.patch @@ -0,0 +1,34 @@ +--- gnome-applets-2.17.1/cpufreq/src/cpufreq-popup.c.cpufreq 2006-12-30 21:07:55.000000000 -0500 ++++ gnome-applets-2.17.1/cpufreq/src/cpufreq-popup.c 2007-01-10 22:06:27.000000000 -0500 +@@ -176,19 +176,13 @@ + cpufreq_popup_run_selector (CPUFreqPopup *popup, + const gchar *params) + { +- gchar *path; + guint cpu; + gchar *command; + GError *error = NULL; + +- path = g_find_program_in_path ("cpufreq-selector"); +- +- if (!path) +- return; +- + cpu = cpufreq_monitor_get_cpu (popup->priv->monitor); + +- command = g_strdup_printf ("%s -c %d %s", path, cpu, params); ++ command = g_strdup_printf ("/usr/bin/cpufreq-selector -c %d %s", cpu, params); + + g_spawn_command_line_async (command, &error); + g_free (command); +--- gnome-applets-2.17.1/cpufreq/src/cpufreq-utils.c.cpufreq 2006-12-30 21:07:55.000000000 -0500 ++++ gnome-applets-2.17.1/cpufreq/src/cpufreq-utils.c 2007-01-10 22:00:22.000000000 -0500 +@@ -109,6 +109,8 @@ + if (!path) + return FALSE; + ++ return TRUE; ++ + if (geteuid () == 0) + return TRUE; + diff --git a/gnome-applets.spec b/gnome-applets.spec index a30ffa0..c51146f 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.16.2 -Release: 6%{?dist} +Version: 2.17.1 +Release: 1%{?dist} Epoch: 1 License: GPL Group: User Interface/Desktops URL: http://www.gnome.org/ -Source: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.16/%{name}-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/gnome/sources/%{name}/2.17/%{name}-%{version}.tar.bz2 Source1: gnome-applets-2.9.3.1-modemlights.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -46,25 +46,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: gnome-applets-2.15.2-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.15.1.1-cpufreq.patch +Patch4: gnome-applets-2.17.1-cpufreq.patch Patch11: gnome-applets-2.15.1.1-dont-require-display.patch # http://bugzilla.gnome.org/show_bug.cgi?id=352777 -Patch16: keyboard-drawing-rotated-text.patch +#Patch16: keyboard-drawing-rotated-text.patch # http://bugzilla.gnome.org/show_bug.cgi?id=352778 -Patch17: keyboard-drawing-label-color.patch +#Patch17: keyboard-drawing-label-color.patch # http://bugzilla.gnome.org/show_bug.cgi?id=352779 -Patch18: keyboard-drawing-primary.patch +#Patch18: keyboard-drawing-primary.patch # http://bugzilla.gnome.org/show_bug.cgi?id=352781 -Patch19: keyboard-drawing-corner.patch +#Patch19: keyboard-drawing-corner.patch # http://bugzilla.gnome.org/show_bug.cgi?id=353163 -Patch20: keyboard-drawing-redraw.patch +#Patch20: keyboard-drawing-redraw.patch Patch27: gnome-applets-2.16.1-desktop-files.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=382774 -Patch28: gnome-applets-2.16.2-trash-screen.patch - # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=217919 Patch29: gnome-applets-2.16.0.1-delay-gstreamer-initialization.patch @@ -154,15 +151,14 @@ small utilities for the GNOME panel. %patch4 -p1 -b .cpufreq %patch11 -p1 -b .dont-require-display -%patch16 -p1 -b .rotated-text -%patch17 -p1 -b .label-color -%patch18 -p1 -b .primary -%patch19 -p1 -b .corner -%patch20 -p1 -b .redraw +#%patch16 -p1 -b .rotated-text +#%patch17 -p1 -b .label-color +#%patch18 -p1 -b .primary +#%patch19 -p1 -b .corner +#%patch20 -p1 -b .redraw %patch27 -p1 -b .desktop-files -%patch28 -p1 -b .trash-screen %patch29 -p1 -b .delay-gstreamer-initialization %patch30 -p1 -b .fix-null-applet @@ -351,6 +347,9 @@ fi %{_libdir}/pkgconfig/gweather.pc %changelog +* Wed Jan 10 2007 Matthias Clasen - 1:2.17.1-1 +- Update to 2.17.1 + * Wed Jan 10 2007 Ray Strode - 1:2.16.2-6 - fix null applet error on login for new users (bug 222104) diff --git a/sources b/sources index ec19c76..3810962 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2 -1a46b8557ff05ca75e7db6adb4dd6707 gnome-applets-2.16.2.tar.bz2 +bd7395e3a0e1a21af79c2c7e3ba60f40 gnome-applets-2.17.1.tar.bz2