rpms/nautilus
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 47.1

Browse Source 
Resolves: RHEL-71390
This commit is contained in:
Ondrej Holy 2024-12-09 16:26:55 +01:00
parent d06273733d
commit 51d58074e3
6 changed files with 4 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -190,3 +190,4 @@ nautilus-2.31.6.tar.bz2
/nautilus-46.1.tar.xz
/nautilus-46.2.tar.xz
/nautilus-47.0.tar.xz
/nautilus-47.1.tar.xz

131
0001-Revert-general-React-to-tracker-projects-rename.patch
View File

@ -1,131 +0,0 @@
From f514545834b18a68d3818eebfe57de7df87700e8 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 8 Aug 2024 09:50:02 -0400
Subject: [PATCH] Revert "general: React to tracker projects rename"
This reverts commit 0e6e3946ebfcbaf1c7e2ebbb1300dd3a016ee0e9.
---
README.md | 2 +-
build-aux/flatpak/org.gnome.Nautilus.json | 8 ++++----
data/tracker/meson.build | 9 ++++-----
.../org.gnome.Nautilus.Tracker3.Miner.Extract.service.in | 4 ++--
.../org.gnome.Nautilus.Tracker3.Miner.Files.service.in | 4 ++--
src/nautilus-tag-manager.c | 4 ++--
6 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
index a726662b3..090a76a47 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/main
## Runtime dependencies
- [Bubblewrap](https://github.com/projectatomic/bubblewrap) installed. Used for security reasons.
-- [LocalSearch](https://gitlab.gnome.org/GNOME/localsearch) properly set up and with all features enabled. Used for fast search and metadata extraction, starred files and batch renaming.
+- [Tracker (including tracker-miners)](https://gitlab.gnome.org/GNOME/tracker) properly set up and with all features enabled. Used for fast search and metadata extraction, starred files and batch renaming.
## Discourse
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
index ccf653829..362b933e0 100644
--- a/build-aux/flatpak/org.gnome.Nautilus.json
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -72,11 +72,11 @@
]
},
{
- "name": "localsearch",
+ "name": "tracker-miners",
"buildsystem": "meson",
"cleanup": [
"/etc",
- "/libexec/localsearch-3",
+ "/libexec/tracker-3",
"/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service",
"/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service",
"/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service"
@@ -95,8 +95,8 @@
"sources": [
{
"type": "git",
- "url": "https://gitlab.gnome.org/GNOME/localsearch.git",
- "branch": "main"
+ "url": "https://gitlab.gnome.org/GNOME/tracker-miners.git",
+ "branch": "master"
}
]
},
diff --git a/data/tracker/meson.build b/data/tracker/meson.build
index 2921ca925..5320af164 100644
--- a/data/tracker/meson.build
+++ b/data/tracker/meson.build
@@ -1,12 +1,11 @@
-# Files needed for running LocalSearch (historically known as Tracker) inside
-# the Flatpak sandbox, for systems which don't have a suitable version of
-# LocalSearch in the host OS.
+# Files needed for running Tracker inside the Flatpak sandbox, for systems
+# which don't have a suitable version of Tracker in the host OS.
#
# We must export the .service files from the sandbox so they work on the
-# session bus. This means the LocalSearch domain name must correspond with the
+# session bus. This means the Tracker domain name must correspond with the
# application ID.
-domain_ontologies_dir = get_option('datadir') / 'localsearch3' / 'domain-ontologies'
+domain_ontologies_dir = get_option('datadir') / 'tracker3' / 'domain-ontologies'
dbus_services_dir = get_option('datadir') / 'dbus-1' / 'services'
tracker_domain_config = configuration_data()
diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
index 23ded4583..eb7a87aa6 100644
--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
+++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Extract.service.in
@@ -1,7 +1,7 @@
[D-BUS Service]
Name=@application_id@.Tracker3.Miner.Extract
-Exec=/app/libexec/localsearch-extractor-3 --domain-ontology @domain_rule@
+Exec=/app/libexec/tracker-extract-3 --domain-ontology @domain_rule@
-# Miner details needed for localsearch-control
+# Miner details needed for tracker-control
Path=/org/freedesktop/Tracker3/Miner/Extract
NameSuffix=Miner.Files
diff --git a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
index d770619b3..4fa7371d1 100644
--- a/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
+++ b/data/tracker/org.gnome.Nautilus.Tracker3.Miner.Files.service.in
@@ -1,7 +1,7 @@
[D-BUS Service]
Name=@application_id@.Tracker3.Miner.Files
-Exec=/app/libexec/localsearch-3 --domain-ontology @domain_rule@ --initial-sleep 0
+Exec=/app/libexec/tracker-miner-fs-3 --domain-ontology @domain_rule@ --initial-sleep 0
-# Miner details needed for localsearch-control
+# Miner details needed for tracker-control
Path=/org/freedesktop/Tracker3/Miner/Files
NameSuffix=Miner.Files
diff --git a/src/nautilus-tag-manager.c b/src/nautilus-tag-manager.c
index 4c1da5ec5..b946225e3 100644
--- a/src/nautilus-tag-manager.c
+++ b/src/nautilus-tag-manager.c
@@ -955,7 +955,7 @@ child_watch_cb (GPid pid,
static void
export_tracker2_data (NautilusTagManager *self)
{
- gchar *argv[] = {"tinysparql3", "export", "--2to3", "files-starred", "--keyfile", NULL};
+ gchar *argv[] = {"tracker3", "export", "--2to3", "files-starred", "--keyfile", NULL};
gint stdout_fd;
GPid child_pid;
g_autoptr (GError) error = NULL;
@@ -979,7 +979,7 @@ export_tracker2_data (NautilusTagManager *self)
&error);
if (!success)
{
- g_warning ("Tracker 2 migration: Couldn't run `tinysparql3`: %s", error->message);
+ g_warning ("Tracker 2 migration: Couldn't run `tracker3`: %s", error->message);
return;
}
--
2.46.0

23
0002-Revert-test-Update-to-localsearch-CLI-rename.patch
View File

@ -1,23 +0,0 @@
From 39edbf3582c835a36d5c0b5d13f3c14fea7b960f Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 8 Aug 2024 10:03:13 -0400
Subject: [PATCH 2/2] Revert "test: Update to localsearch CLI rename"
This reverts commit 9fdcb225fb1b4c8fc2df06df5f70f43809aeed0d.
---
test/automated/displayless/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
index d0a70e1d6..13616a260 100644
--- a/test/automated/displayless/meson.build
+++ b/test/automated/displayless/meson.build
@@ -1,4 +1,4 @@
-tracker_sandbox = find_program('localsearch')
+tracker_sandbox = find_program('localsearch3')
tests = [
['test-directory', [
--
2.46.0

34
0003-Revert-tests-Use-localsearch3-test-sandbox.patch
View File

@ -1,34 +0,0 @@
From 458b58d35a8234cadd7a4f3d5bfb71f14d613d3a Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 8 Aug 2024 10:13:05 -0400
Subject: [PATCH 3/3] Revert "tests: Use localsearch3 test-sandbox"
This reverts commit 25f445f4d7f38f501090cca88566ffd319d69463.
---
test/automated/displayless/meson.build | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
index 13616a260..9d50c5084 100644
--- a/test/automated/displayless/meson.build
+++ b/test/automated/displayless/meson.build
@@ -1,4 +1,6 @@
-tracker_sandbox = find_program('localsearch3')
+trackertestutils = dependency('tracker-testutils-3.0')
+
+tracker_sandbox = find_program(trackertestutils.get_variable('command'))
tests = [
['test-directory', [
@@ -73,7 +75,7 @@ foreach t: tracker_tests
test(
t[0],
tracker_sandbox,
- args: ['test-sandbox', '--store-tmpdir', '--index-recursive-tmpdir', test_exe],
+ args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe],
env: [
test_env,
'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()),
--
2.46.0

10
nautilus.spec
View File

@ -6,7 +6,7 @@
%global libadwaita_version 1.6~beta
Name: nautilus
Version: 47.0
Version: 47.1
%global tarball_version %%(echo %{version} | tr '~' '.')
%global major_version %%(cut -d "." -f 1 <<<%{tarball_version})
@ -20,12 +20,6 @@ URL: https://apps.gnome.org/Nautilus/
Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz
# https://pagure.io/fedora-workstation/issue/442
Patch: default-terminal.patch
# These patches all revert commits that handle 'tracker' being renamed
# to 'localsearch', because that change hasn't landed in Rawhide yet
# Drop these patches when the package gets renamed
Patch: 0001-Revert-general-React-to-tracker-projects-rename.patch
Patch: 0002-Revert-test-Update-to-localsearch-CLI-rename.patch
Patch: 0003-Revert-tests-Use-localsearch3-test-sandbox.patch
BuildRequires: desktop-file-utils
BuildRequires: gcc
@ -135,7 +129,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
%{_mandir}/man1/nautilus-autorun-software.1*
%{_datadir}/glib-2.0/schemas/org.gnome.nautilus.gschema.xml
%{_datadir}/nautilus/
%exclude %{_datadir}/tracker3/domain-ontologies/org.gnome.Nautilus.domain.rule
%exclude %{_datadir}/localsearch3/domain-ontologies/org.gnome.Nautilus.domain.rule
%{_libdir}/nautilus/extensions-4/libnautilus-image-properties.so
%{_libdir}/nautilus/extensions-4/libtotem-properties-page.so
%{_metainfodir}/org.gnome.Nautilus.metainfo.xml

2
sources
View File

@ -1 +1 @@
SHA512 (nautilus-47.0.tar.xz) = e124f56069cee26d0be352f5c8f33016f9f5059144cf089c9d84b791d792597d1fc95d90b7187955abef877b7188a3608cd287195e3246e27f7a34b0d169907c
SHA512 (nautilus-47.1.tar.xz) = 132139aa3d39d220ec5edf112bda97a0dd0c5f5978f7390f897679b78d30efeab63e6330ef1f9593c193f28d96919621ff4fe5a66992ee1f10b69ab9a240255b