diff --git a/disable_timeTest.patch b/disable_timeTest.patch new file mode 100644 index 0000000000000000000000000000000000000000..291ec3586ea8469c2a37c2029ef4368ff9c44c0c --- /dev/null +++ b/disable_timeTest.patch @@ -0,0 +1,10 @@ +diff -up gnome-maps-43.2/tests/meson.build.BAK gnome-maps-43.2/tests/meson.build +--- gnome-maps-43.2/tests/meson.build.BAK 2023-01-10 19:31:32.201578965 +0800 ++++ gnome-maps-43.2/tests/meson.build 2023-01-10 19:31:38.665578586 +0800 +@@ -1,5 +1,5 @@ + tests = ['addressTest', 'boundingBoxTest', 'colorTest', 'osmNamesTest', +- 'placeIconsTest', 'placeZoomTest', 'timeTest', 'translationsTest', ++ 'placeIconsTest', 'placeZoomTest', 'translationsTest', + 'utilsTest', 'urisTest', 'wikipediaTest'] + + # suffix for source resources (so we get /org/gnome/Maps or diff --git a/gnome-maps-42.2.tar.xz b/gnome-maps-43.2.tar.xz similarity index 50% rename from gnome-maps-42.2.tar.xz rename to gnome-maps-43.2.tar.xz index 51371d0d55680da81e76d293ae981e75e6b3c106..5d16f93642f712f5650a1b1d9cd3e0434d488035 100644 Binary files a/gnome-maps-42.2.tar.xz and b/gnome-maps-43.2.tar.xz differ diff --git a/gnome-maps.spec b/gnome-maps.spec index 21fe900bfc3784e25fdcad4f7a89fd0a910a7604..55df6de5d43df3f32aec352ccbc1e222c8d4c4fb 100644 --- a/gnome-maps.spec +++ b/gnome-maps.spec @@ -1,38 +1,42 @@ -%global gjs_version 1.66.0 -%global champlain_version 0.12.14 -%global libhandy_version 1.5.0 +%global gjs_version 1.69.2 +%global libshumate_version 1.0.0 + +%global __provides_exclude_from ^%{_libdir}/%{name}/.*\\.so.*$ Name: gnome-maps -Version: 42.2 +Version: 43.2 Release: 1 Summary: A map application for GNOME - License: GPLv2+ URL: https://wiki.gnome.org/Apps/Maps -Source0: https://download.gnome.org/sources/%{name}/42/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{version}.tar.xz +Patch0: disable_timeTest.patch -BuildRequires: gcc gettext meson desktop-file-utils libappstream-glib glib2-devel -BuildRequires: pkgconfig(champlain-0.12) >= %{champlain_version} -BuildRequires: pkgconfig(folks) -BuildRequires: pkgconfig(gee-0.8) -BuildRequires: pkgconfig(geocode-glib-1.0) +BuildRequires: gcc gettext meson desktop-file-utils libappstream-glib BuildRequires: pkgconfig(geoclue-2.0) +BuildRequires: pkgconfig(geocode-glib-2.0) +BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gjs-1.0) >= %{gjs_version} -BuildRequires: pkgconfig(libhandy-1) >= %{libhandy_version} -BuildRequires: pkgconfig(rest-0.7) +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gtk4) +BuildRequires: pkgconfig(gweather4) +BuildRequires: pkgconfig(libadwaita-1) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(rest-1.0) +BuildRequires: pkgconfig(shumate-1.0) >= %{libshumate_version} -Requires: clutter%{?_isa} -Requires: clutter-gtk%{?_isa} -Requires: cogl%{?_isa} Requires: dbus Requires: gdk-pixbuf2%{?_isa} Requires: geoclue2-libs%{?_isa} -Requires: gfbgraph%{?_isa} +Requires: geocode-glib2%{?_isa} Requires: gjs%{?_isa} >= %{gjs_version} Requires: gobject-introspection%{?_isa} -Requires: gtk3%{?_isa} -Requires: libchamplain-gtk%{?_isa} >= %{champlain_version} -Requires: libhandy%{?_isa} >= %{libhandy_version} +Requires: gtk4%{?_isa} +Requires: libadwaita%{?_isa} +Requires: libgweather4%{?_isa} +Requires: libshumate%{?_isa} >= %{libshumate_version} +Requires: libsoup3%{?_isa} %description GNOME Maps is a simple map application for the GNOME desktop. @@ -53,6 +57,7 @@ rm %{buildroot}%{_libdir}/gnome-maps/libgnome-maps.so %check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.gnome.Maps.appdata.xml desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Maps.desktop +%meson_test %files -f %{name}.lang %doc NEWS README @@ -68,6 +73,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Maps.deskto %{_libdir}/%{name}/ %changelog +* Mon Jan 2 2023 lin zhang - 43.2-1 +- Update to 43.2 + * Mon Mar 28 2022 lin zhang - 42.2-1 - Update to 42.2 and Add gnome-maps.yaml