This commit is contained in:
Matthias Clasen 2008-08-05 03:45:51 +00:00
parent 507f9a3cdd
commit 0193a58a84
5 changed files with 7 additions and 101 deletions

View File

@ -1 +1 @@
libgweather-2.23.5.tar.bz2
libgweather-2.23.6.tar.bz2

View File

@ -1,12 +0,0 @@
diff -up libgweather-2.22.1.1/data/Locations.xml.in.cairo libgweather-2.22.1.1/data/Locations.xml.in
--- libgweather-2.22.1.1/data/Locations.xml.in.cairo 2008-04-17 00:09:59.000000000 -0400
+++ libgweather-2.22.1.1/data/Locations.xml.in 2008-04-17 00:10:41.000000000 -0400
@@ -23296,7 +23296,7 @@
<country>
<_name>Egypt</_name>
<iso-code>EG</iso-code>
- <tz-hint>Europe/Cairo</tz-hint>
+ <tz-hint>Africa/Cairo</tz-hint>
<location>
<_name>Alexandria/Nouzha</_name>
<code>HEAX</code>

View File

@ -1,6 +1,6 @@
Name: libgweather
Version: 2.23.5
Release: 2%{?d4st}
Version: 2.23.6
Release: 1%{?dist}
Summary: A library for weather information
Group: System Environment/Libraries
@ -17,9 +17,6 @@ BuildRequires: gettext
BuildRequires: perl(XML::Parser)
BuildRequires: intltool
# fixed in upstream svn
Patch0: pending-requests.patch
%description
libgweather is a library to access weather information from online
services for numerous locations.
@ -41,7 +38,6 @@ developing applications that use %{name}.
%prep
%setup -q
%patch0 -p1 -b .pending-requests
%build
%configure --disable-static
@ -105,6 +101,9 @@ fi
%changelog
* Mon Aug 4 2008 Matthias Clasen <mclasen@redhat.com> 2.23.6-1
- Update to 2.23.6
* Fri Jul 25 2008 Matthias Clasen <mclasen@redhat.com> 2.23.5-2
- Fix pending request accounting

View File

@ -1,81 +0,0 @@
diff -u libgweather-2.23.5/libgweather/weather-bom.c hacked/libgweather/weather-bom.c
--- libgweather-2.23.5/libgweather/weather-bom.c 2008-07-22 17:38:29.000000000 -0400
+++ hacked/libgweather/weather-bom.c 2008-07-25 18:19:16.000000000 -0400
@@ -71,4 +71,6 @@
msg = soup_message_new ("GET", url);
soup_session_queue_message (info->session, msg, bom_finish, info);
g_free (url);
+
+ info->requests_pending++;
}
diff -u libgweather-2.23.5/libgweather/weather.c hacked/libgweather/weather.c
--- libgweather-2.23.5/libgweather/weather.c 2008-07-22 17:38:29.000000000 -0400
+++ hacked/libgweather/weather.c 2008-07-25 18:19:40.000000000 -0400
@@ -484,13 +484,10 @@
info->session = soup_session_async_new ();
metar_start_open (info);
- info->requests_pending++;
iwin_start_open (info);
- info->requests_pending++;
if (prefs->radar) {
wx_start_open (info);
- info->requests_pending++;
}
return info;
diff -u libgweather-2.23.5/libgweather/weather-iwin.c hacked/libgweather/weather-iwin.c
--- libgweather-2.23.5/libgweather/weather-iwin.c 2008-07-22 17:38:29.000000000 -0400
+++ hacked/libgweather/weather-iwin.c 2008-07-25 18:20:07.000000000 -0400
@@ -125,8 +125,10 @@
state, zone);
g_free (zone);
g_free (state);
-
+
msg = soup_message_new ("GET", url);
g_free (url);
soup_session_queue_message (info->session, msg, iwin_finish, info);
+
+ info->requests_pending++;
}
diff -u libgweather-2.23.5/libgweather/weather-metar.c hacked/libgweather/weather-metar.c
--- libgweather-2.23.5/libgweather/weather-metar.c 2008-07-22 17:38:29.000000000 -0400
+++ hacked/libgweather/weather-metar.c 2008-07-25 18:20:22.000000000 -0400
@@ -492,7 +492,7 @@
gboolean success = FALSE;
g_return_if_fail (info != NULL);
-
+
if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
g_warning (_("Failed to get METAR data: %d %s.\n"),
msg->status_code, msg->reason_phrase);
@@ -540,4 +540,6 @@
"cccc", loc->code,
NULL);
soup_session_queue_message (info->session, msg, metar_finish, info);
+
+ info->requests_pending++;
}
diff -u libgweather-2.23.5/libgweather/weather-met.c hacked/libgweather/weather-met.c
--- libgweather-2.23.5/libgweather/weather-met.c 2008-07-22 17:38:29.000000000 -0400
+++ hacked/libgweather/weather-met.c 2008-07-25 18:20:41.000000000 -0400
@@ -170,4 +170,6 @@
msg = soup_message_new ("GET", url);
soup_session_queue_message (info->session, msg, met_finish, info);
g_free (url);
+
+ info->requests_pending++;
}
diff -u libgweather-2.23.5/libgweather/weather-wx.c hacked/libgweather/weather-wx.c
--- libgweather-2.23.5/libgweather/weather-wx.c 2008-07-22 17:38:29.000000000 -0400
+++ hacked/libgweather/weather-wx.c 2008-07-25 18:15:51.000000000 -0400
@@ -93,4 +93,6 @@
soup_message_set_flags (msg, SOUP_MESSAGE_OVERWRITE_CHUNKS);
soup_session_queue_message (info->session, msg, wx_finish, info);
g_free (url);
+
+ info->requests_pending++;
}

View File

@ -1 +1 @@
b1ea3316ac9a2e33d45028b56740ada4 libgweather-2.23.5.tar.bz2
3e6a079f0402025495ea7b3a39c3fad4 libgweather-2.23.6.tar.bz2