diff --git a/.geocode-glib.metadata b/.geocode-glib.metadata index c86d967..19e2407 100644 --- a/.geocode-glib.metadata +++ b/.geocode-glib.metadata @@ -1 +1 @@ -56851e1100dd52a6fe487e92a195e156587a4396 SOURCES/geocode-glib-3.14.0.tar.xz +ca6579c182270eea64e6d2c38768ff476eb89c75 SOURCES/geocode-glib-3.20.1.tar.xz diff --git a/.gitignore b/.gitignore index f98adcc..93891cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/geocode-glib-3.14.0.tar.xz +SOURCES/geocode-glib-3.20.1.tar.xz diff --git a/SOURCES/use-https-and-fix-the-cache.patch b/SOURCES/use-https-and-fix-the-cache.patch deleted file mode 100644 index c0a8416..0000000 --- a/SOURCES/use-https-and-fix-the-cache.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 6f67e61ff8f3beaf932914e690f5fb500bbc69cb Mon Sep 17 00:00:00 2001 -From: Jonas Danielsson -Date: Wed, 17 Dec 2014 02:36:03 -0500 -Subject: [PATCH] forward, reverse: Use https and fix the cache - -At the moment the cache for queries does not work. This is because -we are using a query with 'http://' to look for cached contents. -But when we are saving we are using 'https://' since that is what -the nominatim server redirects us to. - -Regardless of that, moving to 'https://' seems like a good thing. ---- - geocode-glib/geocode-forward.c | 4 ++-- - geocode-glib/geocode-reverse.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/geocode-glib/geocode-forward.c b/geocode-glib/geocode-forward.c -index b7e3b56..c41c874 100644 ---- a/geocode-glib/geocode-forward.c -+++ b/geocode-glib/geocode-forward.c -@@ -490,7 +490,7 @@ get_search_query_for_params (GeocodeForward *forward, - if (location != NULL) { - /* Prepare the search term */ - search_term = soup_uri_encode (location, NULL); -- uri = g_strdup_printf ("http://nominatim.gnome.org/search?q=%s&limit=%u&bounded=%d&%s", -+ uri = g_strdup_printf ("https://nominatim.gnome.org/search?q=%s&limit=%u&bounded=%d&%s", - search_term, - forward->priv->answer_count, - !!forward->priv->bounded, -@@ -498,7 +498,7 @@ get_search_query_for_params (GeocodeForward *forward, - g_free (search_term); - g_free (location); - } else { -- uri = g_strdup_printf ("http://nominatim.gnome.org/search?limit=1&%s", -+ uri = g_strdup_printf ("https://nominatim.gnome.org/search?limit=1&%s", - params); - } - g_free (params); -diff --git a/geocode-glib/geocode-reverse.c b/geocode-glib/geocode-reverse.c -index 3f94478..aa70077 100644 ---- a/geocode-glib/geocode-reverse.c -+++ b/geocode-glib/geocode-reverse.c -@@ -373,7 +373,7 @@ get_resolve_query_for_params (GHashTable *orig_ht) - g_hash_table_destroy (ht); - g_free (locale); - -- uri = g_strdup_printf ("http://nominatim.gnome.org/reverse?%s", params); -+ uri = g_strdup_printf ("https://nominatim.gnome.org/reverse?%s", params); - g_free (params); - - ret = soup_message_new ("GET", uri); --- -2.4.3 - diff --git a/SPECS/geocode-glib.spec b/SPECS/geocode-glib.spec index 1cf9563..b2e4537 100644 --- a/SPECS/geocode-glib.spec +++ b/SPECS/geocode-glib.spec @@ -1,19 +1,19 @@ %global json_glib_version 0.99.2 Name: geocode-glib -Version: 3.14.0 -Release: 2%{?dist} +Version: 3.20.1 +Release: 1%{?dist} Summary: Geocoding helper library License: LGPLv2+ URL: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/geocode-glib/3.14/geocode-glib-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/3.20/%{name}-%{version}.tar.xz -BuildRequires: glib2-devel -BuildRequires: gobject-introspection-devel +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version} +BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: intltool -BuildRequires: json-glib-devel >= %{json_glib_version} -BuildRequires: libsoup-devel Requires: json-glib%{?_isa} >= %{json_glib_version} @@ -29,10 +29,6 @@ load. Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -# https://bugzilla.gnome.org/show_bug.cgi?id=1233636 -# geocode-glib: should use https://nominatim.gnome.org/ -Patch0: use-https-and-fix-the-cache.patch - %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -41,7 +37,6 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -b .use-https-and-fix-the-cache %build %configure --disable-static @@ -59,7 +54,8 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %files -%doc AUTHORS COPYING.LIB NEWS README +%license COPYING.LIB +%doc AUTHORS NEWS README %{_libdir}/libgeocode-glib.so.* %{_libdir}/girepository-1.0/GeocodeGlib-1.0.typelib %{_datadir}/icons/gnome/scalable/places/*.svg @@ -73,6 +69,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %changelog +* Wed Apr 13 2016 Kalev Lember - 3.20.1-1 +- Update to 3.20.1 +- Resolves: #1386868 + * Fri Jul 24 2015 Zeeshan Ali - 3.14.0-2 - Use HTTPS to connect to Nominatim (related: #1233636).