From 676ad250a5301d7f7ee3420bbdadc2bd732fde43 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 19 Mar 2021 13:12:27 +0100 Subject: [PATCH] Update to 3.1.0.rc, based on earlier tracker3 packaging 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. --- sources | 2 +- tracker-2.3.6-fix-fts-sqlite-3.34.0.patch | 26 ---- tracker.spec | 159 +++++++++------------- 3 files changed, 64 insertions(+), 123 deletions(-) delete mode 100644 tracker-2.3.6-fix-fts-sqlite-3.34.0.patch diff --git a/sources b/sources index 0d77556..7f70103 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tracker-2.3.6.tar.xz) = 1b8ae06b6c64a0cbe7d4c987bafe392fb38014215fc698f919273ba1f422dd0bc24344d3fd73164b00bfea315e527e2886ba90f1f1b86d5fceff24455b36d67e +SHA512 (tracker-3.1.0.rc.tar.xz) = 9712af7f5c6a87197ebe60591a604e31a1936b55e44263fffa702ce6361158d580a680ba4710cc4e8ad1ab19b9872c21d588d487a68beb782cd33361cfaa93a2 diff --git a/tracker-2.3.6-fix-fts-sqlite-3.34.0.patch b/tracker-2.3.6-fix-fts-sqlite-3.34.0.patch deleted file mode 100644 index b1a3922..0000000 --- a/tracker-2.3.6-fix-fts-sqlite-3.34.0.patch +++ /dev/null @@ -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); diff --git a/tracker.spec b/tracker.spec index 343a0a5..74ac3d1 100644 --- a/tracker.spec +++ b/tracker.spec @@ -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 - -# 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) +%global tarball_version %%(echo %{version} | tr '~' '.') Name: tracker -Version: 2.3.6 -Release: 3%{?dist} +Version: 3.1.0~rc +Release: 2%{?dist} Summary: Desktop-neutral metadata database and search tool License: GPLv2+ -URL: https://wiki.gnome.org/Projects/Tracker -Source0: https://download.gnome.org/sources/%{name}/2.3/%{name}-%{version}.tar.xz -# https://bugzilla.redhat.com/show_bug.cgi?id=1907021 -Patch0: tracker-2.3.6-fix-fts-sqlite-3.34.0.patch +URL: https://gnome.pages.gitlab.gnome.org/tracker/ +Source0: https://download.gnome.org/sources/tracker/3.1/tracker-%{tarball_version}.tar.xz +BuildRequires: asciidoc BuildRequires: gettext -BuildRequires: graphviz BuildRequires: gtk-doc -BuildRequires: libappstream-glib BuildRequires: libstemmer-devel BuildRequires: meson BuildRequires: systemd @@ -30,14 +23,16 @@ BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(json-glib-1.0) -BuildRequires: pkgconfig(libnm) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(uuid) 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} 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. -%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 Summary: Tracker SPARQL library +License: LGPLv2+ Recommends: %{name}%{?_isa} = %{version}-%{release} -# libtracker-sparql was split out of tracker in 2.2.2-2 -Conflicts: tracker < %{version}-%{release} +# renamed in F34 +Obsoletes: libtracker-sparql3 < 3.1.0~rc-2 +Provides: libtracker-sparql3 = %{version}-%{release} +Provides: libtracker-sparql3%{?_isa} = %{version}-%{release} %description -n libtracker-sparql This package contains the libtracker-sparql library. -%package devel -Summary: Headers for developing programs that will use %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libtracker-control%{?_isa} = %{version}-%{release} -Requires: libtracker-miner%{?_isa} = %{version}-%{release} + +%package devel +Summary: Development files for %{name} 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 -This package contains the static libraries and header files needed for -developing with tracker +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. -%package doc -Summary: Documentation for tracker + +%package doc +Summary: Documentation for %{name} BuildArch: noarch -# Renamed in F32 -Obsoletes: tracker-docs < %{version}-%{release} -Provides: tracker-docs = %{version}-%{release} +# renamed in F34 +Obsoletes: tracker3-doc < 3.1.0~rc-2 +Provides: tracker3-doc = %{version}-%{release} %description doc -This package contains the documentation for tracker +The %{name}-devel package contains the documentation for %{name}. %prep -%autosetup -p1 +%autosetup -p1 -n tracker-%{tarball_version} %build -# Disable the functional tests for now, they use python bytecodes. %meson \ - -Ddocs=true \ - -Dfunctional_tests=false \ -Dunicode_support=icu \ - -Dsystemd_user_services=%{_userunitdir} + -Dsystemd_user_services_dir=%{_userunitdir} \ + %{nil} + %meson_build %install %meson_install -# Remove files that are only needed by functional tests (which we currently disable) -rm -rf $RPM_BUILD_ROOT%{_libdir}/tracker-2.0/trackertestutils/ - -%find_lang %{name} +%find_lang tracker3 %post @@ -142,62 +120,51 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/tracker-2.0/trackertestutils/ %systemd_user_postun_with_restart %{systemd_units} -%files -f %{name}.lang -%license COPYING +%files -f tracker3.lang +%license COPYING COPYING.GPL %doc AUTHORS NEWS README.md -%{_bindir}/tracker -%{_libexecdir}/tracker-store -%{_datadir}/dbus-1/services/org.freedesktop.Tracker1.service -%{_mandir}/man1/tracker*.1* +%{_bindir}/tracker3 +%{_libexecdir}/tracker3/ +%{_libexecdir}/tracker-xdg-portal-3 %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/tracker -%{_userunitdir}/tracker-store.service - -%files -n libtracker-control -%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.* +%{_datadir}/bash-completion/completions/tracker3 +%{_datadir}/dbus-1/services/org.freedesktop.portal.Tracker.service +%{_mandir}/man1/tracker*.1* +%{_userunitdir}/tracker-xdg-portal-3.service %files -n libtracker-sparql -%license COPYING +%license COPYING COPYING.LGPL %dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/Tracker-2.0.typelib -%{_libdir}/libtracker-sparql-2.0.so.* -%{_libdir}/tracker-2.0/ -%{_datadir}/glib-2.0/schemas/* -%{_datadir}/tracker/ +%{_libdir}/girepository-1.0/Tracker-3.0.typelib +%{_libdir}/libtracker-sparql-3.0.so.0* +%{_datadir}/tracker3/ %files devel -%{_includedir}/tracker-2.0/ -%{_libdir}/*.so +%{_includedir}/tracker-3.0/ +%{_libdir}/libtracker-sparql-3.0.so %{_libdir}/pkgconfig/*.pc +%dir %{_libdir}/tracker-3.0 +%{_libdir}/tracker-3.0/trackertestutils/ %dir %{_datadir}/vala %dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/tracker*.* +%{_datadir}/vala/vapi/tracker-sparql-3.0.* %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 +%{_datadir}/gir-1.0/Tracker-3.0.gir %files doc %license docs/reference/COPYING %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/libtracker-control/ -%{_datadir}/gtk-doc/html/libtracker-miner/ -%{_datadir}/gtk-doc/html/libtracker-sparql/ -%{_datadir}/gtk-doc/html/ontology/ +%{_datadir}/gtk-doc/html/libtracker-sparql-3/ +%{_datadir}/gtk-doc/html/ontology-3/ %changelog +* Fri Mar 19 2021 Kalev Lember - 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 - 2.3.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild