From 12284aafd5b596ef0e458a935a106e9ef5668b7c Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 30 Jun 2022 16:13:38 +0200 Subject: [PATCH] Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild --- .gitignore | 1 + geocode-glib.spec | 52 +++++++++++++++++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 675619d..0a59390 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /geocode-glib-3.26.0.tar.xz /geocode-glib-3.26.1.tar.xz /geocode-glib-3.26.2.tar.xz +/geocode-glib-3.26.3.tar.xz diff --git a/geocode-glib.spec b/geocode-glib.spec index 3511a19..c1a6df7 100644 --- a/geocode-glib.spec +++ b/geocode-glib.spec @@ -1,8 +1,8 @@ %global json_glib_version 0.99.2 Name: geocode-glib -Version: 3.26.2 -Release: 5%{?dist} +Version: 3.26.3 +Release: 1%{?dist} Summary: Geocoding helper library License: LGPLv2+ @@ -16,8 +16,10 @@ 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: pkgconfig(libsoup-3.0) Requires: json-glib%{?_isa} >= %{json_glib_version} +Requires: %{name}-data = %{version}-%{release} %description geocode-glib is a convenience library for the geocoding (finding longitude, @@ -26,6 +28,11 @@ coordinates). It uses Nominatim service to achieve that. It also caches (reverse-)geocoding requests for faster results and to avoid unnecessary server load. +%package data +Summary: Icon files for %{name} + +%description data +The %{name}-devel package contains icon files for applications that use %{name}. %package devel Summary: Development files for %{name} @@ -35,6 +42,27 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package -n geocode-glib2 +Summary: Development files for %{name} +Requires: json-glib%{?_isa} >= %{json_glib_version} +Requires: %{name}-data = %{version}-%{release} + +%description -n geocode-glib2 +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. + +This package contains version 2 of the API, which uses libsoup3 internally. + +%package -n geocode-glib2-devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description -n geocode-glib2-devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. %prep %setup -q @@ -44,10 +72,12 @@ developing applications that use %{name}. %meson -Denable-installed-tests=false %meson_build +meson --prefix=/usr -Denable-installed-tests=false -Dsoup2=false _soup3 +ninja -C _soup3 %install %meson_install - +DESTDIR=%{buildroot} ninja -C _soup3 install %ldconfig_scriptlets @@ -57,7 +87,9 @@ developing applications that use %{name}. %doc AUTHORS NEWS README %{_libdir}/libgeocode-glib.so.* %{_libdir}/girepository-1.0/GeocodeGlib-1.0.typelib -%{_datadir}/icons/gnome/scalable/places/*.svg + +%files data +%{_datadir}/icons/hicolor/scalable/places/*.svg %files devel %{_includedir}/geocode-glib-1.0/ @@ -66,6 +98,18 @@ developing applications that use %{name}. %{_datadir}/gir-1.0/GeocodeGlib-1.0.gir %doc %{_datadir}/gtk-doc/ +%files -n geocode-glib2 +%license COPYING.LIB +%doc AUTHORS NEWS README +%{_libdir}/libgeocode-glib-2.so.* +%{_libdir}/girepository-1.0/GeocodeGlib-2.0.typelib + +%files -n geocode-glib2-devel +%{_includedir}/geocode-glib-2.0/ +%{_libdir}/libgeocode-glib-2.so +%{_libdir}/pkgconfig/geocode-glib-2.0.pc +%{_datadir}/gir-1.0/GeocodeGlib-2.0.gir +%doc %{_datadir}/gtk-doc/ %changelog * Thu Jan 20 2022 Fedora Release Engineering - 3.26.2-5 diff --git a/sources b/sources index 833b157..67a9817 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geocode-glib-3.26.2.tar.xz) = b3ef81fac6959f6c4725ca721125cdafbbec69233f321872e17f9035266ed7616018ef54a9082fbd0a83395d18c664144cfe3b431d63744be433f058071cd435 +SHA512 (geocode-glib-3.26.3.tar.xz) = 42313b1da24f5256ad73bd4be366d6bacf35256acc098e4865bbff58e92c5b78f4a2537e4787c6387190f10a2be2a72bc1507f7cb436e096e772195cf30fca7c