diff --git a/cairo-dock-plug-ins.spec b/cairo-dock-plug-ins.spec index 9b4b20a..fe459e6 100644 --- a/cairo-dock-plug-ins.spec +++ b/cairo-dock-plug-ins.spec @@ -9,7 +9,7 @@ Name: cairo-dock-plug-ins Version: %{mainver} -Release: 7%{?dist} +Release: 8%{?dist} Summary: Plug-ins files for Cairo-Dock License: GPLv3+ @@ -24,6 +24,8 @@ Patch1: cairo-dock-plugins-3.4.1-0001-demo_ruby-fix-traceback-when-changing-the # Default to xdg-screensaver for lock_screen Patch2: cairo-dock-plugins-3.4.1-0002-Default-to-xdg-screensaver-for-lock_screen.patch Patch3: cairo-dock-plugins-3.4.1-0003-lock-screen.sh-used-xdg-screensaver-if-available.patch +# Update URL on weather plugin +Patch4: cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch BuildRequires: cmake BuildRequires: gettext @@ -193,6 +195,7 @@ binding for Cairo-Dock. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 ## permission # %%_fixperms cannot fix permissions completely here @@ -386,6 +389,9 @@ popd %{_datadir}/cairo-dock/plug-ins/Dbus/CDApplet.h %changelog +* Fri Feb 24 2016 Mamoru TASAKA - 3.4.1-8 +- Pull in upstream patch to update URL on weather plugin + * Wed Feb 03 2016 Fedora Release Engineering - 3.4.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch b/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch new file mode 100644 index 0000000..035143f --- /dev/null +++ b/cairo-dock-plugins-3.4.1-0004-weather-update-URL.patch @@ -0,0 +1,52 @@ +From 402a2d7bb657be4ad4072f07612e008e846d5e97 Mon Sep 17 00:00:00 2001 +From: Fabounet +Date: Sun, 22 May 2016 21:13:21 +0200 +Subject: [PATCH] [1581725] Updated the weather URL we retrieve data from + +--- + weather/src/applet-config.c | 2 +- + weather/src/applet-read-data.c | 3 --- + weather/src/applet-struct.h | 3 +++ + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/weather/src/applet-config.c b/weather/src/applet-config.c +index c9a33c2..0a27a8a 100755 +--- a/weather/src/applet-config.c ++++ b/weather/src/applet-config.c +@@ -174,7 +174,7 @@ static void _on_got_location_data (const gchar *cLocationData, GldiModuleInstanc + gldi_task_discard (myData.pGetLocationTask); + myData.pGetLocationTask = NULL; + } +-#define CD_WEATHER_BASE_URL "http://xml.weather.com" ++ + static void _cd_weather_search_for_location (GtkEntry *pEntry, GldiModuleInstance *myApplet) + { + const gchar *cLocationName = gtk_entry_get_text (pEntry); +diff --git a/weather/src/applet-read-data.c b/weather/src/applet-read-data.c +index 0bbdce7..8ca8d21 100755 +--- a/weather/src/applet-read-data.c ++++ b/weather/src/applet-read-data.c +@@ -30,9 +30,6 @@ + #include "applet-load-icons.h" + #include "applet-read-data.h" + +-#define CD_WEATHER_BASE_URL "http://xml.weather.com" +- +- + static xmlDocPtr _cd_weather_open_xml_buffer (const gchar *cData, xmlNodePtr *root_node, const gchar *cRootNodeName, GError **erreur) + { + if (cData == NULL || *cData == '\0') +diff --git a/weather/src/applet-struct.h b/weather/src/applet-struct.h +index e96191e..02ba3d0 100755 +--- a/weather/src/applet-struct.h ++++ b/weather/src/applet-struct.h +@@ -29,6 +29,9 @@ + + #define WEATHER_DEFAULT_NAME "weather" + ++#define CD_WEATHER_BASE_URL "http://wxdata.weather.com/wxdata" ++ ++ + #define _display(cValue) ((cValue) == NULL || *((gchar*)cValue) == 'N' ? "?" : (const gchar*)(cValue)) + + struct _AppletConfig {