From 0475dace51af57b872ba8000f3bc3f2e7211a5dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 16 Aug 2013 12:16:28 +0300 Subject: [PATCH] up to 1.6.2 --- libmateweather.spec | 16 +++++++--------- update-weather.noaa.gov-url.patch | 26 -------------------------- 2 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 update-weather.noaa.gov-url.patch diff --git a/libmateweather.spec b/libmateweather.spec index 525b797..624c46f 100644 --- a/libmateweather.spec +++ b/libmateweather.spec @@ -1,12 +1,11 @@ Summary: Libraries to allow MATE Desktop to display weather information Name: libmateweather -Version: 1.6.1 -Release: 2 +Version: 1.6.2 +Release: 1 License: GPL v2+ Group: X11/Libraries Source0: http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz -# Source0-md5: 6fd7832e76755fd3d8880472f7698577 -Patch0: update-weather.noaa.gov-url.patch +# Source0-md5: 881a398575c44e79e22b079e06f00cb1 URL: http://wiki.mate-desktop.org/libmateweather BuildRequires: gettext-devel BuildRequires: gtk+2-devel >= 2:2.11.0 @@ -23,11 +22,12 @@ Requires: glib2 >= 1:2.26.0 Requires: gsettings-desktop-schemas Requires: gtk-update-icon-cache Requires: hicolor-icon-theme +Requires(post,postun): /sbin/ldconfig Conflicts: mate-applet-gweather < 1.6.1 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -Libraries to allow MATE Desktop to display weather information +Libraries to allow MATE Desktop to display weather information. %package devel Summary: Development files for libmateweather @@ -51,18 +51,16 @@ Dokumentacja API biblioteki libmateweather. %prep %setup -q -%patch0 -p1 %build -NOCONFIGURE=1 ./autogen.sh %configure \ --with-zoneinfo-dir=%{_datadir}/zoneinfo \ --with-html-dir=%{_gtkdocdir} \ --enable-python \ + --disable-silent-rules \ --disable-static -%{__make} \ - V=1 +%{__make} %install rm -rf $RPM_BUILD_ROOT diff --git a/update-weather.noaa.gov-url.patch b/update-weather.noaa.gov-url.patch deleted file mode 100644 index 326f883..0000000 --- a/update-weather.noaa.gov-url.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 70efd95dba479f9f8318c7d50877f2461434a28b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= -Date: Fri, 26 Apr 2013 21:43:19 +0300 -Subject: [PATCH] update weather.noaa.gov url - -it's because the .pl url used, redirects. lessen the hops ---- - libmateweather/weather-metar.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmateweather/weather-metar.c b/libmateweather/weather-metar.c -index 6dfcf9c..da71db5 100644 ---- a/libmateweather/weather-metar.c -+++ b/libmateweather/weather-metar.c -@@ -550,7 +550,7 @@ metar_start_open (WeatherInfo *info) - } - - msg = soup_form_request_new ( -- "GET", "http://weather.noaa.gov/cgi-bin/mgetmetar.pl", -+ "GET", "http://weather.noaa.gov/mgetmetar.php", - "cccc", loc->code, - NULL); - soup_session_queue_message (info->session, msg, metar_finish, info); --- -1.8.2.1 - -- 2.44.0