diff options
| author | Matthias Clasen <mclasen@fedoraproject.org> | 2008-01-20 19:55:22 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@fedoraproject.org> | 2008-01-20 19:55:22 +0000 |
| commit | 65bea230194ce2226fd3bf98b6eef3bc82c022a7 (patch) | |
| tree | fe3fffa683194d3f59728a174a4a3db15476674e | |
| parent | 2fa941d0f04a8bfc132fc209f7a15446186b55f2 (diff) | |
fix weather applet to find locations.xml againgnome-applets-2_21_4-2_fc9
| -rw-r--r-- | gnome-applets-2.17.1-cpufreq.patch | 34 | ||||
| -rw-r--r-- | gnome-applets.spec | 9 | ||||
| -rw-r--r-- | locations.patch | 12 |
3 files changed, 20 insertions, 35 deletions
diff --git a/gnome-applets-2.17.1-cpufreq.patch b/gnome-applets-2.17.1-cpufreq.patch deleted file mode 100644 index 22cc41f..0000000 --- a/gnome-applets-2.17.1-cpufreq.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- 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 475d8a1..b681fea 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -35,7 +35,7 @@ Summary: Small applications for the GNOME panel Name: gnome-applets Version: 2.21.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2+ and GFDL+ Group: User Interface/Desktops @@ -71,6 +71,9 @@ Patch39: gweather-network.patch # do the nullapplet dance for battstat Patch40: gnome-applets-null-battstat.patch +# fixed in upstream svn +Patch41: locations.patch + BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} @@ -160,6 +163,7 @@ small utilities for the GNOME panel. %patch35 -p1 -b .mixer-sync %patch39 -p1 -b .gweather-network %patch40 -p1 -b .battstat-null +%patch41 -p1 -b .locations cp gswitchit/gswitchit-applet.png gswitchit/gswitchit-properties-capplet.png @@ -331,6 +335,9 @@ fi %{_sysconfdir}/security/console.apps/* %changelog +* Sun Jan 20 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.21.4-2 +- Make the weather applet find locations.xml again + * Wed Jan 16 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.21.4-1 - Update to 2.21.4 diff --git a/locations.patch b/locations.patch new file mode 100644 index 0000000..f95de85 --- /dev/null +++ b/locations.patch @@ -0,0 +1,12 @@ +diff -up gnome-applets-2.21.4/gweather/gweather-xml.c.locations gnome-applets-2.21.4/gweather/gweather-xml.c +--- gnome-applets-2.21.4/gweather/gweather-xml.c.locations 2008-01-20 14:52:49.000000000 -0500 ++++ gnome-applets-2.21.4/gweather/gweather-xml.c 2008-01-20 14:53:00.000000000 -0500 +@@ -368,7 +368,7 @@ gweather_xml_load_locations( GtkTreeView + int ret = -1; + + /* Open the xml file containing the different locations */ +- xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION "Locations.xml"); ++ xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION); + if( xml == NULL ) + goto error_out; + |