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

Update to 0.13.1

Browse Source
This commit is contained in:
Deji 2012-02-27 16:56:21 -05:00
parent 9eb0e75799
commit 82ed987776
5 changed files with 99 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
1ca82c48e79002df9f3a5487d5979513 tracker-0.12.10.tar.xz
ebad942d823bef9289f9f9860894f8b0 tracker-0.13.1.tar.xz

135
tracker-libemail.patch → tracker-0.13.1-libemail.patch
View File

@ -1,7 +1,8 @@
diff -up tracker-0.12.10/configure.ac.libemail tracker-0.12.10/configure.ac
--- tracker-0.12.10/configure.ac.libemail 2012-02-15 15:59:14.000000000 +0100
+++ tracker-0.12.10/configure.ac 2012-02-22 11:15:28.737903315 +0100
@@ -331,51 +331,76 @@ PKG_CHECK_MODULES(TRACKER_MINER_FS, [$TR
diff --git a/configure.ac b/configure.ac
index 2006f50..0abfcb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -332,51 +332,76 @@ PKG_CHECK_MODULES(TRACKER_MINER_FS, [$TRACKER_MINER_FS_REQUIRED])
TRACKER_MINER_FS_LIBS="$TRACKER_MINER_FS_LIBS -lz -lm"
# Check requirements for tracker-miner-evolution
@ -11,8 +12,7 @@ diff -up tracker-0.12.10/configure.ac.libemail tracker-0.12.10/configure.ac
- evolution-data-server-1.2 >= $EDS_REQUIRED
- camel-1.2 >= $CAMEL_REQUIRED"
+evolution_plugin_name=""
-PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_REQUIRED],
+
+# First test for 3_3_5
+TRACKER_MINER_EVOLUTION_3_3_5_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
+ evolution-shell-3.0 >= 3.1
@ -21,7 +21,8 @@ diff -up tracker-0.12.10/configure.ac.libemail tracker-0.12.10/configure.ac
+ libemail-engine
+ evolution-data-server-1.2 >= $EDS_REQUIRED
+ camel-1.2 >= $CAMEL_REQUIRED"
+
-PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_REQUIRED],
+PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_3_3_5_REQUIRED],
[have_tracker_miner_evolution=yes],
[have_tracker_miner_evolution=no])
@ -39,14 +40,11 @@ diff -up tracker-0.12.10/configure.ac.libemail tracker-0.12.10/configure.ac
- evolution-plugin-3.0
- evolution-data-server-1.2 >= $EDS_REQUIRED
- camel-1.2 >= $CAMEL_REQUIRED"
-
+fi
- PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_REQUIRED],
- [have_tracker_miner_evolution=yes],
- [have_tracker_miner_evolution=no])
+fi
- if test "x$have_tracker_miner_evolution" = "xyes"; then
- evolution_plugin_name="evolution-plugin-3.0"
+# Second test for 3_2
+TRACKER_MINER_EVOLUTION_3_2_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
+ evolution-shell-3.0 >= 3.1
@ -54,28 +52,27 @@ diff -up tracker-0.12.10/configure.ac.libemail tracker-0.12.10/configure.ac
+ evolution-data-server-1.2 >= $EDS_REQUIRED
+ camel-1.2 >= $CAMEL_REQUIRED"
- AC_DEFINE(EVOLUTION_SHELL_2_91, 1, [Use new evolution-shell API])
- else
- evolution_plugin_name="evolution-plugin"
- if test "x$have_tracker_miner_evolution" = "xyes"; then
- evolution_plugin_name="evolution-plugin-3.0"
+PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_3_2_REQUIRED],
+ [have_tracker_miner_evolution=yes],
+ [have_tracker_miner_evolution=no])
- AC_DEFINE(EVOLUTION_SHELL_2_91, 1, [Use new evolution-shell API])
- else
- evolution_plugin_name="evolution-plugin"
+if test -z "$evolution_plugin_name" && test "x$have_tracker_miner_evolution" = "xyes"; then
+ evolution_plugin_name="evolution-plugin-3.0"
+ AC_DEFINE(EVOLUTION_SHELL_3_2, 1, [Use new evolution-shell API])
+ AC_DEFINE(EVOLUTION_SHELL_2_91, 1, [Use new evolution-shell API])
+fi
- TRACKER_MINER_EVOLUTION_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
- evolution-shell >= $EVO_SHELL_REQUIRED
- evolution-plugin >= $EVO_REQUIRED
- evolution-data-server-1.2 >= $EDS_REQUIRED
- camel-1.2 >= $CAMEL_REQUIRED"
+ AC_DEFINE(EVOLUTION_SHELL_3_2, 1, [Use new evolution-shell API])
+ AC_DEFINE(EVOLUTION_SHELL_2_91, 1, [Use new evolution-shell API])
+fi
- PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_REQUIRED],
- [have_tracker_miner_evolution=yes],
- [have_tracker_miner_evolution=no])
+# Third test for 2_91
+TRACKER_MINER_EVOLUTION_2_91_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
+ evolution-shell-3.0
@ -83,11 +80,14 @@ diff -up tracker-0.12.10/configure.ac.libemail tracker-0.12.10/configure.ac
+ evolution-data-server-1.2 >= $EDS_REQUIRED
+ camel-1.2 >= $CAMEL_REQUIRED"
- fi
- PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_REQUIRED],
- [have_tracker_miner_evolution=yes],
- [have_tracker_miner_evolution=no])
+PKG_CHECK_MODULES(TRACKER_MINER_EVOLUTION, [$TRACKER_MINER_EVOLUTION_2_91_REQUIRED],
+ [have_tracker_miner_evolution=yes],
+ [have_tracker_miner_evolution=no])
+
- fi
+if test -z "$evolution_plugin_name" && test "x$have_tracker_miner_evolution" = "xyes"; then
+ evolution_plugin_name="evolution-plugin-3.0"
+ AC_DEFINE(EVOLUTION_SHELL_2_91, 1, [Use new evolution-shell API])
@ -109,7 +109,7 @@ diff -up tracker-0.12.10/configure.ac.libemail tracker-0.12.10/configure.ac
fi
# Check requirements for tracker-miner-thunderbird
@@ -1173,7 +1198,6 @@ else
@@ -1155,7 +1180,6 @@ else
fi
if test "x$have_tracker_miner_evolution" = "xyes"; then
@ -117,9 +117,10 @@ diff -up tracker-0.12.10/configure.ac.libemail tracker-0.12.10/configure.ac
AC_ARG_WITH([evolution_plugin_dir],
AS_HELP_STRING([--with-evolution-plugin-dir],
[path to Evolution plugin directory]))
diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libemail tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c
--- tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libemail 2012-02-15 11:41:48.000000000 +0100
+++ tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c 2012-02-22 11:22:12.705892062 +0100
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index fc9923a..9b11222 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -18,6 +18,7 @@
*
* Authors:
@ -144,8 +145,9 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
+#include <mail/em-utils.h>
#include <mail/e-mail.h>
-#endif
-
+#endif /* EVOLUTION_SHELL_3_2 */
+
+#ifdef EVOLUTION_SHELL_3_3_5
+#include <libemail-engine/e-mail-folder-utils.h>
+#include <libemail-engine/e-mail-session.h>
@ -174,7 +176,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
#include <libedataserver/e-account.h>
#include <libedataserver/e-account-list.h>
@@ -587,7 +600,7 @@ message_uri_build (CamelFolder *folder,
@@ -572,7 +585,7 @@ message_uri_build (CamelFolder *folder,
g_free (folder_uri);
return uri;
@ -183,7 +185,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
CamelURL *a_url, *url;
const gchar *path;
gchar *uri, *qry, *ppath;
@@ -620,7 +633,7 @@ message_uri_build (CamelFolder *folder,
@@ -605,7 +618,7 @@ message_uri_build (CamelFolder *folder,
camel_url_free (url);
return uri;
@ -192,7 +194,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
}
/* When new messages arrive to- or got deleted from the summary, called in
@@ -686,7 +699,11 @@ on_folder_summary_changed (CamelFolder
@@ -671,7 +684,11 @@ on_folder_summary_changed (CamelFolder *folder,
const CamelFlag *cflags;
gchar *full_sparql;
@ -204,7 +206,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
if (linfo) {
uid = (gchar *) camel_message_info_uid (linfo);
@@ -792,9 +809,9 @@ on_folder_summary_changed (CamelFolder
@@ -777,9 +794,9 @@ on_folder_summary_changed (CamelFolder *folder,
#ifdef EVOLUTION_SHELL_3_2
folder_name = camel_folder_get_display_name (folder);
@ -216,7 +218,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
if (folder_name && *folder_name) {
str = g_strdup_printf ("Updating E-mails for %s",
@@ -917,9 +934,9 @@ introduce_walk_folders_in_folder (Tracke
@@ -909,9 +926,9 @@ introduce_walk_folders_in_folder (TrackerMinerEvolution *self,
#ifdef EVOLUTION_SHELL_3_2
status = g_strdup_printf ("Processing folder %s", iter->display_name);
@ -228,7 +230,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
g_object_set (self, "progress", 0.01, "status", status, NULL);
ret = sqlite3_prepare_v2 (cdb_r->db, query, -1, &stmt, NULL);
@@ -1302,11 +1319,11 @@ get_last_deleted_time (TrackerMinerEvolu
@@ -1299,11 +1316,11 @@ get_last_deleted_time (TrackerMinerEvolution *self)
if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session),
#ifdef EVOLUTION_SHELL_3_2
account->uid))) {
@ -242,7 +244,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
continue;
}
@@ -1347,13 +1364,13 @@ register_on_get_folder (GObject *so
@@ -1344,13 +1361,13 @@ register_on_get_folder (GObject *source_object,
gpointer user_data)
{
CamelFolder *folder = camel_store_get_folder_finish (CAMEL_STORE (source_object), res, NULL);
@ -258,7 +260,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
GetFolderInfo *info = user_data;
gchar *account_uri = info->account_uri;
CamelFolderInfo *iter = info->iter;
@@ -1436,17 +1453,17 @@ register_walk_folders_in_folder (Tracker
@@ -1433,17 +1450,17 @@ register_walk_folders_in_folder (TrackerMinerEvolution *self,
NULL,
register_on_get_folder,
info);
@ -279,7 +281,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
if (iter->child) {
register_walk_folders_in_folder (self, iter->child,
@@ -1465,13 +1482,13 @@ unregister_on_get_folder (GObject *
@@ -1462,13 +1479,13 @@ unregister_on_get_folder (GObject *source_object,
gpointer user_data)
{
CamelFolder *folder = camel_store_get_folder_finish (CAMEL_STORE (source_object), res, NULL);
@ -295,7 +297,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
GetFolderInfo *info = user_data;
CamelFolderInfo *titer = info->iter;
TrackerMinerEvolution *self = info->self;
@@ -1533,17 +1550,17 @@ unregister_walk_folders_in_folder (Track
@@ -1532,17 +1549,17 @@ unregister_walk_folders_in_folder (TrackerMinerEvolution *self,
NULL,
unregister_on_get_folder,
info);
@ -316,7 +318,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
if (titer->child) {
unregister_walk_folders_in_folder (self, titer->child,
@@ -1643,13 +1660,13 @@ on_got_folderinfo_introduce (GObject
@@ -1642,13 +1659,13 @@ on_got_folderinfo_introduce (GObject *source_object,
{
CamelStore *store = CAMEL_STORE (source_object);
CamelFolderInfo *iter = camel_store_get_folder_info_finish (store, res, NULL);
@ -332,7 +334,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
TryAgainInfo *info = g_new0 (TryAgainInfo, 1);
/* Ownership of these is transfered in try_again */
@@ -1688,9 +1705,9 @@ on_got_folderinfo_introduce (CamelStore
@@ -1687,9 +1704,9 @@ on_got_folderinfo_introduce (CamelStore *store,
#ifdef EVOLUTION_SHELL_3_2
camel_store_free_folder_info (store, iter);
@ -344,7 +346,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
}
static void
@@ -1716,11 +1733,11 @@ introduce_account_to (TrackerMinerEvolut
@@ -1715,11 +1732,11 @@ introduce_account_to (TrackerMinerEvolution *self,
if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session),
#ifdef EVOLUTION_SHELL_3_2
account->uid))) {
@ -358,7 +360,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
return;
}
@@ -1749,11 +1766,13 @@ introduce_account_to (TrackerMinerEvolut
@@ -1748,13 +1765,13 @@ introduce_account_to (TrackerMinerEvolution *self,
NULL,
on_got_folderinfo_introduce,
intro_info);
@ -368,13 +370,14 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
-#endif
+#endif /* EVOLUTION_SHELL_3_2 */
+#ifndef EVOLUTION_SHELL_3_2
#ifndef EVOLUTION_SHELL_3_2
g_object_unref (store);
-#endif
+#endif /* EVOLUTION_SHELL_3_2 */
}
@@ -1960,13 +1979,13 @@ on_got_folderinfo_register (GObject
@@ -1961,13 +1978,13 @@ on_got_folderinfo_register (GObject *source_object,
{
CamelStore *store = CAMEL_STORE (source_object);
CamelFolderInfo *iter = camel_store_get_folder_info_finish (store, res, NULL);
@ -390,7 +393,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
RegisterInfo *reg_info = data;
TrackerMinerEvolution *self = reg_info->self;
TrackerMinerEvolutionPrivate *priv;
@@ -2025,9 +2044,9 @@ on_got_folderinfo_register (CamelStore
@@ -2026,9 +2043,9 @@ on_got_folderinfo_register (CamelStore *store,
#ifdef EVOLUTION_SHELL_3_2
camel_store_free_folder_info (store, iter);
@ -402,7 +405,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
}
static void
@@ -2054,11 +2073,11 @@ register_account (TrackerMinerEvolution
@@ -2055,11 +2072,11 @@ register_account (TrackerMinerEvolution *self,
if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session),
#ifdef EVOLUTION_SHELL_3_2
account->uid))) {
@ -416,17 +419,24 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
return;
}
@@ -2085,7 +2104,9 @@ register_account (TrackerMinerEvolution
@@ -2082,13 +2099,13 @@ register_account (TrackerMinerEvolution *self,
NULL,
on_got_folderinfo_register,
reg_info);
-#else
+#else /* EVOLUTION_SHELL_3_2 */
mail_get_folderinfo (store, NULL, on_got_folderinfo_register, reg_info);
#endif
-#endif
+#endif /* EVOLUTION_SHELL_3_2 */
+#ifndef EVOLUTION_SHELL_3_2
#ifndef EVOLUTION_SHELL_3_2
g_object_unref (store);
+#endif
-#endif
+#endif /* EVOLUTION_SHELL_3_2 */
}
#ifdef EVOLUTION_SHELL_3_2
@@ -2096,13 +2117,13 @@ on_got_folderinfo_unregister (GObject
@@ -2099,13 +2116,13 @@ on_got_folderinfo_unregister (GObject *source_object,
{
CamelStore *store = CAMEL_STORE (source_object);
CamelFolderInfo *titer = camel_store_get_folder_info_finish (store, res, NULL);
@ -442,7 +452,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
RegisterInfo *reg_info = data;
TrackerMinerEvolution *self = reg_info->self;
TrackerMinerEvolutionPrivate *priv;
@@ -2128,9 +2149,9 @@ on_got_folderinfo_unregister (CamelStore
@@ -2131,9 +2148,9 @@ on_got_folderinfo_unregister (CamelStore *store,
#ifdef EVOLUTION_SHELL_3_2
camel_store_free_folder_info (store, titer);
@ -454,7 +464,7 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
}
static void
@@ -2152,11 +2173,11 @@ unregister_account (TrackerMinerEvolutio
@@ -2155,11 +2172,11 @@ unregister_account (TrackerMinerEvolution *self,
if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session),
#ifdef EVOLUTION_SHELL_3_2
account->uid))) {
@ -468,17 +478,24 @@ diff -up tracker-0.12.10/src/plugins/evolution/tracker-evolution-plugin.c.libema
return;
}
@@ -2181,7 +2202,9 @@ unregister_account (TrackerMinerEvolutio
@@ -2180,13 +2197,13 @@ unregister_account (TrackerMinerEvolution *self,
NULL,
on_got_folderinfo_unregister,
reg_info);
-#else
+#else /* EVOLUTION_SHELL_3_2 */
mail_get_folderinfo (store, NULL, on_got_folderinfo_unregister, reg_info);
#endif
-#endif
+#endif /* EVOLUTION_SHELL_3_2 */
+#ifndef EVOLUTION_SHELL_3_2
#ifndef EVOLUTION_SHELL_3_2
g_object_unref (store);
+#endif
-#endif
+#endif /* EVOLUTION_SHELL_3_2 */
}
static void
@@ -2420,7 +2443,7 @@ tracker_miner_evolution_init (TrackerMin
@@ -2425,7 +2442,7 @@ tracker_miner_evolution_init (TrackerMinerEvolution *plugin)
shell_backend = e_shell_get_backend_by_name (shell, "mail");
session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend));
}

6
tracker-extract-pdf-crash-fix.patch
View File

@ -1,6 +1,6 @@
--- src/tracker-extract/tracker-extract-pdf.c 2011-11-25 09:50:33.000000000 -0500
+++ src/tracker-extract/tracker-extract-pdf.c.new 2011-12-13 22:56:51.251158179 -0500
@@ -338,7 +338,7 @@
--- src/tracker-extract/tracker-extract-pdf.c 2012-02-15 10:19:19.000000000 -0500
+++ src/tracker-extract/tracker-extract-pdf.c.new 2012-02-27 16:34:11.407153064 -0500
@@ -451,7 +451,7 @@
len = 0;
} else {
contents = (gchar *) mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);

77
tracker-fixdso.patch
View File

@ -1,77 +0,0 @@
--- src/libtracker-common/Makefile.in 2011-11-25 10:46:08.000000000 -0500
+++ src/libtracker-common/Makefile.in.new 2011-12-13 23:49:30.957656410 -0500
@@ -263,7 +263,7 @@
INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lgthread-2.0
LIBCUE_CFLAGS = @LIBCUE_CFLAGS@
LIBCUE_LIBS = @LIBCUE_LIBS@
LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
--- utils/mtp/Makefile.in 2011-12-16 11:35:41.000000000 -0500
+++ utils/mtp/Makefile.in.new 2012-01-27 01:46:36.028973691 -0500
@@ -203,7 +203,7 @@
INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lgthread-2.0
LIBCUE_CFLAGS = @LIBCUE_CFLAGS@
LIBCUE_LIBS = @LIBCUE_LIBS@
LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
--- tests/libtracker-common/Makefile.in 2011-12-16 11:35:39.000000000 -0500
+++ tests/libtracker-common/Makefile.in.new 2012-01-27 02:07:10.873536010 -0500
@@ -266,7 +266,7 @@
INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lgthread-2.0
LIBCUE_CFLAGS = @LIBCUE_CFLAGS@
LIBCUE_LIBS = @LIBCUE_LIBS@
LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
--- tests/libtracker-extract/Makefile.in 2011-12-16 11:35:40.000000000 -0500
+++ tests/libtracker-extract/Makefile.in.new 2012-01-27 09:06:42.828638342 -0500
@@ -288,7 +288,7 @@
INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lgthread-2.0
LIBCUE_CFLAGS = @LIBCUE_CFLAGS@
LIBCUE_LIBS = @LIBCUE_LIBS@
LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
--- tests/libtracker-sparql/Makefile.in 2011-12-16 11:35:40.000000000 -0500
+++ tests/libtracker-sparql/Makefile.in.new 2012-01-27 09:22:51.064533729 -0500
@@ -204,7 +204,7 @@
INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lgthread-2.0
LIBCUE_CFLAGS = @LIBCUE_CFLAGS@
LIBCUE_LIBS = @LIBCUE_LIBS@
LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
--- tests/libtracker-data/Makefile.in 2011-12-16 11:35:39.000000000 -0500
+++ tests/libtracker-data/Makefile.in.new 2012-01-27 09:24:34.725237792 -0500
@@ -299,7 +299,7 @@
INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lgthread-2.0
LIBCUE_CFLAGS = @LIBCUE_CFLAGS@
LIBCUE_LIBS = @LIBCUE_LIBS@
LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
--- tests/libtracker-miner/Makefile.in 2011-12-16 11:35:40.000000000 -0500
+++ tests/libtracker-miner/Makefile.in.new 2012-01-27 09:26:51.006534040 -0500
@@ -327,7 +327,7 @@
INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lgthread-2.0
LIBCUE_CFLAGS = @LIBCUE_CFLAGS@
LIBCUE_LIBS = @LIBCUE_LIBS@
LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@

34
tracker.spec
View File

@ -1,14 +1,13 @@
Summary: Desktop-neutral search tool and indexer
Name: tracker
Version: 0.12.10
Version: 0.13.1
Release: 1%{?dist}
License: GPLv2+
Group: Applications/System
URL: http://projects.gnome.org/tracker/
Source0: http://download.gnome.org/sources/tracker/0.12/%{name}-%{version}.tar.xz
Patch0: tracker-fixdso.patch
Patch1: tracker-extract-pdf-crash-fix.patch
Patch2: tracker-libemail.patch
Source0: http://download.gnome.org/sources/tracker/0.13/%{name}-%{version}.tar.xz
Patch0: tracker-extract-pdf-crash-fix.patch
Patch1: tracker-0.13.1-libemail.patch
BuildRequires: poppler-glib-devel evolution-devel libxml2-devel libgsf-devel
BuildRequires: libuuid-devel dbus-glib-devel
@ -20,6 +19,7 @@ BuildRequires: gstreamer-plugins-base-devel gstreamer-devel id3lib-devel
BuildRequires: totem-pl-parser-devel libvorbis-devel flac-devel enca-devel
BuildRequires: upower-devel gnome-keyring-devel NetworkManager-glib-devel
BuildRequires: libunistring-devel gupnp-dlna-devel taglib-devel rest-devel
BuildRequires: libosinfo-devel libcue-devel
BuildRequires: gdk-pixbuf2-devel
BuildRequires: desktop-file-utils intltool gettext
BuildRequires: gtk-doc graphviz dia
@ -91,9 +91,8 @@ This package contains the documentation for tracker
%prep
%setup -q
%patch0 -p0 -b .fixdso
%patch1 -p0
%patch2 -p1 -b .libemail
%patch0 -p0
%patch1 -p1 -b .libemail
%global evo_plugins_dir %(pkg-config evolution-plugin-3.0 --variable=plugindir)
@ -160,10 +159,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
%{_datadir}/tracker/
%{_datadir}/dbus-1/services/org.freedesktop.Tracker*
%{_libdir}/*.so.*
%{_libdir}/tracker-0.12/
%{_libdir}/girepository-1.0/Tracker-0.12.typelib
%{_libdir}/girepository-1.0/TrackerExtract-0.12.typelib
%{_libdir}/girepository-1.0/TrackerMiner-0.12.typelib
%{_libdir}/tracker-0.14/
%{_libdir}/girepository-1.0/Tracker-0.14.typelib
%{_libdir}/girepository-1.0/TrackerExtract-0.14.typelib
%{_libdir}/girepository-1.0/TrackerMiner-0.14.typelib
%{_mandir}/*/tracker*.gz
%{_sysconfdir}/ld.so.conf.d/tracker-%{_arch}.conf
%{_sysconfdir}/xdg/autostart/tracker*.desktop
@ -176,13 +175,13 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
%files devel
%defattr(-, root, root, -)
%{_includedir}/tracker-0.12/
%{_includedir}/tracker-0.14/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/vala/vapi/tracker*.*
%{_datadir}/gir-1.0/Tracker-0.12.gir
%{_datadir}/gir-1.0/TrackerExtract-0.12.gir
%{_datadir}/gir-1.0/TrackerMiner-0.12.gir
%{_datadir}/gir-1.0/Tracker-0.14.gir
%{_datadir}/gir-1.0/TrackerExtract-0.14.gir
%{_datadir}/gir-1.0/TrackerMiner-0.14.gir
%files ui-tools
%defattr(-, root, root, -)
@ -212,6 +211,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
%{_datadir}/gtk-doc/html/ontology/
%changelog
* Mon Feb 27 2012 Deji Akingunola <dakingun@gmail.com> - 0.13.1-1
- Update to 0.13.1
* Wed Feb 22 2012 Milan Crha <mcrha@redhat.com> - 0.12.10-1
- Update to 0.12.10
- Remove patch to remove g_thread_init() calls (fixed upstream)