From ca264f267a149329bfb7c3ebb5d6b51cda6b3577 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:45:55 +0000 Subject: import geocode-glib-3.14.0-2.el7 --- diff --git a/.geocode-glib.metadata b/.geocode-glib.metadata new file mode 100644 index 0000000..c86d967 --- /dev/null +++ b/.geocode-glib.metadata @@ -0,0 +1 @@ +56851e1100dd52a6fe487e92a195e156587a4396 SOURCES/geocode-glib-3.14.0.tar.xz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f98adcc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/geocode-glib-3.14.0.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/use-https-and-fix-the-cache.patch b/SOURCES/use-https-and-fix-the-cache.patch new file mode 100644 index 0000000..c0a8416 --- /dev/null +++ b/SOURCES/use-https-and-fix-the-cache.patch @@ -0,0 +1,54 @@ +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 new file mode 100644 index 0000000..1cf9563 --- /dev/null +++ b/SPECS/geocode-glib.spec @@ -0,0 +1,132 @@ +%global json_glib_version 0.99.2 + +Name: geocode-glib +Version: 3.14.0 +Release: 2%{?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 + +BuildRequires: glib2-devel +BuildRequires: gobject-introspection-devel +BuildRequires: intltool +BuildRequires: json-glib-devel >= %{json_glib_version} +BuildRequires: libsoup-devel + +Requires: json-glib%{?_isa} >= %{json_glib_version} + +%description +geocode-glib is a convenience library for the geocoding (finding longitude, +and latitude from an address) and reverse geocoding (finding an address from +coordinates). It uses Nominatim service to achieve that. It also caches +(reverse-)geocoding requests for faster results and to avoid unnecessary server +load. + + +%package devel +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}. + + +%prep +%setup -q + +%patch0 -p1 -b .use-https-and-fix-the-cache + +%build +%configure --disable-static +make %{?_smp_mflags} V=1 + + +%install +%make_install +find $RPM_BUILD_ROOT -name '*.la' -delete + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%doc AUTHORS COPYING.LIB NEWS README +%{_libdir}/libgeocode-glib.so.* +%{_libdir}/girepository-1.0/GeocodeGlib-1.0.typelib +%{_datadir}/icons/gnome/scalable/places/*.svg + +%files devel +%{_includedir}/geocode-glib-1.0/ +%{_libdir}/libgeocode-glib.so +%{_libdir}/pkgconfig/geocode-glib-1.0.pc +%{_datadir}/gir-1.0/GeocodeGlib-1.0.gir +%doc %{_datadir}/gtk-doc/ + + +%changelog +* Fri Jul 24 2015 Zeeshan Ali - 3.14.0-2 +- Use HTTPS to connect to Nominatim (related: #1233636). + +* Tue Sep 23 2014 Kalev Lember - 3.14.0-1 +- Update to 3.14.0 + +* Sat Aug 16 2014 Fedora Release Engineering - 3.13.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jul 22 2014 Kalev Lember - 3.13.3-2 +- Rebuilt for gobject-introspection 1.41.4 + +* Wed Jun 25 2014 Richard Hughes - 3.13.3-1 +- Update to 3.13.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 3.12.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 15 2014 Kalev Lember - 3.12.2-1 +- Update to 3.12.2 + +* Wed May 07 2014 Kalev Lember - 3.12.0-2 +- Ship icons in the main package, instead of -devel + +* Mon Mar 24 2014 Richard Hughes - 3.12.0-1 +- Update to 3.12.0 + +* Wed Mar 19 2014 Richard Hughes - 3.11.92.2-1 +- Update to 3.11.92.2 + +* Tue Mar 18 2014 Richard Hughes - 3.11.92-1 +- Update to 3.11.92 + +* Tue Mar 04 2014 Richard Hughes - 3.11.91-1 +- Update to 3.11.91 + +* Wed Feb 05 2014 Richard Hughes - 3.11.5-1 +- Update to 3.11.5 + +* Wed Jan 15 2014 Richard Hughes - 3.11.4.1-1 +- Update to 3.11.4.1 + +* Tue Sep 24 2013 Kalev Lember - 3.10.0-1 +- Update to 3.10.0 +- Specify minimum json-glib version + +* Wed Sep 18 2013 Kalev Lember - 0.99.4-1 +- Update to 0.99.4 + +* Tue Sep 03 2013 Kalev Lember - 0.99.3-1 +- Update to 0.99.3 + +* Sat Aug 31 2013 Kalev Lember - 0.99.2-2 +- Move the pkgconfig file to -devel + +* Fri Aug 23 2013 Kalev Lember - 0.99.2-1 +- Initial Fedora packaging