rpms/gnome-applets/devel locations.patch, NONE, 1.1 gnome-applets.spec, 1.263, 1.264 gnome-applets-2.17.1-cpufreq.patch, 1.1, NONE

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20389

Modified Files:
	gnome-applets.spec 
Added Files:
	locations.patch 
Removed Files:
	gnome-applets-2.17.1-cpufreq.patch 
Log Message:
fix weather applet to find locations.xml again


locations.patch:

--- NEW FILE locations.patch ---
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;
 


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- gnome-applets.spec	16 Jan 2008 07:04:39 -0000	1.263
+++ gnome-applets.spec	20 Jan 2008 19:55:22 -0000	1.264
@@ -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 @@
 # 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 @@
 %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 @@
 %{_sysconfdir}/security/console.apps/*
 
 %changelog
+* Sun Jan 20 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.21.4-2
+- Make the weather applet find locations.xml again
+
 * Wed Jan 16 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.21.4-1
 - Update to 2.21.4
 


--- gnome-applets-2.17.1-cpufreq.patch DELETED ---