Merge branch 'update_to_236' into 'master'

[tracker] Upgrade to 2.3.6. Contributes to JB#51256

See merge request mer-core/tracker!33

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "upstream"]
 	path = upstream
-	url = https://git.merproject.org/mirror/tracker.git
+	url = https://git.sailfishos.org/mirror/tracker.git

rpm/002-allow-skip-reset-prompt.patch

@@ -20,7 +20,7 @@ index d4821cd..8dee8ab 100644
  	  N_("Same as --hard but the backup & journal are restored after restart"),
  	  NULL },
 +	{ "yes", 'y', 0, G_OPTION_ARG_NONE, &no_prompt,
-+	  N_("Skip interactive verification for reset."),
++	  N_("Skip interactive verification for reset"),
 +	  NULL },
  	{ "config", 'c', 0, G_OPTION_ARG_NONE, &remove_config,
  	  N_("Remove all configuration files so they are re-generated on next start"),

rpm/tracker.spec

@@ -1,64 +1,59 @@
 Name:       tracker
-
-Summary:    An efficient search engine and triplestore for desktop, embedded and mobile.
-Version:    2.3.4
+Summary:    Desktop-neutral metadata database and search tool
+Version:    2.3.6
 Release:    1
-License:    LGPLv2.1+ and BSD
-URL:        https://gitlab.gnome.org/GNOME/%{name}/
-Source0:    https://gitlab.gnome.org/GNOME/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2
+License:    LGPLv2+ and GPLv2+
+URL:        https://wiki.gnome.org/Projects/Tracker
+Source0:    %{name}-%{version}.tar.bz2
 Source1:    tracker-configs.sh
 Patch1:     001-Tracker-config-overrides.patch
 Patch2:     002-allow-skip-reset-prompt.patch
 Patch3:     003-Disable-trackertestutils.patch
 
-Requires:   unzip
-Requires:   systemd
-Requires:   systemd-user-session-targets
-Obsoletes:  tracker-utils
-
-Requires(post): /sbin/ldconfig
-Requires(post):  oneshot
-Requires(postun): /sbin/ldconfig
 BuildRequires:  meson >= 0.50
-BuildRequires:  ninja
+BuildRequires:  vala-devel >= 0.16
+BuildRequires:  gettext
+BuildRequires:  intltool
+BuildRequires:  oneshot
 BuildRequires:  pkgconfig(dbus-glib-1) >= 0.60
-BuildRequires:  pkgconfig(gio-2.0)
-BuildRequires:  pkgconfig(gio-unix-2.0)
-BuildRequires:  pkgconfig(gmodule-2.0)
-BuildRequires:  pkgconfig(gobject-2.0)
+BuildRequires:  pkgconfig(gio-2.0) >= 2.46.0
+BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.46.0
+BuildRequires:  pkgconfig(gmodule-2.0) >= 2.46.0
+BuildRequires:  pkgconfig(gobject-2.0) >= 2.46.0
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(glib-2.0) >= 2.38.0
+BuildRequires:  pkgconfig(glib-2.0) >= 2.46.0
 BuildRequires:  pkgconfig(icu-uc)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(icu-i18n)
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.6
+BuildRequires:  pkgconfig(libsoup-2.4) >= 2.40
 BuildRequires:  pkgconfig(sqlite3) >= 3.11
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(uuid)
-BuildRequires:  pkgconfig(json-glib-1.0)
-BuildRequires:  gettext
-BuildRequires:  vala-devel >= 0.16
-BuildRequires:  intltool
-BuildRequires:  fdupes
-BuildRequires:  oneshot
+BuildRequires:  pkgconfig(json-glib-1.0) >= 1.0
+
+Requires:   systemd-user-session-targets
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+%{_oneshot_requires_post}
+
+Obsoletes:  tracker-utils
 
 %description
 Tracker is a powerful desktop-neutral first class object database,
-tag/metadata database, search tool and indexer.
+tag/metadata database and search tool.
 
 It consists of a common object database that allows entities to have an
-almost infinte number of properties, metadata (both embedded/harvested as
+almost infinite number of properties, metadata (both embedded/harvested as
 well as user definable), a comprehensive database of keywords/tags and
 links to other entities.
 
 It provides additional features for file based objects including context
 linking and audit trails for a file object.
 
-It has the ability to index, store, harvest metadata. retrieve and search
-all types of files and other first class objects.
+Metadata indexers are provided by the tracker-miners package.
 
 %package devel
 Summary:    Development files for %{name}
-Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
@@ -71,23 +66,18 @@ Development files for %{name}.
 %meson -Dman=false -Ddocs=false -Dfunctional_tests=false \
        -Dnetwork_manager=disabled -Dstemmer=disabled \
        -Dunicode_support=icu \
+       -Dbash_completion=no \
        -Dsystemd_user_services=%{_userunitdir}
+%meson_build
 
 %install
-rm -rf %{buildroot}
-
 %meson_install
 
-rm %{buildroot}/etc/xdg/autostart/tracker-store.desktop
-
 # oneshot run in install
-mkdir -p %{buildroot}%{_oneshotdir}
-cp -a %{SOURCE1} %{buildroot}%{_oneshotdir}
+install -D -m 755 %{SOURCE1} %{buildroot}/%{_oneshotdir}/tracker-configs.sh
 
 %find_lang %{name}
 
-%fdupes  %{buildroot}/%{_datadir}/
-
 %post
 /sbin/ldconfig
 glib-compile-schemas   /usr/share/glib-2.0/schemas/
@@ -97,7 +87,6 @@ systemctl-user stop tracker-store.service || :
 add-oneshot --new-users --all-users tracker-configs.sh || :
 fi
 
-
 %postun
 /sbin/ldconfig
 glib-compile-schemas   /usr/share/glib-2.0/schemas/
@@ -108,31 +97,37 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_datadir}/dbus-1/services/org.freedesktop.Tracker1.service
-%dir %{_datadir}/tracker
+%license COPYING COPYING.LGPL COPYING.GPL
 %{_bindir}/tracker
+%{_libexecdir}/tracker-store
+%{_libdir}/libtracker-control-*.so.*
+%{_libdir}/libtracker-miner-*.so.*
+%{_libdir}/libtracker-sparql-*.so.*
+%{_libdir}/tracker-2.0/libtracker-data.so
+%{_datadir}/dbus-1/services/org.freedesktop.Tracker1.service
+%{_datadir}/glib-2.0/schemas/org.freedesktop.Tracker.*.xml
 %{_datadir}/tracker/*.xml
 %{_datadir}/tracker/stop-words/*
 %{_datadir}/tracker/domain-ontologies/default.rule
 %{_datadir}/tracker/ontologies/*
-%{_datadir}/vala/vapi/tracker*.deps
-%{_datadir}/vala/vapi/tracker*.vapi
-%dir %{_libdir}/tracker-2.0
-%{_datadir}/glib-2.0/schemas/org.freedesktop.Tracker.*.xml
-%{_libdir}/libtracker-miner-*.so*
-%{_libdir}/libtracker-sparql-*.so*
-%{_libdir}/libtracker-control-*.so*
-%{_libdir}/tracker-2.0/libtracker-data.so
-%{_libexecdir}/tracker-store
-%license COPYING COPYING.GPL COPYING.LGPL
 %{_userunitdir}/tracker-store.service
 %attr(0755, -, -) %{_oneshotdir}/tracker-configs.sh
-%{_datadir}/bash-completion/completions/tracker
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/tracker-2.0
-%{_libdir}/pkgconfig/tracker-*.pc
-%{_libdir}/girepository-1.0/Tracker*.typelib
-%{_datadir}/gir-1.0/Tracker*.gir
-
+%doc AUTHORS NEWS README.md
+%{_includedir}/tracker-2.0/
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/Tracker-2.0.typelib
+%{_libdir}/girepository-1.0/TrackerControl-2.0.typelib
+%{_libdir}/girepository-1.0/TrackerMiner-2.0.typelib
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/tracker*.deps
+%{_datadir}/vala/vapi/tracker*.vapi
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/Tracker-2.0.gir
+%{_datadir}/gir-1.0/TrackerControl-2.0.gir
+%{_datadir}/gir-1.0/TrackerMiner-2.0.gir