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

Update to 3.1.0.rc, based on earlier tracker3 packaging

Browse Source 
This effectively retires old tracker 2.x and moves tracker 3.x from
tracker3 package to tracker package as we no longer have any packages
left that require tracker 2.x.

I've reused tracker3 packaging here exactly as it was, and only updated
the package name to tracker + added obsoletes and provides to keep the
upgrade path.

With this, we can retire the separate tracker3 package.
This commit is contained in:
Kalev Lember 2021-03-19 13:12:27 +01:00
parent 7819b0ff38
commit 676ad250a5
3 changed files with 64 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
SHA512 (tracker-2.3.6.tar.xz) = 1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e SHA512 (tracker-3.1.0.rc.tar.xz) = 9712af7f5c6a87197ebe60591a604e31a1936b55e44263fffa702ce6361158d580a680ba4710cc4e8ad1ab19b9872c21d588d487a68beb782cd33361cfaa93a2

26
tracker-2.3.6-fix-fts-sqlite-3.34.0.patch
View File

@ -1,26 +0,0 @@
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index e2f46685e..19cae25f9 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -2244,6 +2244,7 @@ cache_delete_resource_type_full (TrackerData *data,
g_hash_table_size (data->resource_buffer->tables) == 0) {
#if HAVE_TRACKER_FTS
tracker_db_interface_sqlite_fts_delete_id (iface, data->resource_buffer->id);
+ data->resource_buffer->fts_updated = TRUE;
#endif
/* skip subclass query when deleting whole resource
to improve performance */
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c
index da88080ed..cdeb960e7 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.c
+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
@@ -1770,7 +1770,8 @@ tracker_db_interface_sqlite_fts_create_delete_all_query (TrackerDBInterface *db_
g_string_append_printf (insert_str,
"INSERT INTO fts5 (fts5, rowid %s) "
"SELECT 'delete', rowid %s FROM fts_view "
- "WHERE rowid = ?",
+ "WHERE rowid = ? AND COALESCE(NULL %s) IS NOT NULL",
+ db_interface->fts_properties,
db_interface->fts_properties,
db_interface->fts_properties);
return g_string_free (insert_str, FALSE);

159
tracker.spec
View File

@ -1,26 +1,19 @@
%global _changelog_trimtime %(date +%s -d "1 year ago") %global systemd_units tracker-xdg-portal-3
%global systemd_units tracker-store.service %global tarball_version %%(echo %{version} | tr '~' '.')
# Exclude private libraries from autogenerated provides and requires
%global __provides_exclude_from ^%{_libdir}/tracker-2.0/
%global __requires_exclude ^(libtracker-common.so|libtracker-data.so)
Name: tracker Name: tracker
Version: 2.3.6 Version: 3.1.0~rc
Release: 3%{?dist} Release: 2%{?dist}
Summary: Desktop-neutral metadata database and search tool Summary: Desktop-neutral metadata database and search tool
License: GPLv2+ License: GPLv2+
URL: https://wiki.gnome.org/Projects/Tracker URL: https://gnome.pages.gitlab.gnome.org/tracker/
Source0: https://download.gnome.org/sources/%{name}/2.3/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/tracker/3.1/tracker-%{tarball_version}.tar.xz
# https://bugzilla.redhat.com/show_bug.cgi?id=1907021
Patch0: tracker-2.3.6-fix-fts-sqlite-3.34.0.patch
BuildRequires: asciidoc
BuildRequires: gettext BuildRequires: gettext
BuildRequires: graphviz
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: libappstream-glib
BuildRequires: libstemmer-devel BuildRequires: libstemmer-devel
BuildRequires: meson BuildRequires: meson
BuildRequires: systemd BuildRequires: systemd
@ -30,14 +23,16 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(icu-uc)
BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libnm)
BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(uuid)
BuildRequires: /usr/bin/dbus-run-session BuildRequires: /usr/bin/dbus-run-session
Requires: libtracker-control%{?_isa} = %{version}-%{release} # renamed in F34
Obsoletes: tracker3 < 3.1.0~rc-2
Provides: tracker3 = %{version}-%{release}
Provides: tracker3%{?_isa} = %{version}-%{release}
Requires: libtracker-sparql%{?_isa} = %{version}-%{release} Requires: libtracker-sparql%{?_isa} = %{version}-%{release}
Recommends: tracker-miners%{?_isa} Recommends: tracker-miners%{?_isa}
@ -58,78 +53,61 @@ linking and audit trails for a file object.
Metadata indexers are provided by the tracker-miners package. Metadata indexers are provided by the tracker-miners package.
%package -n libtracker-control
Summary: Tracker control library
Requires: libtracker-sparql%{?_isa} = %{version}-%{release}
Recommends: %{name}%{?_isa} = %{version}-%{release}
# libtracker-control was split out of tracker in 2.3.1-2
Conflicts: tracker < %{version}-%{release}
%description -n libtracker-control
This package contains the libtracker-control library.
%package -n libtracker-miner
Summary: Tracker miner library
Requires: libtracker-sparql%{?_isa} = %{version}-%{release}
Recommends: %{name}%{?_isa} = %{version}-%{release}
# libtracker-miner was split out of tracker in 2.3.1-2
Conflicts: tracker < %{version}-%{release}
%description -n libtracker-miner
This package contains the libtracker-miner library.
%package -n libtracker-sparql %package -n libtracker-sparql
Summary: Tracker SPARQL library Summary: Tracker SPARQL library
License: LGPLv2+
Recommends: %{name}%{?_isa} = %{version}-%{release} Recommends: %{name}%{?_isa} = %{version}-%{release}
# libtracker-sparql was split out of tracker in 2.2.2-2 # renamed in F34
Conflicts: tracker < %{version}-%{release} Obsoletes: libtracker-sparql3 < 3.1.0~rc-2
Provides: libtracker-sparql3 = %{version}-%{release}
Provides: libtracker-sparql3%{?_isa} = %{version}-%{release}
%description -n libtracker-sparql %description -n libtracker-sparql
This package contains the libtracker-sparql library. This package contains the libtracker-sparql library.
%package devel
Summary: Headers for developing programs that will use %{name} %package devel
Requires: %{name}%{?_isa} = %{version}-%{release} Summary: Development files for %{name}
Requires: libtracker-control%{?_isa} = %{version}-%{release}
Requires: libtracker-miner%{?_isa} = %{version}-%{release}
Requires: libtracker-sparql%{?_isa} = %{version}-%{release} Requires: libtracker-sparql%{?_isa} = %{version}-%{release}
# renamed in F34
Obsoletes: tracker3-devel < 3.1.0~rc-2
Provides: tracker3-devel = %{version}-%{release}
Provides: tracker3-devel%{?_isa} = %{version}-%{release}
%description devel %description devel
This package contains the static libraries and header files needed for The %{name}-devel package contains libraries and header files for
developing with tracker developing applications that use %{name}.
%package doc
Summary: Documentation for tracker %package doc
Summary: Documentation for %{name}
BuildArch: noarch BuildArch: noarch
# Renamed in F32 # renamed in F34
Obsoletes: tracker-docs < %{version}-%{release} Obsoletes: tracker3-doc < 3.1.0~rc-2
Provides: tracker-docs = %{version}-%{release} Provides: tracker3-doc = %{version}-%{release}
%description doc %description doc
This package contains the documentation for tracker The %{name}-devel package contains the documentation for %{name}.
%prep %prep
%autosetup -p1 %autosetup -p1 -n tracker-%{tarball_version}
%build %build
# Disable the functional tests for now, they use python bytecodes.
%meson \ %meson \
-Ddocs=true \
-Dfunctional_tests=false \
-Dunicode_support=icu \ -Dunicode_support=icu \
-Dsystemd_user_services=%{_userunitdir} -Dsystemd_user_services_dir=%{_userunitdir} \
%{nil}
%meson_build %meson_build
%install %install
%meson_install %meson_install
# Remove files that are only needed by functional tests (which we currently disable) %find_lang tracker3
rm -rf $RPM_BUILD_ROOT%{_libdir}/tracker-2.0/trackertestutils/
%find_lang %{name}
%post %post
@ -142,62 +120,51 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/tracker-2.0/trackertestutils/
%systemd_user_postun_with_restart %{systemd_units} %systemd_user_postun_with_restart %{systemd_units}
%files -f %{name}.lang %files -f tracker3.lang
%license COPYING %license COPYING COPYING.GPL
%doc AUTHORS NEWS README.md %doc AUTHORS NEWS README.md
%{_bindir}/tracker %{_bindir}/tracker3
%{_libexecdir}/tracker-store %{_libexecdir}/tracker3/
%{_datadir}/dbus-1/services/org.freedesktop.Tracker1.service %{_libexecdir}/tracker-xdg-portal-3
%{_mandir}/man1/tracker*.1*
%dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions %dir %{_datadir}/bash-completion/completions
%{_datadir}/bash-completion/completions/tracker %{_datadir}/bash-completion/completions/tracker3
%{_userunitdir}/tracker-store.service %{_datadir}/dbus-1/services/org.freedesktop.portal.Tracker.service
%{_mandir}/man1/tracker*.1*
%files -n libtracker-control %{_userunitdir}/tracker-xdg-portal-3.service
%license COPYING
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/TrackerControl-2.0.typelib
%{_libdir}/libtracker-control-2.0.so.*
%files -n libtracker-miner
%license COPYING
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/TrackerMiner-2.0.typelib
%{_libdir}/libtracker-miner-2.0.so.*
%files -n libtracker-sparql %files -n libtracker-sparql
%license COPYING %license COPYING COPYING.LGPL
%dir %{_libdir}/girepository-1.0 %dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/Tracker-2.0.typelib %{_libdir}/girepository-1.0/Tracker-3.0.typelib
%{_libdir}/libtracker-sparql-2.0.so.* %{_libdir}/libtracker-sparql-3.0.so.0*
%{_libdir}/tracker-2.0/ %{_datadir}/tracker3/
%{_datadir}/glib-2.0/schemas/*
%{_datadir}/tracker/
%files devel %files devel
%{_includedir}/tracker-2.0/ %{_includedir}/tracker-3.0/
%{_libdir}/*.so %{_libdir}/libtracker-sparql-3.0.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%dir %{_libdir}/tracker-3.0
%{_libdir}/tracker-3.0/trackertestutils/
%dir %{_datadir}/vala %dir %{_datadir}/vala
%dir %{_datadir}/vala/vapi %dir %{_datadir}/vala/vapi
%{_datadir}/vala/vapi/tracker*.* %{_datadir}/vala/vapi/tracker-sparql-3.0.*
%dir %{_datadir}/gir-1.0 %dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/Tracker-2.0.gir %{_datadir}/gir-1.0/Tracker-3.0.gir
%{_datadir}/gir-1.0/TrackerControl-2.0.gir
%{_datadir}/gir-1.0/TrackerMiner-2.0.gir
%files doc %files doc
%license docs/reference/COPYING %license docs/reference/COPYING
%dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html %dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/libtracker-control/ %{_datadir}/gtk-doc/html/libtracker-sparql-3/
%{_datadir}/gtk-doc/html/libtracker-miner/ %{_datadir}/gtk-doc/html/ontology-3/
%{_datadir}/gtk-doc/html/libtracker-sparql/
%{_datadir}/gtk-doc/html/ontology/
%changelog %changelog
* Fri Mar 19 2021 Kalev Lember <klember@redhat.com> - 3.1.0~rc-2
- Update to 3.1.0.rc, based on earlier tracker3 packaging
- Obsolete separate tracker3 packages
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-3 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild