From 6f97b1dabeafe8312f81ce1ffd6e054405c2791c Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 15 Sep 2017 12:56:16 +0200 Subject: [PATCH] Update to 1.99.2 Should only be built once tracker-miners is available. --- 0001-Only-autostart-in-GNOME-771601.patch | 24 ------ ...acker-data-fix-format-security-issue.patch | 26 ------- sources | 2 +- tracker.spec | 73 ++++--------------- 4 files changed, 15 insertions(+), 110 deletions(-) delete mode 100644 0001-libtracker-data-fix-format-security-issue.patch diff --git a/0001-Only-autostart-in-GNOME-771601.patch b/0001-Only-autostart-in-GNOME-771601.patch index 41e70d0..f24ee4a 100644 --- a/0001-Only-autostart-in-GNOME-771601.patch +++ b/0001-Only-autostart-in-GNOME-771601.patch @@ -1,27 +1,3 @@ -diff -urNp tracker-1.99.0.orig/src/miners/fs/tracker-miner-fs.desktop.in.in tracker-1.99.0/src/miners/fs/tracker-miner-fs.desktop.in.in ---- tracker-1.99.0.orig/src/miners/fs/tracker-miner-fs.desktop.in.in 2017-07-25 15:13:38.672508354 +0200 -+++ tracker-1.99.0/src/miners/fs/tracker-miner-fs.desktop.in.in 2017-07-25 15:14:13.117687004 +0200 -@@ -11,7 +11,7 @@ X-KDE-autostart-after=panel - X-KDE-StartupNotify=false - X-KDE-UniqueApplet=true - NoDisplay=true --OnlyShowIn=GNOME;KDE;XFCE;X-IVI;Unity; -+OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=tracker - X-GNOME-Bugzilla-Component=Miners -diff -urNp tracker-1.99.0.orig/src/miners/rss/tracker-miner-rss.desktop.in.in tracker-1.99.0/src/miners/rss/tracker-miner-rss.desktop.in.in ---- tracker-1.99.0.orig/src/miners/rss/tracker-miner-rss.desktop.in.in 2017-07-25 15:13:38.673508360 +0200 -+++ tracker-1.99.0/src/miners/rss/tracker-miner-rss.desktop.in.in 2017-07-25 15:14:39.123821881 +0200 -@@ -11,7 +11,7 @@ X-KDE-autostart-after=panel - X-KDE-StartupNotify=false - X-KDE-UniqueApplet=true - NoDisplay=true --OnlyShowIn=GNOME;KDE;XFCE;Unity; -+OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=tracker - X-GNOME-Bugzilla-Component=Miners diff -urNp tracker-1.99.0.orig/src/tracker-store/tracker-store.desktop.in.in tracker-1.99.0/src/tracker-store/tracker-store.desktop.in.in --- tracker-1.99.0.orig/src/tracker-store/tracker-store.desktop.in.in 2017-07-25 15:13:38.676508375 +0200 +++ tracker-1.99.0/src/tracker-store/tracker-store.desktop.in.in 2017-07-25 15:15:09.963981832 +0200 diff --git a/0001-libtracker-data-fix-format-security-issue.patch b/0001-libtracker-data-fix-format-security-issue.patch deleted file mode 100644 index db10c13..0000000 --- a/0001-libtracker-data-fix-format-security-issue.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 43a0bf675d2745e629a6e3a0f89f36be9471374d Mon Sep 17 00:00:00 2001 -From: Jeremy Bicha -Date: Fri, 21 Jul 2017 17:03:08 -0400 -Subject: [PATCH] libtracker-data: fix format-security issue - -https://bugzilla.gnome.org/show_bug.cgi?id=785245 ---- - src/libtracker-data/tracker-db-interface-sqlite.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c -index 051f6d82c3f5..21cc0cf809df 100644 ---- a/src/libtracker-data/tracker-db-interface-sqlite.c -+++ b/src/libtracker-data/tracker-db-interface-sqlite.c -@@ -1887,7 +1887,7 @@ tracker_db_interface_sqlite_wal_checkpoint (TrackerDBInterface *interface, - g_set_error (error, - TRACKER_DB_INTERFACE_ERROR, - TRACKER_DB_QUERY_ERROR, -- sqlite3_errstr (return_val)); -+ "%s", sqlite3_errstr (return_val)); - return FALSE; - } - --- -2.9.4 - diff --git a/sources b/sources index ef07d4d..ba185a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tracker-1.99.1.tar.xz) = cffcedb2f80db060128a7bd44bdd2bba399b64cdc11547a59afa59180e9f1e4d4c40eb82b920087e1abfa3f666633142af1373d5d860c6761633a8963bc07e5c +SHA512 (tracker-miners-1.99.2.tar.xz) = 10b4413267e1bfcbc622a86a7be8581bd0214eb4e72e5cf6a39cf5bbf098b99632815e8edc9e8d1671ceeba662c835fcb13c57ea117de8c7718e860b1cc9d154 diff --git a/tracker.spec b/tracker.spec index 7b3141c..582400e 100644 --- a/tracker.spec +++ b/tracker.spec @@ -1,21 +1,11 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") -%if 0%{?rhel} -%global with_enca 0 -%global with_libcue 0 -%global with_rss 0 -%else -%global with_enca 1 -%global with_libcue 1 -%global with_rss 1 -%endif - -%global systemd_units tracker-extract.service tracker-miner-apps.service tracker-miner-fs.service tracker-miner-rss.service tracker-miner-user-guides.service tracker-store.service tracker-writeback.service +%global systemd_units tracker-store.service Name: tracker -Version: 1.99.1 -Release: 2%{?dist} -Summary: Desktop-neutral search tool and indexer +Version: 1.99.2 +Release: 1%{?dist} +Summary: Desktop-neutral metadata database and search tool License: GPLv2+ URL: https://wiki.gnome.org/Projects/Tracker @@ -25,52 +15,20 @@ Source0: https://download.gnome.org/sources/%{name}/1.99/%{name}-%{versio # https://bugzilla.redhat.com/show_bug.cgi?id=771601 Patch0: 0001-Only-autostart-in-GNOME-771601.patch -Patch1: 0001-libtracker-data-fix-format-security-issue.patch - -BuildRequires: giflib-devel BuildRequires: graphviz BuildRequires: gtk-doc BuildRequires: intltool -BuildRequires: libjpeg-devel -BuildRequires: libtiff-devel BuildRequires: libappstream-glib BuildRequires: systemd BuildRequires: vala-devel -%if 0%{?with_enca} -BuildRequires: pkgconfig(enca) -%endif -BuildRequires: pkgconfig(exempi-2.0) -BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gstreamer-1.0) -BuildRequires: pkgconfig(gstreamer-pbutils-1.0) -BuildRequires: pkgconfig(gstreamer-tag-1.0) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(json-glib-1.0) -%if 0%{?with_libcue} -BuildRequires: pkgconfig(libcue) -%endif -BuildRequires: pkgconfig(libexif) -%if 0%{?with_rss} -BuildRequires: pkgconfig(libgrss) -%endif -BuildRequires: pkgconfig(libgsf-1) -BuildRequires: pkgconfig(libgxps) -BuildRequires: pkgconfig(libiptcdata) -BuildRequires: pkgconfig(libnm-glib) -BuildRequires: pkgconfig(libosinfo-1.0) -BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libxml-2.0) -BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(sqlite3) -BuildRequires: pkgconfig(taglib_c) -BuildRequires: pkgconfig(totem-plparser) -BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(uuid) -BuildRequires: pkgconfig(vorbisfile) %{?systemd_requires} Obsoletes: compat-tracker018 < 0.17.2-2 @@ -88,7 +46,7 @@ Obsoletes: compat-tracker016 < 0.18 %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 infinite number of properties, metadata (both embedded/harvested as @@ -98,8 +56,7 @@ 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: Headers for developing programs that will use %{name} @@ -121,7 +78,6 @@ This package contains the documentation for tracker %setup -q %patch0 -p1 -b .autostart-gnome -%patch1 -p1 -b .format-security %if 0%{?rhel} # Fix the build with sqlite 3.7 that doesn't support SQLITE_DETERMINISTIC @@ -137,9 +93,6 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure # Disable the functional tests for now, they use python bytecodes. %configure --disable-static \ --enable-gtk-doc \ - --enable-libflac \ - --enable-libvorbis \ - --disable-mp3 \ --with-unicode-support=libicu \ --disable-functional-tests \ --disable-silent-rules @@ -150,7 +103,6 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure %make_install find %{buildroot} -type f -name "*.la" -delete -rm -rf %{buildroot}%{_datadir}/tracker-tests # Remove .so symlinks for private libraries -- no external users are supposed # to link with them. @@ -182,10 +134,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %files -f %{name}.lang %license COPYING %doc AUTHORS NEWS README -%{_bindir}/tracker* -%{_libexecdir}/tracker* +%{_bindir}/tracker +%{_libexecdir}/tracker-store %{_datadir}/tracker/ -%{_datadir}/dbus-1/services/org.freedesktop.Tracker* +%{_datadir}/dbus-1/services/org.freedesktop.Tracker1.service %{_libdir}/libtracker*-2.0.so.* %{_libdir}/tracker-2.0/ %dir %{_libdir}/girepository-1.0 @@ -193,12 +145,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %{_libdir}/girepository-1.0/TrackerControl-2.0.typelib %{_libdir}/girepository-1.0/TrackerMiner-2.0.typelib %{_mandir}/*/tracker*.gz -%config(noreplace) %{_sysconfdir}/xdg/autostart/tracker*.desktop +%config(noreplace) %{_sysconfdir}/xdg/autostart/tracker-store.desktop %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/tracker %{_datadir}/glib-2.0/schemas/* -%{_userunitdir}/tracker-*.service +%{_userunitdir}/tracker-store.service %files devel %{_includedir}/tracker-2.0/ @@ -218,6 +170,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %changelog +* Fri Sep 15 2017 Debarshi Ray - 1.99.2-1 +- Update to 1.99.2 + * Thu Aug 10 2017 Kalev Lember - 1.99.1-2 - Rebuilt for libtotem-plparser soname bump