From 2f3e27485fe953cdcb32fb0cb7f4795d2c8e251a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 03:47:28 +0000 Subject: import tracker-1.2.6-3.el7 --- diff --git a/.gitignore b/.gitignore index 7a03556..4e137b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tracker-0.16.2.tar.xz +SOURCES/tracker-1.2.6.tar.xz diff --git a/.tracker.metadata b/.tracker.metadata index f10fd9f..c15ce2b 100644 --- a/.tracker.metadata +++ b/.tracker.metadata @@ -1 +1 @@ -9772281e8389ae83147eea80e670587294690949 SOURCES/tracker-0.16.2.tar.xz +2e4f60e7cc3e36e9e1d35b39afe3c9200197f114 SOURCES/tracker-1.2.6.tar.xz diff --git a/SOURCES/0001-Add-a-newline-at-the-end-of-file.patch b/SOURCES/0001-Add-a-newline-at-the-end-of-file.patch deleted file mode 100644 index 5e1264d..0000000 --- a/SOURCES/0001-Add-a-newline-at-the-end-of-file.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 33c0367962dbec7c84239864eb6d0751c6851df1 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Thu, 10 Oct 2013 15:27:25 +0200 -Subject: [PATCH] Add a newline at the end of file - -https://bugzilla.gnome.org/show_bug.cgi?id=709703 ---- - examples/libtracker-extract/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/libtracker-extract/Makefile.am b/examples/libtracker-extract/Makefile.am -index 0e96b90..67b0b3a 100644 ---- a/examples/libtracker-extract/Makefile.am -+++ b/examples/libtracker-extract/Makefile.am -@@ -32,4 +32,4 @@ noinst_DATA = 01-mockup.rule - - CLEANFILES = $(noinst_DATA) - --EXTRA_DIST = $(rules_in_files) -\ No newline at end of file -+EXTRA_DIST = $(rules_in_files) --- -1.8.4.2 - diff --git a/SOURCES/0001-Bump-the-minimum-memory-requirement-to-768M.patch b/SOURCES/0001-Bump-the-minimum-memory-requirement-to-768M.patch deleted file mode 100644 index 9ee871c..0000000 --- a/SOURCES/0001-Bump-the-minimum-memory-requirement-to-768M.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5d841e9bdf3dc2a8e39e67d52c0b547fd6a26c88 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Tue, 12 Nov 2013 16:09:57 +0100 -Subject: [PATCH] Bump the minimum memory requirement to 768M - -http://bugzilla.gnome.org/show_bug.cgi?id=712142 ---- - src/libtracker-common/tracker-os-dependant-unix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libtracker-common/tracker-os-dependant-unix.c b/src/libtracker-common/tracker-os-dependant-unix.c -index 24108f4..2fa7c93 100644 ---- a/src/libtracker-common/tracker-os-dependant-unix.c -+++ b/src/libtracker-common/tracker-os-dependant-unix.c -@@ -39,7 +39,7 @@ - /* Maximum here is a G_MAXLONG, so if you want to use > 2GB, you have - * to set MEM_LIMIT to RLIM_INFINITY - */ --#define MEM_LIMIT_MIN 256 * 1024 * 1024 -+#define MEM_LIMIT_MIN 768 * 1024 * 1024 - - #if defined(__OpenBSD__) && !defined(RLIMIT_AS) - #define RLIMIT_AS RLIMIT_DATA --- -1.8.4.2 - diff --git a/SOURCES/0001-Fix-typos-in-tracker-search-man-page.patch b/SOURCES/0001-Fix-typos-in-tracker-search-man-page.patch deleted file mode 100644 index 5471aec..0000000 --- a/SOURCES/0001-Fix-typos-in-tracker-search-man-page.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a9ce2d7941c6c795434a6dc8fb6aeacf5f79fed6 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Wed, 26 Jun 2013 01:18:13 -0400 -Subject: [PATCH] Fix typos in tracker-search man page - -A few of the short options were misspelt. - -https://bugzilla.gnome.org/show_bug.cgi?id=703097 ---- - docs/manpages/tracker-search.1 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/docs/manpages/tracker-search.1 b/docs/manpages/tracker-search.1 -index 1b18c88..1e76fdd 100644 ---- a/docs/manpages/tracker-search.1 -+++ b/docs/manpages/tracker-search.1 -@@ -70,7 +70,7 @@ and - .B \-f, \-\-files - Search for files of any type matching \fIEXPRESSION\fR (optional). - .TP --.B \-e, \-\-folders -+.B \-s, \-\-folders - Search for folders matching \fIEXPRESSION\fR (optional). - .TP - .B \-m, \-\-music -@@ -82,7 +82,7 @@ Search for music albums matching \fIEXPRESSION\fR (optional). - .B \-\-music\-artists - Search for music artists matching \fIEXPRESSION\fR (optional). - .TP --.B \-l, \-\-images -+.B \-i, \-\-images - Search for images matching \fIEXPRESSION\fR (optional). - .TP - .B \-v, \-\-videos --- -1.8.3.1 - diff --git a/SOURCES/0001-fts-Strengthen-against-sqlite-failures-in-FTS-functi.patch b/SOURCES/0001-fts-Strengthen-against-sqlite-failures-in-FTS-functi.patch deleted file mode 100644 index 7c6977d..0000000 --- a/SOURCES/0001-fts-Strengthen-against-sqlite-failures-in-FTS-functi.patch +++ /dev/null @@ -1,136 +0,0 @@ -From 00b71d0f9ae3f4d2b7bc8fa2afe08cd89c5c9c35 Mon Sep 17 00:00:00 2001 -From: Carlos Garnacho -Date: Tue, 3 Dec 2013 16:17:54 +0100 -Subject: [PATCH] fts: Strengthen against sqlite failures in FTS functions - -function_weights() and function_property_names() (used respectively by -SPARQL fts:rank and fts:offsets functions), initialize all data at first -from the database, so it's available in memory for posterior runs, -although currently those are being quite optimistic about the database -return values in several ways, so: - -- Ensure no infinite loops happen on sqlite3_step() if the stmt trips - into some unexpected state. SQLITE_BUSY still does keep looping though. - -- As initialization here is a failable task, stop using g_once_init_* - and use an static GMutex so initialization can be tried later again - if it failed previously. - -- For the cases where initialization failed, propagate the error code - on the sqlite3_context. - -Based on work by Tim Waugh and Michael Catanzaro. -https://bugzilla.redhat.com/show_bug.cgi?id=1026283 ---- - src/libtracker-fts/tracker-fts.c | 52 +++++++++++++++++++++++++++------------- - 1 file changed, 36 insertions(+), 16 deletions(-) - -diff --git a/src/libtracker-fts/tracker-fts.c b/src/libtracker-fts/tracker-fts.c -index 530d831..446a4a6 100644 ---- a/src/libtracker-fts/tracker-fts.c -+++ b/src/libtracker-fts/tracker-fts.c -@@ -127,13 +127,15 @@ function_weights (sqlite3_context *context, - sqlite3_value *argv[]) - { - static guint *weights = NULL; -- static gsize weights_initialized = 0; -+ static GMutex mutex; -+ int rc = SQLITE_DONE; - -- if (g_once_init_enter (&weights_initialized)) { -+ g_mutex_lock (&mutex); -+ -+ if (G_UNLIKELY (weights == NULL)) { - GArray *weight_array; - sqlite3_stmt *stmt; - sqlite3 *db; -- int rc; - - weight_array = g_array_new (FALSE, FALSE, sizeof (guint)); - db = sqlite3_context_db_handle (context); -@@ -149,18 +151,26 @@ function_weights (sqlite3_context *context, - guint weight; - weight = sqlite3_column_int (stmt, 0); - g_array_append_val (weight_array, weight); -+ } else if (rc != SQLITE_BUSY) { -+ break; - } - } - -+ sqlite3_finalize (stmt); -+ - if (rc == SQLITE_DONE) { -- rc = sqlite3_finalize (stmt); -+ weights = (guint *) g_array_free (weight_array, FALSE); -+ } else { -+ g_array_free (weight_array, TRUE); - } -- -- weights = (guint *) g_array_free (weight_array, FALSE); -- g_once_init_leave (&weights_initialized, (rc == SQLITE_OK)); - } - -- sqlite3_result_blob (context, weights, sizeof (weights), NULL); -+ g_mutex_unlock (&mutex); -+ -+ if (rc == SQLITE_DONE) -+ sqlite3_result_blob (context, weights, sizeof (weights), NULL); -+ else -+ sqlite3_result_error_code (context, rc); - } - - static void -@@ -169,13 +179,15 @@ function_property_names (sqlite3_context *context, - sqlite3_value *argv[]) - { - static gchar **names = NULL; -- static gsize names_initialized = 0; -+ static GMutex mutex; -+ int rc = SQLITE_DONE; - -- if (g_once_init_enter (&names_initialized)) { -+ g_mutex_lock (&mutex); -+ -+ if (G_UNLIKELY (names == NULL)) { - GPtrArray *names_array; - sqlite3_stmt *stmt; - sqlite3 *db; -- int rc; - - names_array = g_ptr_array_new (); - db = sqlite3_context_db_handle (context); -@@ -194,18 +206,26 @@ function_property_names (sqlite3_context *context, - - name = sqlite3_column_text (stmt, 0); - g_ptr_array_add (names_array, g_strdup (name)); -+ } else if (rc != SQLITE_BUSY) { -+ break; - } - } - -+ sqlite3_finalize (stmt); -+ - if (rc == SQLITE_DONE) { -- rc = sqlite3_finalize (stmt); -+ names = (gchar **) g_ptr_array_free (names_array, FALSE); -+ } else { -+ g_ptr_array_free (names_array, TRUE); - } -- -- names = (gchar **) g_ptr_array_free (names_array, FALSE); -- g_once_init_leave (&names_initialized, (rc == SQLITE_OK)); - } - -- sqlite3_result_blob (context, names, sizeof (names), NULL); -+ g_mutex_unlock (&mutex); -+ -+ if (rc == SQLITE_DONE) -+ sqlite3_result_blob (context, names, sizeof (names), NULL); -+ else -+ sqlite3_result_error_code (context, rc); - } - - static void --- -1.8.4.2 - diff --git a/SOURCES/0001-tracker-extract-Avoid-the-use-of-setrlimit-it-s-caus.patch b/SOURCES/0001-tracker-extract-Avoid-the-use-of-setrlimit-it-s-caus.patch new file mode 100644 index 0000000..32b0dee --- /dev/null +++ b/SOURCES/0001-tracker-extract-Avoid-the-use-of-setrlimit-it-s-caus.patch @@ -0,0 +1,63 @@ +From 35dbe5e46ad7c8e2c6343349b87d44e71fa32eb8 Mon Sep 17 00:00:00 2001 +From: Martyn Russell +Date: Mon, 13 Oct 2014 11:41:57 +0100 +Subject: [PATCH] tracker-extract: Avoid the use of setrlimit() it's causing + problems + +Part of the solution is this commit, see: +https://bugzilla.gnome.org/show_bug.cgi?id=737663 + +The other part is to use cgroups +--- + src/tracker-extract/tracker-main.c | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c +index f7e3e55..22af4b2 100644 +--- a/src/tracker-extract/tracker-main.c ++++ b/src/tracker-extract/tracker-main.c +@@ -29,9 +29,9 @@ + #include + #include + +-#include + #include + #include ++#include + #include + + #ifndef G_OS_WIN32 +@@ -42,12 +42,7 @@ + #include + #endif + +-#include +-#include +-#include +-#include +-#include +-#include ++#include + + #include + +@@ -278,8 +273,6 @@ run_standalone (TrackerConfig *config) + return EXIT_FAILURE; + } + +- tracker_memory_setrlimits (); +- + tracker_extract_get_metadata_by_cmdline (object, uri, mime_type); + + g_object_unref (object); +@@ -364,7 +357,6 @@ main (int argc, char *argv[]) + /* This makes sure we don't steal all the system's resources */ + initialize_priority_and_scheduling (tracker_config_get_sched_idle (config), + tracker_db_manager_get_first_index_done () == FALSE); +- tracker_memory_setrlimits (); + + extract = tracker_extract_new (TRUE, force_module); + +-- +2.1.0 + diff --git a/SOURCES/0002-libtracker-extract-tracker-extract-Remove-modulesdir.patch b/SOURCES/0002-libtracker-extract-tracker-extract-Remove-modulesdir.patch deleted file mode 100644 index 6836463..0000000 --- a/SOURCES/0002-libtracker-extract-tracker-extract-Remove-modulesdir.patch +++ /dev/null @@ -1,585 +0,0 @@ -From 42e81eef3d2263f0b37088cb25354b2ff043b4b6 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Thu, 10 Oct 2013 13:37:16 +0200 -Subject: [PATCH] libtracker-extract, tracker-extract: Remove $modulesdir from - *.rules - -https://bugzilla.gnome.org/show_bug.cgi?id=709703 ---- - Makefile.decl | 3 ++ - examples/libtracker-extract/Makefile.am | 5 +- - src/libtracker-extract/Makefile.am | 3 +- - src/libtracker-extract/tracker-module-manager.c | 8 ++++ - src/tracker-extract/10-abw.rule.in | 2 +- - src/tracker-extract/10-dvi.rule.in | 2 +- - src/tracker-extract/10-epub.rule.in | 2 +- - src/tracker-extract/10-flac.rule.in | 2 +- - src/tracker-extract/10-gif.rule.in | 2 +- - src/tracker-extract/10-html.rule.in | 2 +- - src/tracker-extract/10-ico.rule.in | 2 +- - src/tracker-extract/10-jpeg.rule.in | 2 +- - src/tracker-extract/10-mp3.rule.in | 2 +- - src/tracker-extract/10-msoffice.rule.in | 2 +- - src/tracker-extract/10-oasis.rule.in | 2 +- - src/tracker-extract/10-pdf.rule.in | 2 +- - src/tracker-extract/10-png.rule.in | 2 +- - src/tracker-extract/10-ps.rule.in | 2 +- - src/tracker-extract/10-svg.rule.in | 2 +- - src/tracker-extract/10-tiff.rule.in | 2 +- - src/tracker-extract/10-vorbis.rule.in | 2 +- - src/tracker-extract/10-xmp.rule.in | 2 +- - src/tracker-extract/10-xps.rule.in | 2 +- - src/tracker-extract/11-iso.rule.in | 2 +- - src/tracker-extract/11-msoffice-xml.rule.in | 2 +- - src/tracker-extract/15-gstreamer-guess.rule.in | 2 +- - src/tracker-extract/15-playlist.rule.in | 2 +- - src/tracker-extract/90-gstreamer-generic.rule.in | 2 +- - src/tracker-extract/90-text-generic.rule.in | 2 +- - .../91-gstreamer-generic-dlna.rule.in | 2 +- - src/tracker-extract/92-xine-generic.rule.in | 2 +- - src/tracker-extract/93-mplayer-generic.rule.in | 2 +- - src/tracker-extract/93-totem-generic.rule.in | 2 +- - src/tracker-extract/Makefile.am | 55 +++++++++++----------- - 34 files changed, 71 insertions(+), 61 deletions(-) - -diff --git a/Makefile.decl b/Makefile.decl -index 2c5a4a2..5e7de8d 100644 ---- a/Makefile.decl -+++ b/Makefile.decl -@@ -8,6 +8,9 @@ - # full-report: like test-report: with -m perf and -m slow - # - -+extractmodulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules -+extractrulesdir = $(datadir)/tracker/extract-rules -+ - GTESTER = gtester # for non-GLIB packages - GTESTER_REPORT = gtester-report - -diff --git a/examples/libtracker-extract/Makefile.am b/examples/libtracker-extract/Makefile.am -index 67b0b3a..a20a756 100644 ---- a/examples/libtracker-extract/Makefile.am -+++ b/examples/libtracker-extract/Makefile.am -@@ -1,7 +1,6 @@ - include $(top_srcdir)/Makefile.decl - - module_flags = -module -avoid-version -no-undefined --modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules - - AM_CPPFLAGS = \ - $(BUILD_CFLAGS) \ -@@ -22,12 +21,12 @@ libextract_mockup_la_LIBADD = \ - rules_in_files = 01-mockup.rule.in - - %.rule: %.rule.in -- @sed -e "s|@modulesdir[@]|${modulesdir}|" $< > $@ -+ @sed -e "s|@extractmodulesdir[@]|${extractmodulesdir}|" $< > $@ - - # This is noinst_ only because it's an example, normally this would be - # "rules" (for rules_DATA and rulesdir) or whatever name you want to - # give for your rules files. --noinstdir = $(datadir)/tracker/extract-rules -+noinstdir = $(extractrulesdir) - noinst_DATA = 01-mockup.rule - - CLEANFILES = $(noinst_DATA) -diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am -index f3be025..7a61cbb 100644 ---- a/src/libtracker-extract/Makefile.am -+++ b/src/libtracker-extract/Makefile.am -@@ -5,7 +5,8 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - -DSHAREDIR=\""$(datadir)"\" \ -- -DTRACKER_EXTRACTOR_RULES_DIR=\""$(datadir)/tracker/extract-rules"\" \ -+ -DTRACKER_EXTRACTOR_RULES_DIR=\""$(extractrulesdir)"\" \ -+ -DTRACKER_EXTRACTORS_DIR=\""$(extractmodulesdir)"\" \ - $(LIBTRACKER_EXTRACT_CFLAGS) - - lib_LTLIBRARIES = libtracker-extract-@TRACKER_API_VERSION@.la -diff --git a/src/libtracker-extract/tracker-module-manager.c b/src/libtracker-extract/tracker-module-manager.c -index a238916..4805f1e 100644 ---- a/src/libtracker-extract/tracker-module-manager.c -+++ b/src/libtracker-extract/tracker-module-manager.c -@@ -68,6 +68,14 @@ load_extractor_rule (GKeyFile *key_file, - return FALSE; - } - -+ if (!G_IS_DIR_SEPARATOR (module_path[0])) { -+ gchar *tmp; -+ -+ tmp = g_build_filename (TRACKER_EXTRACTORS_DIR, module_path, NULL); -+ g_free (module_path); -+ module_path = tmp; -+ } -+ - mimetypes = g_key_file_get_string_list (key_file, "ExtractorRule", "MimeTypes", &n_mimetypes, error); - - if (!mimetypes) { -diff --git a/src/tracker-extract/10-abw.rule.in b/src/tracker-extract/10-abw.rule.in -index a2fe7d1..aef9a29 100644 ---- a/src/tracker-extract/10-abw.rule.in -+++ b/src/tracker-extract/10-abw.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-abw.so -+ModulePath=libextract-abw.so - MimeTypes=application/x-abiword - -diff --git a/src/tracker-extract/10-dvi.rule.in b/src/tracker-extract/10-dvi.rule.in -index c575400..617c99a 100644 ---- a/src/tracker-extract/10-dvi.rule.in -+++ b/src/tracker-extract/10-dvi.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-dvi.so -+ModulePath=libextract-dvi.so - MimeTypes=application/x-dvi - FallbackRdfType=nfo:Document -diff --git a/src/tracker-extract/10-epub.rule.in b/src/tracker-extract/10-epub.rule.in -index d859d80..1467488 100644 ---- a/src/tracker-extract/10-epub.rule.in -+++ b/src/tracker-extract/10-epub.rule.in -@@ -1,3 +1,3 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-epub.so -+ModulePath=libextract-epub.so - MimeTypes=application/epub+zip -diff --git a/src/tracker-extract/10-flac.rule.in b/src/tracker-extract/10-flac.rule.in -index 39ee3ad..c0517ff 100644 ---- a/src/tracker-extract/10-flac.rule.in -+++ b/src/tracker-extract/10-flac.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-flac.so -+ModulePath=libextract-flac.so - MimeTypes=audio/x-flac - -diff --git a/src/tracker-extract/10-gif.rule.in b/src/tracker-extract/10-gif.rule.in -index 83a7b13..3fdcfe0 100644 ---- a/src/tracker-extract/10-gif.rule.in -+++ b/src/tracker-extract/10-gif.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-gif.so -+ModulePath=libextract-gif.so - MimeTypes=image/gif - -diff --git a/src/tracker-extract/10-html.rule.in b/src/tracker-extract/10-html.rule.in -index cf9cd7a..ec2cf27 100644 ---- a/src/tracker-extract/10-html.rule.in -+++ b/src/tracker-extract/10-html.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-html.so -+ModulePath=libextract-html.so - MimeTypes=text/html;application/xhtml+xml; - -diff --git a/src/tracker-extract/10-ico.rule.in b/src/tracker-extract/10-ico.rule.in -index 4e86122..f1e161b 100644 ---- a/src/tracker-extract/10-ico.rule.in -+++ b/src/tracker-extract/10-ico.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-icon.so -+ModulePath=libextract-icon.so - MimeTypes=image/vnd.microsoft.icon - -diff --git a/src/tracker-extract/10-jpeg.rule.in b/src/tracker-extract/10-jpeg.rule.in -index 4ea67e5..e20d559 100644 ---- a/src/tracker-extract/10-jpeg.rule.in -+++ b/src/tracker-extract/10-jpeg.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-jpeg.so -+ModulePath=libextract-jpeg.so - MimeTypes=image/jpeg - -diff --git a/src/tracker-extract/10-mp3.rule.in b/src/tracker-extract/10-mp3.rule.in -index 31d56b5..86a9b73 100644 ---- a/src/tracker-extract/10-mp3.rule.in -+++ b/src/tracker-extract/10-mp3.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-mp3.so -+ModulePath=libextract-mp3.so - MimeTypes=audio/mpeg;audio/x-mp3; - -diff --git a/src/tracker-extract/10-msoffice.rule.in b/src/tracker-extract/10-msoffice.rule.in -index 0b72b62..d6568ff 100644 ---- a/src/tracker-extract/10-msoffice.rule.in -+++ b/src/tracker-extract/10-msoffice.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-msoffice.so -+ModulePath=libextract-msoffice.so - MimeTypes=application/msword;application/vnd.ms-powerpoint;application/vnd.ms-excel;application/vnd.ms-*; - -diff --git a/src/tracker-extract/10-oasis.rule.in b/src/tracker-extract/10-oasis.rule.in -index 84a3b48..10038c0 100644 ---- a/src/tracker-extract/10-oasis.rule.in -+++ b/src/tracker-extract/10-oasis.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-oasis.so -+ModulePath=libextract-oasis.so - MimeTypes=application/vnd.oasis.opendocument.* - -diff --git a/src/tracker-extract/10-pdf.rule.in b/src/tracker-extract/10-pdf.rule.in -index a85de2b..455fe6b 100644 ---- a/src/tracker-extract/10-pdf.rule.in -+++ b/src/tracker-extract/10-pdf.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-pdf.so -+ModulePath=libextract-pdf.so - MimeTypes=application/pdf - FallbackRdfType=nfo:Document -diff --git a/src/tracker-extract/10-png.rule.in b/src/tracker-extract/10-png.rule.in -index 080d880..67b2a1b 100644 ---- a/src/tracker-extract/10-png.rule.in -+++ b/src/tracker-extract/10-png.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-png.so -+ModulePath=libextract-png.so - MimeTypes=image/png;sketch/png; - -diff --git a/src/tracker-extract/10-ps.rule.in b/src/tracker-extract/10-ps.rule.in -index bdb6ebe..73734eb 100644 ---- a/src/tracker-extract/10-ps.rule.in -+++ b/src/tracker-extract/10-ps.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-ps.so -+ModulePath=libextract-ps.so - MimeTypes=application/x-gzpostscript;application/postscript; - -diff --git a/src/tracker-extract/10-svg.rule.in b/src/tracker-extract/10-svg.rule.in -index 1526d6d..8b1e0ab 100644 ---- a/src/tracker-extract/10-svg.rule.in -+++ b/src/tracker-extract/10-svg.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-gstreamer.so -+ModulePath=libextract-gstreamer.so - MimeTypes=image/svg+xml - -diff --git a/src/tracker-extract/10-tiff.rule.in b/src/tracker-extract/10-tiff.rule.in -index c62ee4f..c883c90 100644 ---- a/src/tracker-extract/10-tiff.rule.in -+++ b/src/tracker-extract/10-tiff.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-tiff.so -+ModulePath=libextract-tiff.so - MimeTypes=image/tiff - -diff --git a/src/tracker-extract/10-vorbis.rule.in b/src/tracker-extract/10-vorbis.rule.in -index a983765..f99877b 100644 ---- a/src/tracker-extract/10-vorbis.rule.in -+++ b/src/tracker-extract/10-vorbis.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-vorbis.so -+ModulePath=libextract-vorbis.so - MimeTypes=audio/x-vorbis+ogg;application/ogg; - -diff --git a/src/tracker-extract/10-xmp.rule.in b/src/tracker-extract/10-xmp.rule.in -index 82979e6..e9288db 100644 ---- a/src/tracker-extract/10-xmp.rule.in -+++ b/src/tracker-extract/10-xmp.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-xmp.so -+ModulePath=libextract-xmp.so - MimeTypes=application/rdf+xml - -diff --git a/src/tracker-extract/10-xps.rule.in b/src/tracker-extract/10-xps.rule.in -index 0ab63c6..0916f8d 100644 ---- a/src/tracker-extract/10-xps.rule.in -+++ b/src/tracker-extract/10-xps.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-xps.so -+ModulePath=libextract-xps.so - MimeTypes=application/oxps;application/vnd.ms-xpsdocument; - FallbackRdfType=nfo:Document -diff --git a/src/tracker-extract/11-iso.rule.in b/src/tracker-extract/11-iso.rule.in -index 30d0ff6..400a072 100644 ---- a/src/tracker-extract/11-iso.rule.in -+++ b/src/tracker-extract/11-iso.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-iso.so -+ModulePath=libextract-iso.so - MimeTypes=application/x-cd-image - -diff --git a/src/tracker-extract/11-msoffice-xml.rule.in b/src/tracker-extract/11-msoffice-xml.rule.in -index e6654db..8459823 100644 ---- a/src/tracker-extract/11-msoffice-xml.rule.in -+++ b/src/tracker-extract/11-msoffice-xml.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-msoffice-xml.so -+ModulePath=libextract-msoffice-xml.so - MimeTypes=application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.wordprocessingml.document; - -diff --git a/src/tracker-extract/15-gstreamer-guess.rule.in b/src/tracker-extract/15-gstreamer-guess.rule.in -index a0a6773..6088807 100644 ---- a/src/tracker-extract/15-gstreamer-guess.rule.in -+++ b/src/tracker-extract/15-gstreamer-guess.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-gstreamer.so -+ModulePath=libextract-gstreamer.so - MimeTypes=video/3gpp;video/mp4;video/x-ms-asf;application/vnd.rn-realmedia - -diff --git a/src/tracker-extract/15-playlist.rule.in b/src/tracker-extract/15-playlist.rule.in -index c9d8b93..16ec50e 100644 ---- a/src/tracker-extract/15-playlist.rule.in -+++ b/src/tracker-extract/15-playlist.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-playlist.so -+ModulePath=libextract-playlist.so - MimeTypes=audio/x-mpegurl;audio/mpegurl;audio/x-scpls;audio/x-pn-realaudio;application/ram;application/vnd.ms-wpl;application/smil;audio/x-ms-asx; - -diff --git a/src/tracker-extract/90-gstreamer-generic.rule.in b/src/tracker-extract/90-gstreamer-generic.rule.in -index ae9c694..58ce23f 100644 ---- a/src/tracker-extract/90-gstreamer-generic.rule.in -+++ b/src/tracker-extract/90-gstreamer-generic.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-gstreamer.so -+ModulePath=libextract-gstreamer.so - MimeTypes=audio/*;video/*;image/*; - -diff --git a/src/tracker-extract/90-text-generic.rule.in b/src/tracker-extract/90-text-generic.rule.in -index 8889e60..f1a658c 100644 ---- a/src/tracker-extract/90-text-generic.rule.in -+++ b/src/tracker-extract/90-text-generic.rule.in -@@ -1,3 +1,3 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-text.so -+ModulePath=libextract-text.so - MimeTypes=text/* -diff --git a/src/tracker-extract/91-gstreamer-generic-dlna.rule.in b/src/tracker-extract/91-gstreamer-generic-dlna.rule.in -index 418760d..b25e84c 100644 ---- a/src/tracker-extract/91-gstreamer-generic-dlna.rule.in -+++ b/src/tracker-extract/91-gstreamer-generic-dlna.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-gstreamer.so -+ModulePath=libextract-gstreamer.so - MimeTypes=dlna/*; - -diff --git a/src/tracker-extract/92-xine-generic.rule.in b/src/tracker-extract/92-xine-generic.rule.in -index 47b28bc..9250b17 100644 ---- a/src/tracker-extract/92-xine-generic.rule.in -+++ b/src/tracker-extract/92-xine-generic.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-xine.so -+ModulePath=libextract-xine.so - MimeTypes=audio/*;video/*; - -diff --git a/src/tracker-extract/93-mplayer-generic.rule.in b/src/tracker-extract/93-mplayer-generic.rule.in -index fdd4dcb..8121a2f 100644 ---- a/src/tracker-extract/93-mplayer-generic.rule.in -+++ b/src/tracker-extract/93-mplayer-generic.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-mplayer.so -+ModulePath=libextract-mplayer.so - MimeTypes=audio/*;video/*; - -diff --git a/src/tracker-extract/93-totem-generic.rule.in b/src/tracker-extract/93-totem-generic.rule.in -index dd3deff..39ab02a 100644 ---- a/src/tracker-extract/93-totem-generic.rule.in -+++ b/src/tracker-extract/93-totem-generic.rule.in -@@ -1,4 +1,4 @@ - [ExtractorRule] --ModulePath=@modulesdir@/libextract-totem.so -+ModulePath=libextract-totem.so - MimeTypes=audio/*;video/*; - -diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am -index daad169..a53a9b1 100644 ---- a/src/tracker-extract/Makefile.am -+++ b/src/tracker-extract/Makefile.am -@@ -1,15 +1,14 @@ - include $(top_srcdir)/Makefile.decl - - module_flags = -module -avoid-version -no-undefined --modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules --rulesdir = $(datadir)/tracker/extract-rules -+rulesdir = $(extractrulesdir) - - AM_CPPFLAGS = \ - $(BUILD_CFLAGS) \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/src \ - -DLOCALEDIR=\""$(localedir)"\" \ -- -DTRACKER_EXTRACTORS_DIR=\"$(modulesdir)\" \ -+ -DTRACKER_EXTRACTORS_DIR=\""$(extractmodulesdir)"\" \ - $(TRACKER_EXTRACT_CFLAGS) - - # NOTE: The rules are here and not in another sub-directory because we -@@ -48,51 +47,51 @@ rules_in_files = \ - 93-totem-generic.rule.in - - %.rule: %.rule.in -- @sed -e "s|@modulesdir[@]|${modulesdir}|" $< > $@ -+ @sed -e "s|@extractmodulesdir[@]|${extractmodulesdir}|" $< > $@ - - # NOTE: - # We don't always link with libtracker-common, we only link - # against it if we directly use functions in the .so --modules_LTLIBRARIES = # Empty -+extractmodules_LTLIBRARIES = # Empty - rules_DATA = # Empty - - if HAVE_LIBVORBIS --modules_LTLIBRARIES += libextract-vorbis.la -+extractmodules_LTLIBRARIES += libextract-vorbis.la - rules_DATA += 10-vorbis.rule - endif - - if HAVE_LIBFLAC --modules_LTLIBRARIES += libextract-flac.la -+extractmodules_LTLIBRARIES += libextract-flac.la - rules_DATA += 10-flac.rule - endif - - if HAVE_EXEMPI --modules_LTLIBRARIES += libextract-xmp.la -+extractmodules_LTLIBRARIES += libextract-xmp.la - rules_DATA += 10-xmp.rule - endif - - if HAVE_LIBGIF --modules_LTLIBRARIES += libextract-gif.la -+extractmodules_LTLIBRARIES += libextract-gif.la - rules_DATA += 10-gif.rule - endif - - if HAVE_LIBJPEG --modules_LTLIBRARIES += libextract-jpeg.la -+extractmodules_LTLIBRARIES += libextract-jpeg.la - rules_DATA += 10-jpeg.rule - endif - - if HAVE_LIBTIFF --modules_LTLIBRARIES += libextract-tiff.la -+extractmodules_LTLIBRARIES += libextract-tiff.la - rules_DATA += 10-tiff.rule - endif - - if HAVE_LIBXML2 --modules_LTLIBRARIES += libextract-html.la -+extractmodules_LTLIBRARIES += libextract-html.la - rules_DATA += 10-html.rule - endif - - if HAVE_LIBGSF --modules_LTLIBRARIES += \ -+extractmodules_LTLIBRARIES += \ - libextract-epub.la \ - libextract-msoffice.la \ - libextract-msoffice-xml.la \ -@@ -101,17 +100,17 @@ rules_DATA += 10-epub.rule 10-oasis.rule 10-msoffice.rule 11-msoffice-xml.rule - endif - - if HAVE_LIBGXPS --modules_LTLIBRARIES += libextract-xps.la -+extractmodules_LTLIBRARIES += libextract-xps.la - rules_DATA += 10-xps.rule - endif - - if HAVE_POPPLER --modules_LTLIBRARIES += libextract-pdf.la -+extractmodules_LTLIBRARIES += libextract-pdf.la - rules_DATA += 10-pdf.rule - endif - - if HAVE_GSTREAMER --modules_LTLIBRARIES += libextract-gstreamer.la -+extractmodules_LTLIBRARIES += libextract-gstreamer.la - rules_DATA += 10-svg.rule 15-gstreamer-guess.rule 90-gstreamer-generic.rule - endif - -@@ -121,58 +120,58 @@ rules_DATA += 91-gstreamer-generic-dlna.rule - endif - - if HAVE_LIBXINE --modules_LTLIBRARIES += libextract-xine.la -+extractmodules_LTLIBRARIES += libextract-xine.la - rules_DATA += 92-xine-generic.rule - endif - - if USING_EXTERNAL_GENERIC_MEDIA_PLAYER --modules_LTLIBRARIES += libextract-mplayer.la \ -- libextract-totem.la -+extractmodules_LTLIBRARIES += libextract-mplayer.la \ -+ libextract-totem.la - rules_DATA += 93-mplayer-generic.rule 93-totem-generic.rule - endif - - if HAVE_TOTEM_PL_PARSER --modules_LTLIBRARIES += libextract-playlist.la -+extractmodules_LTLIBRARIES += libextract-playlist.la - rules_DATA += 15-playlist.rule - endif - - if HAVE_LIBOSINFO --modules_LTLIBRARIES += libextract-iso.la -+extractmodules_LTLIBRARIES += libextract-iso.la - rules_DATA += 11-iso.rule - endif - - if HAVE_LIBPNG --modules_LTLIBRARIES += libextract-png.la -+extractmodules_LTLIBRARIES += libextract-png.la - rules_DATA += 10-png.rule - endif - - if HAVE_ABIWORD --modules_LTLIBRARIES += libextract-abw.la -+extractmodules_LTLIBRARIES += libextract-abw.la - rules_DATA += 10-abw.rule - endif - - if HAVE_DVI --modules_LTLIBRARIES += libextract-dvi.la -+extractmodules_LTLIBRARIES += libextract-dvi.la - rules_DATA += 10-dvi.rule - endif - - if HAVE_MP3 --modules_LTLIBRARIES += libextract-mp3.la -+extractmodules_LTLIBRARIES += libextract-mp3.la - rules_DATA += 10-mp3.rule - endif - - if HAVE_PS --modules_LTLIBRARIES += libextract-ps.la -+extractmodules_LTLIBRARIES += libextract-ps.la - rules_DATA += 10-ps.rule - endif - - if HAVE_TEXT --modules_LTLIBRARIES += libextract-text.la -+extractmodules_LTLIBRARIES += libextract-text.la - rules_DATA += 90-text-generic.rule - endif - - if HAVE_ICON --modules_LTLIBRARIES += libextract-icon.la -+extractmodules_LTLIBRARIES += libextract-icon.la - rules_DATA += 10-ico.rule - endif - --- -1.8.4.2 - diff --git a/SOURCES/0003-tracker-extract-Rename-.rules.in-to-.rules.patch b/SOURCES/0003-tracker-extract-Rename-.rules.in-to-.rules.patch deleted file mode 100644 index ce39548..0000000 --- a/SOURCES/0003-tracker-extract-Rename-.rules.in-to-.rules.patch +++ /dev/null @@ -1,788 +0,0 @@ -From 5bf75b8c8ef3c7e54c003d1e8a2a94f16ecb1b72 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Fri, 11 Oct 2013 16:57:23 +0200 -Subject: [PATCH] tracker-extract: Rename *.rules.in to *.rules - -https://bugzilla.gnome.org/show_bug.cgi?id=709703 ---- - src/tracker-extract/10-abw.rule | 4 ++ - src/tracker-extract/10-abw.rule.in | 4 -- - src/tracker-extract/10-dvi.rule | 4 ++ - src/tracker-extract/10-dvi.rule.in | 4 -- - src/tracker-extract/10-epub.rule | 3 + - src/tracker-extract/10-epub.rule.in | 3 - - src/tracker-extract/10-flac.rule | 4 ++ - src/tracker-extract/10-flac.rule.in | 4 -- - src/tracker-extract/10-gif.rule | 4 ++ - src/tracker-extract/10-gif.rule.in | 4 -- - src/tracker-extract/10-html.rule | 4 ++ - src/tracker-extract/10-html.rule.in | 4 -- - src/tracker-extract/10-ico.rule | 4 ++ - src/tracker-extract/10-ico.rule.in | 4 -- - src/tracker-extract/10-jpeg.rule | 4 ++ - src/tracker-extract/10-jpeg.rule.in | 4 -- - src/tracker-extract/10-mp3.rule | 4 ++ - src/tracker-extract/10-mp3.rule.in | 4 -- - src/tracker-extract/10-msoffice.rule | 4 ++ - src/tracker-extract/10-msoffice.rule.in | 4 -- - src/tracker-extract/10-oasis.rule | 4 ++ - src/tracker-extract/10-oasis.rule.in | 4 -- - src/tracker-extract/10-pdf.rule | 4 ++ - src/tracker-extract/10-pdf.rule.in | 4 -- - src/tracker-extract/10-png.rule | 4 ++ - src/tracker-extract/10-png.rule.in | 4 -- - src/tracker-extract/10-ps.rule | 4 ++ - src/tracker-extract/10-ps.rule.in | 4 -- - src/tracker-extract/10-svg.rule | 4 ++ - src/tracker-extract/10-svg.rule.in | 4 -- - src/tracker-extract/10-tiff.rule | 4 ++ - src/tracker-extract/10-tiff.rule.in | 4 -- - src/tracker-extract/10-vorbis.rule | 4 ++ - src/tracker-extract/10-vorbis.rule.in | 4 -- - src/tracker-extract/10-xmp.rule | 4 ++ - src/tracker-extract/10-xmp.rule.in | 4 -- - src/tracker-extract/10-xps.rule | 4 ++ - src/tracker-extract/10-xps.rule.in | 4 -- - src/tracker-extract/11-iso.rule | 4 ++ - src/tracker-extract/11-iso.rule.in | 4 -- - src/tracker-extract/11-msoffice-xml.rule | 4 ++ - src/tracker-extract/11-msoffice-xml.rule.in | 4 -- - src/tracker-extract/15-gstreamer-guess.rule | 4 ++ - src/tracker-extract/15-gstreamer-guess.rule.in | 4 -- - src/tracker-extract/15-playlist.rule | 4 ++ - src/tracker-extract/15-playlist.rule.in | 4 -- - src/tracker-extract/90-gstreamer-generic.rule | 4 ++ - src/tracker-extract/90-gstreamer-generic.rule.in | 4 -- - src/tracker-extract/90-text-generic.rule | 3 + - src/tracker-extract/90-text-generic.rule.in | 3 - - src/tracker-extract/91-gstreamer-generic-dlna.rule | 4 ++ - .../91-gstreamer-generic-dlna.rule.in | 4 -- - src/tracker-extract/92-xine-generic.rule | 4 ++ - src/tracker-extract/92-xine-generic.rule.in | 4 -- - src/tracker-extract/93-mplayer-generic.rule | 4 ++ - src/tracker-extract/93-mplayer-generic.rule.in | 4 -- - src/tracker-extract/93-totem-generic.rule | 4 ++ - src/tracker-extract/93-totem-generic.rule.in | 4 -- - src/tracker-extract/Makefile.am | 68 +++++++++++----------- - 59 files changed, 147 insertions(+), 149 deletions(-) - create mode 100644 src/tracker-extract/10-abw.rule - delete mode 100644 src/tracker-extract/10-abw.rule.in - create mode 100644 src/tracker-extract/10-dvi.rule - delete mode 100644 src/tracker-extract/10-dvi.rule.in - create mode 100644 src/tracker-extract/10-epub.rule - delete mode 100644 src/tracker-extract/10-epub.rule.in - create mode 100644 src/tracker-extract/10-flac.rule - delete mode 100644 src/tracker-extract/10-flac.rule.in - create mode 100644 src/tracker-extract/10-gif.rule - delete mode 100644 src/tracker-extract/10-gif.rule.in - create mode 100644 src/tracker-extract/10-html.rule - delete mode 100644 src/tracker-extract/10-html.rule.in - create mode 100644 src/tracker-extract/10-ico.rule - delete mode 100644 src/tracker-extract/10-ico.rule.in - create mode 100644 src/tracker-extract/10-jpeg.rule - delete mode 100644 src/tracker-extract/10-jpeg.rule.in - create mode 100644 src/tracker-extract/10-mp3.rule - delete mode 100644 src/tracker-extract/10-mp3.rule.in - create mode 100644 src/tracker-extract/10-msoffice.rule - delete mode 100644 src/tracker-extract/10-msoffice.rule.in - create mode 100644 src/tracker-extract/10-oasis.rule - delete mode 100644 src/tracker-extract/10-oasis.rule.in - create mode 100644 src/tracker-extract/10-pdf.rule - delete mode 100644 src/tracker-extract/10-pdf.rule.in - create mode 100644 src/tracker-extract/10-png.rule - delete mode 100644 src/tracker-extract/10-png.rule.in - create mode 100644 src/tracker-extract/10-ps.rule - delete mode 100644 src/tracker-extract/10-ps.rule.in - create mode 100644 src/tracker-extract/10-svg.rule - delete mode 100644 src/tracker-extract/10-svg.rule.in - create mode 100644 src/tracker-extract/10-tiff.rule - delete mode 100644 src/tracker-extract/10-tiff.rule.in - create mode 100644 src/tracker-extract/10-vorbis.rule - delete mode 100644 src/tracker-extract/10-vorbis.rule.in - create mode 100644 src/tracker-extract/10-xmp.rule - delete mode 100644 src/tracker-extract/10-xmp.rule.in - create mode 100644 src/tracker-extract/10-xps.rule - delete mode 100644 src/tracker-extract/10-xps.rule.in - create mode 100644 src/tracker-extract/11-iso.rule - delete mode 100644 src/tracker-extract/11-iso.rule.in - create mode 100644 src/tracker-extract/11-msoffice-xml.rule - delete mode 100644 src/tracker-extract/11-msoffice-xml.rule.in - create mode 100644 src/tracker-extract/15-gstreamer-guess.rule - delete mode 100644 src/tracker-extract/15-gstreamer-guess.rule.in - create mode 100644 src/tracker-extract/15-playlist.rule - delete mode 100644 src/tracker-extract/15-playlist.rule.in - create mode 100644 src/tracker-extract/90-gstreamer-generic.rule - delete mode 100644 src/tracker-extract/90-gstreamer-generic.rule.in - create mode 100644 src/tracker-extract/90-text-generic.rule - delete mode 100644 src/tracker-extract/90-text-generic.rule.in - create mode 100644 src/tracker-extract/91-gstreamer-generic-dlna.rule - delete mode 100644 src/tracker-extract/91-gstreamer-generic-dlna.rule.in - create mode 100644 src/tracker-extract/92-xine-generic.rule - delete mode 100644 src/tracker-extract/92-xine-generic.rule.in - create mode 100644 src/tracker-extract/93-mplayer-generic.rule - delete mode 100644 src/tracker-extract/93-mplayer-generic.rule.in - create mode 100644 src/tracker-extract/93-totem-generic.rule - delete mode 100644 src/tracker-extract/93-totem-generic.rule.in - -diff --git a/src/tracker-extract/10-abw.rule b/src/tracker-extract/10-abw.rule -new file mode 100644 -index 0000000..aef9a29 ---- /dev/null -+++ b/src/tracker-extract/10-abw.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-abw.so -+MimeTypes=application/x-abiword -+ -diff --git a/src/tracker-extract/10-abw.rule.in b/src/tracker-extract/10-abw.rule.in -deleted file mode 100644 -index aef9a29..0000000 ---- a/src/tracker-extract/10-abw.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-abw.so --MimeTypes=application/x-abiword -- -diff --git a/src/tracker-extract/10-dvi.rule b/src/tracker-extract/10-dvi.rule -new file mode 100644 -index 0000000..617c99a ---- /dev/null -+++ b/src/tracker-extract/10-dvi.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-dvi.so -+MimeTypes=application/x-dvi -+FallbackRdfType=nfo:Document -diff --git a/src/tracker-extract/10-dvi.rule.in b/src/tracker-extract/10-dvi.rule.in -deleted file mode 100644 -index 617c99a..0000000 ---- a/src/tracker-extract/10-dvi.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-dvi.so --MimeTypes=application/x-dvi --FallbackRdfType=nfo:Document -diff --git a/src/tracker-extract/10-epub.rule b/src/tracker-extract/10-epub.rule -new file mode 100644 -index 0000000..1467488 ---- /dev/null -+++ b/src/tracker-extract/10-epub.rule -@@ -0,0 +1,3 @@ -+[ExtractorRule] -+ModulePath=libextract-epub.so -+MimeTypes=application/epub+zip -diff --git a/src/tracker-extract/10-epub.rule.in b/src/tracker-extract/10-epub.rule.in -deleted file mode 100644 -index 1467488..0000000 ---- a/src/tracker-extract/10-epub.rule.in -+++ /dev/null -@@ -1,3 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-epub.so --MimeTypes=application/epub+zip -diff --git a/src/tracker-extract/10-flac.rule b/src/tracker-extract/10-flac.rule -new file mode 100644 -index 0000000..c0517ff ---- /dev/null -+++ b/src/tracker-extract/10-flac.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-flac.so -+MimeTypes=audio/x-flac -+ -diff --git a/src/tracker-extract/10-flac.rule.in b/src/tracker-extract/10-flac.rule.in -deleted file mode 100644 -index c0517ff..0000000 ---- a/src/tracker-extract/10-flac.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-flac.so --MimeTypes=audio/x-flac -- -diff --git a/src/tracker-extract/10-gif.rule b/src/tracker-extract/10-gif.rule -new file mode 100644 -index 0000000..3fdcfe0 ---- /dev/null -+++ b/src/tracker-extract/10-gif.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-gif.so -+MimeTypes=image/gif -+ -diff --git a/src/tracker-extract/10-gif.rule.in b/src/tracker-extract/10-gif.rule.in -deleted file mode 100644 -index 3fdcfe0..0000000 ---- a/src/tracker-extract/10-gif.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-gif.so --MimeTypes=image/gif -- -diff --git a/src/tracker-extract/10-html.rule b/src/tracker-extract/10-html.rule -new file mode 100644 -index 0000000..ec2cf27 ---- /dev/null -+++ b/src/tracker-extract/10-html.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-html.so -+MimeTypes=text/html;application/xhtml+xml; -+ -diff --git a/src/tracker-extract/10-html.rule.in b/src/tracker-extract/10-html.rule.in -deleted file mode 100644 -index ec2cf27..0000000 ---- a/src/tracker-extract/10-html.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-html.so --MimeTypes=text/html;application/xhtml+xml; -- -diff --git a/src/tracker-extract/10-ico.rule b/src/tracker-extract/10-ico.rule -new file mode 100644 -index 0000000..f1e161b ---- /dev/null -+++ b/src/tracker-extract/10-ico.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-icon.so -+MimeTypes=image/vnd.microsoft.icon -+ -diff --git a/src/tracker-extract/10-ico.rule.in b/src/tracker-extract/10-ico.rule.in -deleted file mode 100644 -index f1e161b..0000000 ---- a/src/tracker-extract/10-ico.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-icon.so --MimeTypes=image/vnd.microsoft.icon -- -diff --git a/src/tracker-extract/10-jpeg.rule b/src/tracker-extract/10-jpeg.rule -new file mode 100644 -index 0000000..e20d559 ---- /dev/null -+++ b/src/tracker-extract/10-jpeg.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-jpeg.so -+MimeTypes=image/jpeg -+ -diff --git a/src/tracker-extract/10-jpeg.rule.in b/src/tracker-extract/10-jpeg.rule.in -deleted file mode 100644 -index e20d559..0000000 ---- a/src/tracker-extract/10-jpeg.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-jpeg.so --MimeTypes=image/jpeg -- -diff --git a/src/tracker-extract/10-mp3.rule b/src/tracker-extract/10-mp3.rule -new file mode 100644 -index 0000000..86a9b73 ---- /dev/null -+++ b/src/tracker-extract/10-mp3.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-mp3.so -+MimeTypes=audio/mpeg;audio/x-mp3; -+ -diff --git a/src/tracker-extract/10-mp3.rule.in b/src/tracker-extract/10-mp3.rule.in -deleted file mode 100644 -index 86a9b73..0000000 ---- a/src/tracker-extract/10-mp3.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-mp3.so --MimeTypes=audio/mpeg;audio/x-mp3; -- -diff --git a/src/tracker-extract/10-msoffice.rule b/src/tracker-extract/10-msoffice.rule -new file mode 100644 -index 0000000..d6568ff ---- /dev/null -+++ b/src/tracker-extract/10-msoffice.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-msoffice.so -+MimeTypes=application/msword;application/vnd.ms-powerpoint;application/vnd.ms-excel;application/vnd.ms-*; -+ -diff --git a/src/tracker-extract/10-msoffice.rule.in b/src/tracker-extract/10-msoffice.rule.in -deleted file mode 100644 -index d6568ff..0000000 ---- a/src/tracker-extract/10-msoffice.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-msoffice.so --MimeTypes=application/msword;application/vnd.ms-powerpoint;application/vnd.ms-excel;application/vnd.ms-*; -- -diff --git a/src/tracker-extract/10-oasis.rule b/src/tracker-extract/10-oasis.rule -new file mode 100644 -index 0000000..10038c0 ---- /dev/null -+++ b/src/tracker-extract/10-oasis.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-oasis.so -+MimeTypes=application/vnd.oasis.opendocument.* -+ -diff --git a/src/tracker-extract/10-oasis.rule.in b/src/tracker-extract/10-oasis.rule.in -deleted file mode 100644 -index 10038c0..0000000 ---- a/src/tracker-extract/10-oasis.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-oasis.so --MimeTypes=application/vnd.oasis.opendocument.* -- -diff --git a/src/tracker-extract/10-pdf.rule b/src/tracker-extract/10-pdf.rule -new file mode 100644 -index 0000000..455fe6b ---- /dev/null -+++ b/src/tracker-extract/10-pdf.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-pdf.so -+MimeTypes=application/pdf -+FallbackRdfType=nfo:Document -diff --git a/src/tracker-extract/10-pdf.rule.in b/src/tracker-extract/10-pdf.rule.in -deleted file mode 100644 -index 455fe6b..0000000 ---- a/src/tracker-extract/10-pdf.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-pdf.so --MimeTypes=application/pdf --FallbackRdfType=nfo:Document -diff --git a/src/tracker-extract/10-png.rule b/src/tracker-extract/10-png.rule -new file mode 100644 -index 0000000..67b2a1b ---- /dev/null -+++ b/src/tracker-extract/10-png.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-png.so -+MimeTypes=image/png;sketch/png; -+ -diff --git a/src/tracker-extract/10-png.rule.in b/src/tracker-extract/10-png.rule.in -deleted file mode 100644 -index 67b2a1b..0000000 ---- a/src/tracker-extract/10-png.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-png.so --MimeTypes=image/png;sketch/png; -- -diff --git a/src/tracker-extract/10-ps.rule b/src/tracker-extract/10-ps.rule -new file mode 100644 -index 0000000..73734eb ---- /dev/null -+++ b/src/tracker-extract/10-ps.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-ps.so -+MimeTypes=application/x-gzpostscript;application/postscript; -+ -diff --git a/src/tracker-extract/10-ps.rule.in b/src/tracker-extract/10-ps.rule.in -deleted file mode 100644 -index 73734eb..0000000 ---- a/src/tracker-extract/10-ps.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-ps.so --MimeTypes=application/x-gzpostscript;application/postscript; -- -diff --git a/src/tracker-extract/10-svg.rule b/src/tracker-extract/10-svg.rule -new file mode 100644 -index 0000000..8b1e0ab ---- /dev/null -+++ b/src/tracker-extract/10-svg.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-gstreamer.so -+MimeTypes=image/svg+xml -+ -diff --git a/src/tracker-extract/10-svg.rule.in b/src/tracker-extract/10-svg.rule.in -deleted file mode 100644 -index 8b1e0ab..0000000 ---- a/src/tracker-extract/10-svg.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-gstreamer.so --MimeTypes=image/svg+xml -- -diff --git a/src/tracker-extract/10-tiff.rule b/src/tracker-extract/10-tiff.rule -new file mode 100644 -index 0000000..c883c90 ---- /dev/null -+++ b/src/tracker-extract/10-tiff.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-tiff.so -+MimeTypes=image/tiff -+ -diff --git a/src/tracker-extract/10-tiff.rule.in b/src/tracker-extract/10-tiff.rule.in -deleted file mode 100644 -index c883c90..0000000 ---- a/src/tracker-extract/10-tiff.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-tiff.so --MimeTypes=image/tiff -- -diff --git a/src/tracker-extract/10-vorbis.rule b/src/tracker-extract/10-vorbis.rule -new file mode 100644 -index 0000000..f99877b ---- /dev/null -+++ b/src/tracker-extract/10-vorbis.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-vorbis.so -+MimeTypes=audio/x-vorbis+ogg;application/ogg; -+ -diff --git a/src/tracker-extract/10-vorbis.rule.in b/src/tracker-extract/10-vorbis.rule.in -deleted file mode 100644 -index f99877b..0000000 ---- a/src/tracker-extract/10-vorbis.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-vorbis.so --MimeTypes=audio/x-vorbis+ogg;application/ogg; -- -diff --git a/src/tracker-extract/10-xmp.rule b/src/tracker-extract/10-xmp.rule -new file mode 100644 -index 0000000..e9288db ---- /dev/null -+++ b/src/tracker-extract/10-xmp.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-xmp.so -+MimeTypes=application/rdf+xml -+ -diff --git a/src/tracker-extract/10-xmp.rule.in b/src/tracker-extract/10-xmp.rule.in -deleted file mode 100644 -index e9288db..0000000 ---- a/src/tracker-extract/10-xmp.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-xmp.so --MimeTypes=application/rdf+xml -- -diff --git a/src/tracker-extract/10-xps.rule b/src/tracker-extract/10-xps.rule -new file mode 100644 -index 0000000..0916f8d ---- /dev/null -+++ b/src/tracker-extract/10-xps.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-xps.so -+MimeTypes=application/oxps;application/vnd.ms-xpsdocument; -+FallbackRdfType=nfo:Document -diff --git a/src/tracker-extract/10-xps.rule.in b/src/tracker-extract/10-xps.rule.in -deleted file mode 100644 -index 0916f8d..0000000 ---- a/src/tracker-extract/10-xps.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-xps.so --MimeTypes=application/oxps;application/vnd.ms-xpsdocument; --FallbackRdfType=nfo:Document -diff --git a/src/tracker-extract/11-iso.rule b/src/tracker-extract/11-iso.rule -new file mode 100644 -index 0000000..400a072 ---- /dev/null -+++ b/src/tracker-extract/11-iso.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-iso.so -+MimeTypes=application/x-cd-image -+ -diff --git a/src/tracker-extract/11-iso.rule.in b/src/tracker-extract/11-iso.rule.in -deleted file mode 100644 -index 400a072..0000000 ---- a/src/tracker-extract/11-iso.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-iso.so --MimeTypes=application/x-cd-image -- -diff --git a/src/tracker-extract/11-msoffice-xml.rule b/src/tracker-extract/11-msoffice-xml.rule -new file mode 100644 -index 0000000..8459823 ---- /dev/null -+++ b/src/tracker-extract/11-msoffice-xml.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-msoffice-xml.so -+MimeTypes=application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.wordprocessingml.document; -+ -diff --git a/src/tracker-extract/11-msoffice-xml.rule.in b/src/tracker-extract/11-msoffice-xml.rule.in -deleted file mode 100644 -index 8459823..0000000 ---- a/src/tracker-extract/11-msoffice-xml.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-msoffice-xml.so --MimeTypes=application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.wordprocessingml.document; -- -diff --git a/src/tracker-extract/15-gstreamer-guess.rule b/src/tracker-extract/15-gstreamer-guess.rule -new file mode 100644 -index 0000000..6088807 ---- /dev/null -+++ b/src/tracker-extract/15-gstreamer-guess.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-gstreamer.so -+MimeTypes=video/3gpp;video/mp4;video/x-ms-asf;application/vnd.rn-realmedia -+ -diff --git a/src/tracker-extract/15-gstreamer-guess.rule.in b/src/tracker-extract/15-gstreamer-guess.rule.in -deleted file mode 100644 -index 6088807..0000000 ---- a/src/tracker-extract/15-gstreamer-guess.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-gstreamer.so --MimeTypes=video/3gpp;video/mp4;video/x-ms-asf;application/vnd.rn-realmedia -- -diff --git a/src/tracker-extract/15-playlist.rule b/src/tracker-extract/15-playlist.rule -new file mode 100644 -index 0000000..16ec50e ---- /dev/null -+++ b/src/tracker-extract/15-playlist.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-playlist.so -+MimeTypes=audio/x-mpegurl;audio/mpegurl;audio/x-scpls;audio/x-pn-realaudio;application/ram;application/vnd.ms-wpl;application/smil;audio/x-ms-asx; -+ -diff --git a/src/tracker-extract/15-playlist.rule.in b/src/tracker-extract/15-playlist.rule.in -deleted file mode 100644 -index 16ec50e..0000000 ---- a/src/tracker-extract/15-playlist.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-playlist.so --MimeTypes=audio/x-mpegurl;audio/mpegurl;audio/x-scpls;audio/x-pn-realaudio;application/ram;application/vnd.ms-wpl;application/smil;audio/x-ms-asx; -- -diff --git a/src/tracker-extract/90-gstreamer-generic.rule b/src/tracker-extract/90-gstreamer-generic.rule -new file mode 100644 -index 0000000..58ce23f ---- /dev/null -+++ b/src/tracker-extract/90-gstreamer-generic.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-gstreamer.so -+MimeTypes=audio/*;video/*;image/*; -+ -diff --git a/src/tracker-extract/90-gstreamer-generic.rule.in b/src/tracker-extract/90-gstreamer-generic.rule.in -deleted file mode 100644 -index 58ce23f..0000000 ---- a/src/tracker-extract/90-gstreamer-generic.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-gstreamer.so --MimeTypes=audio/*;video/*;image/*; -- -diff --git a/src/tracker-extract/90-text-generic.rule b/src/tracker-extract/90-text-generic.rule -new file mode 100644 -index 0000000..f1a658c ---- /dev/null -+++ b/src/tracker-extract/90-text-generic.rule -@@ -0,0 +1,3 @@ -+[ExtractorRule] -+ModulePath=libextract-text.so -+MimeTypes=text/* -diff --git a/src/tracker-extract/90-text-generic.rule.in b/src/tracker-extract/90-text-generic.rule.in -deleted file mode 100644 -index f1a658c..0000000 ---- a/src/tracker-extract/90-text-generic.rule.in -+++ /dev/null -@@ -1,3 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-text.so --MimeTypes=text/* -diff --git a/src/tracker-extract/91-gstreamer-generic-dlna.rule b/src/tracker-extract/91-gstreamer-generic-dlna.rule -new file mode 100644 -index 0000000..b25e84c ---- /dev/null -+++ b/src/tracker-extract/91-gstreamer-generic-dlna.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-gstreamer.so -+MimeTypes=dlna/*; -+ -diff --git a/src/tracker-extract/91-gstreamer-generic-dlna.rule.in b/src/tracker-extract/91-gstreamer-generic-dlna.rule.in -deleted file mode 100644 -index b25e84c..0000000 ---- a/src/tracker-extract/91-gstreamer-generic-dlna.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-gstreamer.so --MimeTypes=dlna/*; -- -diff --git a/src/tracker-extract/92-xine-generic.rule b/src/tracker-extract/92-xine-generic.rule -new file mode 100644 -index 0000000..9250b17 ---- /dev/null -+++ b/src/tracker-extract/92-xine-generic.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-xine.so -+MimeTypes=audio/*;video/*; -+ -diff --git a/src/tracker-extract/92-xine-generic.rule.in b/src/tracker-extract/92-xine-generic.rule.in -deleted file mode 100644 -index 9250b17..0000000 ---- a/src/tracker-extract/92-xine-generic.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-xine.so --MimeTypes=audio/*;video/*; -- -diff --git a/src/tracker-extract/93-mplayer-generic.rule b/src/tracker-extract/93-mplayer-generic.rule -new file mode 100644 -index 0000000..8121a2f ---- /dev/null -+++ b/src/tracker-extract/93-mplayer-generic.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-mplayer.so -+MimeTypes=audio/*;video/*; -+ -diff --git a/src/tracker-extract/93-mplayer-generic.rule.in b/src/tracker-extract/93-mplayer-generic.rule.in -deleted file mode 100644 -index 8121a2f..0000000 ---- a/src/tracker-extract/93-mplayer-generic.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-mplayer.so --MimeTypes=audio/*;video/*; -- -diff --git a/src/tracker-extract/93-totem-generic.rule b/src/tracker-extract/93-totem-generic.rule -new file mode 100644 -index 0000000..39ab02a ---- /dev/null -+++ b/src/tracker-extract/93-totem-generic.rule -@@ -0,0 +1,4 @@ -+[ExtractorRule] -+ModulePath=libextract-totem.so -+MimeTypes=audio/*;video/*; -+ -diff --git a/src/tracker-extract/93-totem-generic.rule.in b/src/tracker-extract/93-totem-generic.rule.in -deleted file mode 100644 -index 39ab02a..0000000 ---- a/src/tracker-extract/93-totem-generic.rule.in -+++ /dev/null -@@ -1,4 +0,0 @@ --[ExtractorRule] --ModulePath=libextract-totem.so --MimeTypes=audio/*;video/*; -- -diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am -index a53a9b1..ea0557d 100644 ---- a/src/tracker-extract/Makefile.am -+++ b/src/tracker-extract/Makefile.am -@@ -14,40 +14,38 @@ AM_CPPFLAGS = \ - # NOTE: The rules are here and not in another sub-directory because we - # only install rules for extractors we build. If we decouple this, it - # duplicates work and requires more maintenance to keep modules up to --# date. --rules_in_files = \ -- 10-abw.rule.in \ -- 10-dvi.rule.in \ -- 10-epub.rule.in \ -- 10-flac.rule.in \ -- 10-gif.rule.in \ -- 10-html.rule.in \ -- 10-ico.rule.in \ -- 10-jpeg.rule.in \ -- 10-mp3.rule.in \ -- 10-msoffice.rule.in \ -- 10-oasis.rule.in \ -- 10-pdf.rule.in \ -- 10-png.rule.in \ -- 10-ps.rule.in \ -- 10-svg.rule.in \ -- 10-tiff.rule.in \ -- 10-vorbis.rule.in \ -- 10-xmp.rule.in \ -- 10-xps.rule.in \ -- 11-iso.rule.in \ -- 11-msoffice-xml.rule.in \ -- 15-gstreamer-guess.rule.in \ -- 15-playlist.rule.in \ -- 90-gstreamer-generic.rule.in \ -- 90-text-generic.rule.in \ -- 91-gstreamer-generic-dlna.rule.in \ -- 92-xine-generic.rule.in \ -- 93-mplayer-generic.rule.in \ -- 93-totem-generic.rule.in -- --%.rule: %.rule.in -- @sed -e "s|@extractmodulesdir[@]|${extractmodulesdir}|" $< > $@ -+# date. If you are adding a new rule then add it to both rules_files -+# and then separately with the module below. -+rules_files = \ -+ 10-abw.rule \ -+ 10-dvi.rule \ -+ 10-epub.rule \ -+ 10-flac.rule \ -+ 10-gif.rule \ -+ 10-html.rule \ -+ 10-ico.rule \ -+ 10-jpeg.rule \ -+ 10-mp3.rule \ -+ 10-msoffice.rule \ -+ 10-oasis.rule \ -+ 10-pdf.rule \ -+ 10-png.rule \ -+ 10-ps.rule \ -+ 10-svg.rule \ -+ 10-tiff.rule \ -+ 10-vorbis.rule \ -+ 10-xmp.rule \ -+ 10-xps.rule \ -+ 11-iso.rule \ -+ 11-msoffice-xml.rule \ -+ 15-gstreamer-guess.rule \ -+ 15-playlist.rule \ -+ 90-gstreamer-generic.rule \ -+ 90-text-generic.rule \ -+ 91-gstreamer-generic-dlna.rule \ -+ 92-xine-generic.rule \ -+ 93-mplayer-generic.rule \ -+ 93-totem-generic.rule - - # NOTE: - # We don't always link with libtracker-common, we only link -@@ -560,4 +558,4 @@ CLEANFILES = $(BUILT_SOURCES) $(rules_DATA) - - EXTRA_DIST = \ - tracker-marshal.list \ -- $(rules_in_files) -+ $(rules_files) --- -1.8.4.2 - diff --git a/SOURCES/tracker-0.16-miner-fs-crashes.patch b/SOURCES/tracker-0.16-miner-fs-crashes.patch deleted file mode 100644 index 43ca776..0000000 --- a/SOURCES/tracker-0.16-miner-fs-crashes.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 409606679702536cfb207282c3d034eace83f2a4 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Wed, 1 Oct 2014 19:31:01 +0200 -Subject: [PATCH 1/2] libtracker-miner: Ensure that the async function uses - owned data - -... and simplify parent directory tracking. - -The GFileEnumerator keeps a reference to the directory that is being -traversed, so we don't need to keep track of it ourselves. - -https://bugzilla.gnome.org/show_bug.cgi?id=737768 ---- - src/libtracker-miner/tracker-crawler.c | 18 +++++++----------- - 1 file changed, 7 insertions(+), 11 deletions(-) - -diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c -index c034204..2c6e0f0 100644 ---- a/src/libtracker-miner/tracker-crawler.c -+++ b/src/libtracker-miner/tracker-crawler.c -@@ -105,7 +105,6 @@ typedef struct { - TrackerCrawler *crawler; - DirectoryRootInfo *root_info; - DirectoryProcessingData *dir_info; -- GFile *dir_file; - GCancellable *cancellable; - } EnumeratorData; - -@@ -596,9 +595,6 @@ enumerator_data_new (TrackerCrawler *crawler, - ed->crawler = g_object_ref (crawler); - ed->root_info = root_info; - ed->dir_info = dir_info; -- /* Make sure there's always a ref of the GFile while we're -- * iterating it */ -- ed->dir_file = g_object_ref (G_FILE (dir_info->node->data)); - ed->cancellable = g_cancellable_new (); - - crawler->priv->cancellables = g_list_prepend (crawler->priv->cancellables, -@@ -607,7 +603,7 @@ enumerator_data_new (TrackerCrawler *crawler, - } - - static void --enumerator_data_process (EnumeratorData *ed) -+enumerator_data_process (GFile *parent, EnumeratorData *ed) - { - TrackerCrawler *crawler; - GSList *l; -@@ -623,7 +619,7 @@ enumerator_data_process (EnumeratorData *ed) - children = g_list_prepend (children, child_data->child); - } - -- g_signal_emit (crawler, signals[CHECK_DIRECTORY_CONTENTS], 0, ed->dir_info->node->data, children, &use); -+ g_signal_emit (crawler, signals[CHECK_DIRECTORY_CONTENTS], 0, parent, children, &use); - g_list_free (children); - - if (!use) { -@@ -640,7 +636,6 @@ enumerator_data_free (EnumeratorData *ed) - g_list_remove (ed->crawler->priv->cancellables, - ed->cancellable); - -- g_object_unref (ed->dir_file); - g_object_unref (ed->crawler); - g_object_unref (ed->cancellable); - g_slice_free (EnumeratorData, ed); -@@ -690,6 +685,7 @@ file_enumerate_next_cb (GObject *object, - ed = user_data; - crawler = ed->crawler; - cancelled = g_cancellable_is_cancelled (ed->cancellable); -+ parent = g_file_enumerator_get_container (enumerator); - - files = g_file_enumerator_next_files_finish (enumerator, - result, -@@ -710,7 +706,7 @@ file_enumerate_next_cb (GObject *object, - } - - if (!cancelled) { -- enumerator_data_process (ed); -+ enumerator_data_process (parent, ed); - } - - enumerator_data_free (ed); -@@ -724,8 +720,6 @@ file_enumerate_next_cb (GObject *object, - return; - } - -- parent = ed->dir_info->node->data; -- - for (l = files; l; l = l->next) { - const gchar *child_name; - gboolean is_dir; -@@ -814,6 +808,7 @@ file_enumerate_children (TrackerCrawler *crawler, - DirectoryProcessingData *dir_data) - { - EnumeratorData *ed; -+ GFile *dir_file; - gchar *attrs; - - ed = enumerator_data_new (crawler, info, dir_data); -@@ -826,7 +821,8 @@ file_enumerate_children (TrackerCrawler *crawler, - attrs = g_strdup (FILE_ATTRIBUTES); - } - -- g_file_enumerate_children_async (ed->dir_file, -+ dir_file = G_FILE (dir_data->node->data); -+ g_file_enumerate_children_async (dir_file, - attrs, - G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, - G_PRIORITY_LOW, --- -2.1.0 - - -From 0018667159e02a4b9e51ad2c9bbd76d666fbfe56 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Wed, 1 Oct 2014 19:44:42 +0200 -Subject: [PATCH 2/2] libtracker-miner: Keep the crawler alive across async - calls - -The EnumeratorData held a reference to TrackerCrawler while -enumerating. Just before closing the enumerator we destroy the -EnumeratorData and drop the reference. This can lead to TrackerCrawler -getting destroyed. - -To prevent this, grab a new reference before dropping the older one -and keep it till the asynchronous call is alive. - -https://bugzilla.gnome.org/show_bug.cgi?id=737769 ---- - src/libtracker-miner/tracker-crawler.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/libtracker-miner/tracker-crawler.c b/src/libtracker-miner/tracker-crawler.c -index 2c6e0f0..80befde 100644 ---- a/src/libtracker-miner/tracker-crawler.c -+++ b/src/libtracker-miner/tracker-crawler.c -@@ -664,6 +664,7 @@ file_enumerator_close_cb (GObject *enumerator, - * continue with queued files/directories. - */ - process_func_start (crawler); -+ g_object_unref (crawler); - } - - static void -@@ -709,12 +710,12 @@ file_enumerate_next_cb (GObject *object, - enumerator_data_process (parent, ed); - } - -- enumerator_data_free (ed); - g_file_enumerator_close_async (enumerator, - G_PRIORITY_DEFAULT, - NULL, - file_enumerator_close_cb, -- crawler); -+ g_object_ref (crawler)); -+ enumerator_data_free (ed); - g_object_unref (enumerator); - - return; --- -2.1.0 - diff --git a/SOURCES/tracker-0.16-miner-store-crashes.patch b/SOURCES/tracker-0.16-miner-store-crashes.patch deleted file mode 100644 index 9412c53..0000000 --- a/SOURCES/tracker-0.16-miner-store-crashes.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 82f4821ed0b022ed91aa0867b0f5b77048e2c3be Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Mon, 13 Oct 2014 13:49:29 +0200 -Subject: [PATCH 1/2] libtracker-data: Guard against failure to open the - database - -An error from sqlite3_open_v2 will lead to a failure to create a -TrackerDBInterface. This means that DBManager.get_db_interface will -fail. - -https://bugzilla.gnome.org/show_bug.cgi?id=738450 ---- - src/libtracker-data/tracker-sparql-query.vala | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala -index b84103d..2430263 100644 ---- a/src/libtracker-data/tracker-sparql-query.vala -+++ b/src/libtracker-data/tracker-sparql-query.vala -@@ -500,6 +500,10 @@ public class Tracker.Sparql.Query : Object { - - DBStatement prepare_for_exec (string sql) throws DBInterfaceError, Sparql.Error, DateError { - var iface = DBManager.get_db_interface (); -+ if (iface == null) { -+ throw new DBInterfaceError.OPEN_ERROR ("Error opening database"); -+ } -+ - var stmt = iface.create_statement (no_cache ? DBStatementCacheType.NONE : DBStatementCacheType.SELECT, "%s", sql); - - // set literals specified in query --- -2.1.0 - - -From 08b31a6d1de2418e409a300ca86578bbd03ad8ee Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Mon, 13 Oct 2014 14:27:07 +0200 -Subject: [PATCH 2/2] libtracker-data: Guard against invalid statements in - public API - -https://bugzilla.gnome.org/show_bug.cgi?id=738450 ---- - src/libtracker-data/tracker-db-interface-sqlite.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c -index a9e899e..682dd86 100644 ---- a/src/libtracker-data/tracker-db-interface-sqlite.c -+++ b/src/libtracker-data/tracker-db-interface-sqlite.c -@@ -2202,6 +2202,7 @@ void - tracker_db_statement_execute (TrackerDBStatement *stmt, - GError **error) - { -+ g_return_if_fail (TRACKER_IS_DB_STATEMENT (stmt)); - g_return_if_fail (!stmt->stmt_is_sunk); - - execute_stmt (stmt->db_interface, stmt->stmt, NULL, error); -@@ -2211,6 +2212,7 @@ TrackerDBCursor * - tracker_db_statement_start_cursor (TrackerDBStatement *stmt, - GError **error) - { -+ g_return_val_if_fail (TRACKER_IS_DB_STATEMENT (stmt), NULL); - g_return_val_if_fail (!stmt->stmt_is_sunk, NULL); - - return tracker_db_cursor_sqlite_new (stmt->stmt, stmt, NULL, 0, NULL, 0, FALSE); -@@ -2225,6 +2227,7 @@ tracker_db_statement_start_sparql_cursor (TrackerDBStatement *stmt, - gboolean threadsafe, - GError **error) - { -+ g_return_val_if_fail (TRACKER_IS_DB_STATEMENT (stmt), NULL); - g_return_val_if_fail (!stmt->stmt_is_sunk, NULL); - - return tracker_db_cursor_sqlite_new (stmt->stmt, stmt, types, n_types, variable_names, n_variable_names, threadsafe); --- -2.1.0 - diff --git a/SPECS/tracker.spec b/SPECS/tracker.spec index 462fe55..7526998 100644 --- a/SPECS/tracker.spec +++ b/SPECS/tracker.spec @@ -1,80 +1,84 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") - -%if 0%{?fedora} > 15 -%global with_enca 1 -%global with_libcue 1 -%endif +%global with_nautilus 0 %if 0%{?rhel} +%global with_enca 0 +%global with_libcue 0 %global with_thunderbird 0 %else +%global with_enca 1 +%global with_libcue 1 %global with_thunderbird 1 %endif Summary: Desktop-neutral search tool and indexer Name: tracker -Version: 0.16.2 -Release: 11%{?dist} +Version: 1.2.6 +Release: 3%{?dist} License: GPLv2+ Group: Applications/System -URL: http://projects.gnome.org/tracker/ -Source0: http://download.gnome.org/sources/tracker/0.16/%{name}-%{version}.tar.xz +URL: https://wiki.gnome.org/Projects/Tracker +Source0: https://download.gnome.org/sources/%{name}/1.2/%{name}-%{version}.tar.xz # only autostart in Gnome, see also # https://bugzilla.redhat.com/show_bug.cgi?id=771601 -Patch1: tracker-0.15-onlyshowin.patch - -# https://bugzilla.gnome.org/show_bug.cgi?id=703089 -Patch2: 0001-Fix-typos-in-tracker-search-man-page.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=884197 -Patch3: 0001-Add-a-newline-at-the-end-of-file.patch -Patch4: 0002-libtracker-extract-tracker-extract-Remove-modulesdir.patch -Patch5: 0003-tracker-extract-Rename-.rules.in-to-.rules.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=1051470 -Patch6: 0001-fts-Strengthen-against-sqlite-failures-in-FTS-functi.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=1028194 -Patch7: 0001-Bump-the-minimum-memory-requirement-to-768M.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=1096307 -Patch8: tracker-0.16-miner-fs-crashes.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=1083199 -Patch9: tracker-0.16-miner-store-crashes.patch - -BuildRequires: poppler-glib-devel libxml2-devel libgsf-devel libgxps-devel -BuildRequires: libuuid-devel dbus-glib-devel -BuildRequires: nautilus-devel -BuildRequires: libjpeg-devel libexif-devel exempi-devel -BuildRequires: libiptcdata-devel libtiff-devel libpng-devel giflib-devel -BuildRequires: sqlite-devel vala-devel libgee06-devel -BuildRequires: gstreamer1-plugins-base-devel gstreamer1-devel -BuildRequires: totem-pl-parser-devel libvorbis-devel flac-devel +Patch1: tracker-0.15-onlyshowin.patch + +# https://bugzilla.redhat.com/show_bug.cgi?id=1133924 +Patch2: 0001-tracker-extract-Avoid-the-use-of-setrlimit-it-s-caus.patch + +BuildRequires: desktop-file-utils +BuildRequires: firefox +BuildRequires: giflib-devel +BuildRequires: graphviz +BuildRequires: gtk-doc +BuildRequires: intltool +BuildRequires: libjpeg-devel +BuildRequires: libtiff-devel +%if 0%{?with_thunderbird} +BuildRequires: thunderbird +%endif +BuildRequires: vala-devel %if 0%{?with_enca} -BuildRequires: enca-devel +BuildRequires: pkgconfig(enca) %endif -BuildRequires: upower-devel libsecret-devel NetworkManager-glib-devel -BuildRequires: libunistring-devel gupnp-dlna-devel taglib-devel rest-devel -BuildRequires: libosinfo-devel +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(gtk+-3.0) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(icu-uc) %if 0%{?with_libcue} -BuildRequires: libcue-devel +BuildRequires: pkgconfig(libcue) %endif -BuildRequires: firefox -BuildRequires: gdk-pixbuf2-devel -BuildRequires: desktop-file-utils intltool gettext -BuildRequires: gtk-doc graphviz -BuildRequires: gobject-introspection -BuildRequires: autoconf -BuildRequires: automake - -%if 0%{?with_thunderbird} -BuildRequires: thunderbird +BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(gee-0.8) +BuildRequires: pkgconfig(libgsf-1) +BuildRequires: pkgconfig(libgxps) +BuildRequires: pkgconfig(libiptcdata) +%if 0%{?with_nautilus} +BuildRequires: pkgconfig(libnautilus-extension) %endif - +BuildRequires: pkgconfig(libnm-glib) +BuildRequires: pkgconfig(libosinfo-1.0) +BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(libmediaart-1.0) +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) + +Obsoletes: compat-tracker018 < 0.17.2-2 Obsoletes: tracker-miner-flickr < 0.16.0 +Obsoletes: tracker-nautilus-plugin < 0.17.2-2 %description Tracker is a powerful desktop-neutral first class object database, @@ -95,22 +99,30 @@ all types of files and other first class objects Summary: Headers for developing programs that will use %{name} Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: dbus-glib-devel gtk2-devel +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains the static libraries and header files needed for developing with tracker -%package ui-tools -Summary: Tracker search tool(s) +%package needle +Summary: Tracker search tool Group: User Interface/Desktops Requires: %{name}%{?_isa} = %{version}-%{release} Obsoletes: paperbox <= 0.4.4 +Obsoletes: tracker-ui-tools < 1.1.4 Obsoletes: tracker-search-tool <= 0.12.0 -%description ui-tools -Graphical frontend to tracker search (tracker-needle) and configuration -(tracker-preferences) facilities. +%description needle +Graphical frontend to tracker search. + +%package preferences +Summary: Tracker preferences +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: tracker-ui-tools < 1.1.4 + +%description preferences +Graphical frontend to tracker configuration. %package firefox-plugin Summary: A simple bookmark exporter for Tracker @@ -121,6 +133,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This Firefox addon exports your bookmarks to Tracker, so that you can search for them for example using tracker-needle. +%if 0%{?with_nautilus} %package nautilus-plugin Summary: Tracker's nautilus plugin Group: User Interface/Desktops @@ -129,6 +142,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description nautilus-plugin Tracker's nautilus plugin, provides 'tagging' functionality. Ability to perform search in nautilus using tracker is built-in directly in the nautilus package. +%endif %if 0%{?with_thunderbird} %package thunderbird-plugin @@ -148,63 +162,64 @@ BuildArch: noarch %description docs This package contains the documentation for tracker + %prep %setup -q %patch1 -p1 -b .onlyshowin -%patch2 -p1 -b .manpage -%patch3 -p1 -b .newline -%patch4 -p1 -b .modulesdir -%patch5 -p1 -b .rename -%patch6 -p1 -b .fts -%patch7 -p1 -b .memory -%patch8 -p1 -b .miner-fs-crashes -%patch9 -p1 -b .miner-store-crashes - -autoreconf +%patch2 -p1 -b .rlimits ## nuke unwanted rpaths, see also ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure + %build -%configure --disable-static \ - --enable-gtk-doc \ - --enable-miner-evolution=no \ - --with-firefox-plugin-dir=%{_libdir}/firefox/extensions \ +%configure --disable-static \ + --enable-gtk-doc \ + --enable-libflac \ + --enable-libvorbis \ + --enable-miner-evolution=no \ + --with-firefox-plugin-dir=%{_libdir}/firefox/extensions \ + --disable-mp3 \ +%if %{with_nautilus} + --enable-nautilus-extension \ +%else + --disable-nautilus-extension \ +%endif + --enable-libmediaart \ %if 0%{?with_thunderbird} - --with-thunderbird-plugin-dir=%{_libdir}/thunderbird/extensions \ + --with-thunderbird-plugin-dir=%{_libdir}/thunderbird/extensions \ %endif - --with-unicode-support=libunistring \ - --disable-qt \ - --disable-functional-tests + --with-unicode-support=libicu \ + --disable-functional-tests # Disable the functional tests for now, they use python bytecodes. make V=1 %{?_smp_mflags} -%install -make DESTDIR=%{buildroot} install - -mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d -echo "%{_libdir}/tracker-0.16" \ - > %{buildroot}%{_sysconfdir}/ld.so.conf.d/tracker-%{_arch}.conf -%if 0%{?fedora} && 0%{?fedora} < 18 -desktop-file-install --delete-original \ - --vendor="fedora" \ - --dir=%{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/%{name}-needle.desktop -%endif +%install +make DESTDIR=%{buildroot} INSTALL="install -p" install -find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' +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. +rm -f %{buildroot}%{_libdir}/tracker-1.0/*.so + %find_lang %{name} + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/tracker-needle.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/tracker-preferences.desktop + + %post -p /sbin/ldconfig -%post ui-tools -touch --no-create %{_datadir}/icons/hicolor +%post preferences +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun /sbin/ldconfig @@ -212,21 +227,18 @@ if [ $1 -eq 0 ]; then glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : fi -%postun ui-tools +%postun preferences if [ $1 -eq 0 ] ; then -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi %posttrans glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : -%posttrans ui-tools -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +%posttrans preferences +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files -f %{name}.lang %doc AUTHORS COPYING NEWS README @@ -234,45 +246,53 @@ fi %{_libexecdir}/tracker* %{_datadir}/tracker/ %{_datadir}/dbus-1/services/org.freedesktop.Tracker* -%{_libdir}/*.so.* -%{_libdir}/tracker-0.16/ -%{_libdir}/girepository-1.0/Tracker-0.16.typelib -%{_libdir}/girepository-1.0/TrackerExtract-0.16.typelib -%{_libdir}/girepository-1.0/TrackerMiner-0.16.typelib +%{_libdir}/libtracker*-1.0.so.* +%{_libdir}/tracker-1.0/ +%{_libdir}/girepository-1.0/Tracker-1.0.typelib +%{_libdir}/girepository-1.0/TrackerControl-1.0.typelib +%{_libdir}/girepository-1.0/TrackerMiner-1.0.typelib %{_mandir}/*/tracker*.gz -%{_sysconfdir}/ld.so.conf.d/tracker-%{_arch}.conf %config(noreplace) %{_sysconfdir}/xdg/autostart/tracker*.desktop %{_datadir}/glib-2.0/schemas/* -%exclude %{_bindir}/tracker-explorer %exclude %{_bindir}/tracker-needle %exclude %{_bindir}/tracker-preferences -%exclude %{_mandir}/man1/tracker-preferences.1.gz -%exclude %{_mandir}/man1/tracker-needle.1.gz +%exclude %{_datadir}/tracker/tracker-needle.ui +%exclude %{_datadir}/tracker/tracker-preferences.ui +%exclude %{_mandir}/man1/tracker-preferences.1* +%exclude %{_mandir}/man1/tracker-needle.1* %files devel -%{_includedir}/tracker-0.16/ +%{_includedir}/tracker-1.0/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/vala/vapi/tracker*.* -%{_datadir}/gir-1.0/Tracker-0.16.gir -%{_datadir}/gir-1.0/TrackerExtract-0.16.gir -%{_datadir}/gir-1.0/TrackerMiner-0.16.gir +%{_datadir}/gir-1.0/Tracker-1.0.gir +%{_datadir}/gir-1.0/TrackerControl-1.0.gir +%{_datadir}/gir-1.0/TrackerMiner-1.0.gir -%files ui-tools +%files needle %{_bindir}/tracker-needle +%{_datadir}/appdata/tracker-needle.appdata.xml +%{_datadir}/applications/tracker-needle.desktop +%{_datadir}/tracker/tracker-needle.ui +%{_mandir}/man1/tracker-needle.1* + +%files preferences %{_bindir}/tracker-preferences +%{_datadir}/appdata/tracker-preferences.appdata.xml +%{_datadir}/applications/tracker-preferences.desktop %{_datadir}/icons/*/*/apps/tracker.* -%{_datadir}/applications/*.desktop -%{_mandir}/man1/tracker-preferences.1.gz -%{_mandir}/man1/tracker-needle.1.gz -%exclude %{_datadir}/applications/trackerbird-launcher.desktop +%{_datadir}/tracker/tracker-preferences.ui +%{_mandir}/man1/tracker-preferences.1* %files firefox-plugin %{_datadir}/xul-ext/trackerfox/ %{_libdir}/firefox/extensions/trackerfox@bustany.org +%if 0%{?with_nautilus} %files nautilus-plugin %{_libdir}/nautilus/extensions-3.0/libnautilus-tracker-tags.so +%endif %if 0%{?with_thunderbird} %files thunderbird-plugin @@ -283,27 +303,48 @@ fi %files docs %doc docs/reference/COPYING +%{_datadir}/gtk-doc/html/libtracker-control/ %{_datadir}/gtk-doc/html/libtracker-miner/ -%{_datadir}/gtk-doc/html/libtracker-extract/ %{_datadir}/gtk-doc/html/libtracker-sparql/ %{_datadir}/gtk-doc/html/ontology/ + %changelog -* Mon Oct 13 2014 Debarshi Ray 0.16.2-11 +* Tue May 12 2015 Matthias Clasen - 1.2.6-3 +- Rebuild against new totem-pl-parser +- Related: #1174534 + +* Wed May 6 2015 Matthias Clasen - 1.2.6-2 +- Rebuild against new upower +- Related: #1174534 + +* Thu Apr 30 2015 David King - 1.2.6-1 +- Split desktop-file-validate invocation +- Related: #1174534 + +* Fri Apr 10 2015 Debarshi Ray - 1.2.6-1 +- Update to 1.2.6 +- Resolves: #1174534 + +* Thu Mar 19 2015 Richard Hughes - 1.2.5-1 +- Update to 1.2.5 +- Resolves: #1174534 + +* Mon Oct 13 2014 Debarshi Ray - 0.16.2-11 - Fix a tracker-store crash -Resolves: #1083199 +- Resolves: #1083199 -* Mon Oct 13 2014 Debarshi Ray 0.16.2-10 +* Mon Oct 13 2014 Debarshi Ray - 0.16.2-10 - Update the tracker-miner-fs patch to cover another crash site -Resolves: #1096307 +- Resolves: #1096307 -* Thu Oct 02 2014 Debarshi Ray 0.16.2-9 +* Thu Oct 02 2014 Debarshi Ray - 0.16.2-9 - Fix a couple of tracker-miner-fs crashes -Resolves: #1096307 +- Resolves: #1096307 -* Fri Feb 28 2014 Matthias Clasen 0.16.2-8 +* Fri Feb 28 2014 Matthias Clasen - 0.16.2-8 - Rebuild -Resolves: #1070803 +- Resolves: #1070803 * Fri Jan 24 2014 Daniel Mach - 0.16.2-7 - Mass rebuild 2014-01-24