diff --git a/.gitignore b/.gitignore index 4caa47e..e973836 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ tracker-0.8.13.tar.bz2 /tracker-0.8.16.tar.bz2 /tracker-0.9.24.tar.bz2 +/tracker-0.9.27.tar.bz2 diff --git a/sources b/sources index 762fea2..1f6a4e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97f419e9dbefc8d72017eb95e10b1fc6 tracker-0.9.24.tar.bz2 +b0338208e9a36a8b94c62cf9f9c2c784 tracker-0.9.27.tar.bz2 diff --git a/tracker-0.9-doc-build.patch b/tracker-0.9-doc-build.patch deleted file mode 100644 index 01959a7..0000000 --- a/tracker-0.9-doc-build.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- docs/tools/Makefile.am 2010-09-09 06:37:06.000000000 -0400 -+++ docs/tools/Makefile.am.new 2010-09-09 10:44:10.022458044 -0400 -@@ -23,9 +23,12 @@ - ontology_graph_LDADD = \ - $(top_builddir)/src/libtracker-data/libtracker-data.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ -- $(GLIB2_LIBS) -+ $(GLIB2_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-data/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - ttl2sgml_SOURCES = \ - ttl2sgml.c \ -@@ -41,8 +44,11 @@ - ttl2sgml_LDADD = \ - $(top_builddir)/src/libtracker-data/libtracker-data.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(DBUS_LIBS) \ - $(GLIB2_LIBS) \ -- $(GIO_LIBS) -+ $(GIO_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-data/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - EXTRA_DIST = gen-doc.sh ---- docs/tools/Makefile.in 2010-09-09 10:19:42.000000000 -0400 -+++ docs/tools/Makefile.in.new 2010-09-09 10:44:10.023458812 -0400 -@@ -394,9 +394,12 @@ - ontology_graph_LDADD = \ - $(top_builddir)/src/libtracker-data/libtracker-data.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ -- $(GLIB2_LIBS) -+ $(GLIB2_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-data/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - ttl2sgml_SOURCES = \ - ttl2sgml.c \ -@@ -412,9 +415,12 @@ - ttl2sgml_LDADD = \ - $(top_builddir)/src/libtracker-data/libtracker-data.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(DBUS_LIBS) \ - $(GLIB2_LIBS) \ -- $(GIO_LIBS) -+ $(GIO_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-data/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - EXTRA_DIST = gen-doc.sh - all: all-am ---- docs/reference/libtracker-client/Makefile.am 2010-04-15 06:14:08.000000000 -0400 -+++ docs/reference/libtracker-client/Makefile.am.new 2010-04-19 09:56:26.248325370 -0400 -@@ -40,7 +40,9 @@ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ -- $(GLIB2_LIBS) -+ $(GLIB2_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-client/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - - # Extra options to supply to gtkdoc-mkdb ---- docs/reference/libtracker-client/Makefile.in 2010-04-15 11:51:12.000000000 -0400 -+++ docs/reference/libtracker-client/Makefile.in.new 2010-04-19 09:57:14.958188757 -0400 -@@ -364,7 +364,9 @@ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ -- $(GLIB2_LIBS) -+ $(GLIB2_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-client/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - - # Extra options to supply to gtkdoc-mkdb ---- docs/reference/libtracker-extract/Makefile.am 2010-03-29 10:54:50.000000000 -0400 -+++ docs/reference/libtracker-extract/Makefile.am.new 2010-04-19 10:02:46.533447803 -0400 -@@ -34,7 +34,9 @@ - GTKDOC_LIBS = \ - $(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -- $(GLIB2_LIBS) -+ $(GLIB2_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-extract/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - - # Extra options to supply to gtkdoc-mkdb ---- docs/reference/libtracker-extract/Makefile.in 2010-04-15 11:51:12.000000000 -0400 -+++ docs/reference/libtracker-extract/Makefile.in.new 2010-04-19 10:03:29.565082879 -0400 -@@ -357,7 +357,9 @@ - GTKDOC_LIBS = \ - $(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -- $(GLIB2_LIBS) -+ $(GLIB2_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-extract/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - - # Extra options to supply to gtkdoc-mkdb ---- docs/reference/libtracker-miner/Makefile.am 2010-04-15 06:14:08.000000000 -0400 -+++ docs/reference/libtracker-miner/Makefile.am.new 2010-04-19 10:04:20.494435581 -0400 -@@ -50,7 +50,10 @@ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ -- $(GLIB2_LIBS) -+ $(GLIB2_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-miner/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - - # Extra options to supply to gtkdoc-mkdb ---- docs/reference/libtracker-miner/Makefile.in 2010-04-15 11:51:12.000000000 -0400 -+++ docs/reference/libtracker-miner/Makefile.in.new 2010-04-19 10:05:07.469082598 -0400 -@@ -374,7 +374,10 @@ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ -- $(GLIB2_LIBS) -+ $(GLIB2_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-miner/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - - # Extra options to supply to gtkdoc-mkdb ---- docs/reference/libtracker-sparql/Makefile.am 2010-09-09 06:37:06.000000000 -0400 -+++ docs/reference/libtracker-sparql/Makefile.am.new 2010-09-09 11:55:36.723180352 -0400 -@@ -38,7 +38,9 @@ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ -- $(GLIB2_LIBS) -+ $(GLIB2_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - - # Extra options to supply to gtkdoc-mkdb ---- docs/reference/libtracker-sparql/Makefile.in 2010-09-09 10:19:42.000000000 -0400 -+++ docs/reference/libtracker-sparql/Makefile.in.new 2010-09-09 11:59:35.941180003 -0400 -@@ -374,7 +374,9 @@ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ -- $(GLIB2_LIBS) -+ $(GLIB2_LIBS) \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \ -+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs - - - # Extra options to supply to gtkdoc-mkdb diff --git a/tracker-0.9-fedora-build-fixes.patch b/tracker-0.9-fedora-build-fixes.patch new file mode 100644 index 0000000..ade0041 --- /dev/null +++ b/tracker-0.9-fedora-build-fixes.patch @@ -0,0 +1,254 @@ +--- docs/tools/Makefile.am 2010-10-28 07:27:34.000000000 -0400 ++++ docs/tools/Makefile.am.new 2010-11-02 12:59:40.753879220 -0400 +@@ -11,7 +11,10 @@ + + LDADD = \ + $(top_builddir)/src/libtracker-data/libtracker-data.la \ +- $(LIBTRACKER_DATA_LIBS) ++ $(LIBTRACKER_DATA_LIBS) \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-data/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs + + ontology_graph_SOURCES = \ + ontology-graph.c +--- docs/tools/Makefile.in 2010-10-28 10:35:15.000000000 -0400 ++++ docs/tools/Makefile.in.new 2010-11-02 13:00:04.102002771 -0400 +@@ -402,7 +402,10 @@ + + LDADD = \ + $(top_builddir)/src/libtracker-data/libtracker-data.la \ +- $(LIBTRACKER_DATA_LIBS) ++ $(LIBTRACKER_DATA_LIBS) \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-data/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs + + ontology_graph_SOURCES = \ + ontology-graph.c +--- docs/reference/libtracker-client/Makefile.am 2010-10-28 07:27:34.000000000 -0400 ++++ docs/reference/libtracker-client/Makefile.am.new 2010-11-02 11:47:28.665908204 -0400 +@@ -36,7 +36,9 @@ + GTKDOC_LIBS = \ + $(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +- $(LIBTRACKER_CLIENT_LIBS) ++ $(LIBTRACKER_CLIENT_LIBS) \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-client/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs + + # Extra options to supply to gtkdoc-mkdb + MKDB_OPTIONS = --sgml-mode --output-format=xml +--- docs/reference/libtracker-client/Makefile.in 2010-10-28 10:35:14.000000000 -0400 ++++ docs/reference/libtracker-client/Makefile.in.new 2010-11-02 11:48:15.534239605 -0400 +@@ -395,7 +395,9 @@ + GTKDOC_LIBS = \ + $(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +- $(LIBTRACKER_CLIENT_LIBS) ++ $(LIBTRACKER_CLIENT_LIBS) \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-client/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs + + + # Extra options to supply to gtkdoc-mkdb +--- docs/reference/libtracker-extract/Makefile.am 2010-10-28 07:27:34.000000000 -0400 ++++ docs/reference/libtracker-extract/Makefile.am.new 2010-11-02 11:50:05.955109071 -0400 +@@ -34,7 +34,9 @@ + GTKDOC_LIBS = \ + $(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +- $(LIBTRACKER_EXTRACT_LIBS) ++ $(LIBTRACKER_EXTRACT_LIBS) \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-extract/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs + + # Extra options to supply to gtkdoc-mkdb + MKDB_OPTIONS = --sgml-mode --output-format=xml +--- docs/reference/libtracker-extract/Makefile.in 2010-10-28 10:35:14.000000000 -0400 ++++ docs/reference/libtracker-extract/Makefile.in.new 2010-11-02 11:50:37.982983703 -0400 +@@ -392,7 +392,9 @@ + GTKDOC_LIBS = \ + $(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +- $(LIBTRACKER_EXTRACT_LIBS) ++ $(LIBTRACKER_EXTRACT_LIBS) \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-extract/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs + + + # Extra options to supply to gtkdoc-mkdb +--- docs/reference/libtracker-miner/Makefile.am 2010-10-28 07:27:34.000000000 -0400 ++++ docs/reference/libtracker-miner/Makefile.am.new 2010-11-02 11:51:48.295232480 -0400 +@@ -46,7 +46,10 @@ + $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ + $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +- $(LIBTRACKER_MINER_LIBS) ++ $(LIBTRACKER_MINER_LIBS) \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-miner/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs + + # Extra options to supply to gtkdoc-mkdb + MKDB_OPTIONS=--sgml-mode --output-format=xml +--- docs/reference/libtracker-miner/Makefile.in 2010-10-28 10:35:15.000000000 -0400 ++++ docs/reference/libtracker-miner/Makefile.in.new 2010-11-02 11:52:25.652985450 -0400 +@@ -405,7 +405,10 @@ + $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ + $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +- $(LIBTRACKER_MINER_LIBS) ++ $(LIBTRACKER_MINER_LIBS) \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-miner/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs + + + # Extra options to supply to gtkdoc-mkdb +--- docs/reference/libtracker-sparql/Makefile.am 2010-10-28 07:27:34.000000000 -0400 ++++ docs/reference/libtracker-sparql/Makefile.am.new 2010-11-02 11:53:20.408982445 -0400 +@@ -34,7 +34,9 @@ + GTKDOC_LIBS = \ + $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +- $(LIBTRACKER_SPARQL_LIBS) ++ $(LIBTRACKER_SPARQL_LIBS) \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs + + # Extra options to supply to gtkdoc-mkdb + MKDB_OPTIONS = --sgml-mode --output-format=xml +--- docs/reference/libtracker-sparql/Makefile.in 2010-10-28 10:35:15.000000000 -0400 ++++ docs/reference/libtracker-sparql/Makefile.in.new 2010-11-02 11:53:49.041887950 -0400 +@@ -392,7 +392,9 @@ + GTKDOC_LIBS = \ + $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ +- $(LIBTRACKER_SPARQL_LIBS) ++ $(LIBTRACKER_SPARQL_LIBS) \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \ ++ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs + + + # Extra options to supply to gtkdoc-mkdb +--- utils/services/Makefile.am 2010-10-28 07:27:34.000000000 -0400 ++++ utils/services/Makefile.am.new 2010-11-02 13:42:30.907233528 -0400 +@@ -12,6 +12,7 @@ + LDADD = \ + $(top_builddir)/src/libtracker-data/libtracker-data.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ ++ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_DATA_LIBS) + +--- utils/services/Makefile.in 2010-10-28 10:35:24.000000000 -0400 ++++ utils/services/Makefile.in.new 2010-11-02 13:42:54.921982795 -0400 +@@ -404,6 +404,7 @@ + LDADD = \ + $(top_builddir)/src/libtracker-data/libtracker-data.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ ++ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_DATA_LIBS) + +--- tests/libtracker-client/Makefile.am 2010-10-28 07:27:34.000000000 -0400 ++++ tests/libtracker-client/Makefile.am.new 2010-11-02 13:56:19.094236462 -0400 +@@ -13,6 +13,7 @@ + + LDADD = \ + $(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \ ++ $(top_builddir)/src/libtracker-common/libtracker-common.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_CLIENT_LIBS) + +--- tests/libtracker-client/Makefile.in 2010-10-28 10:35:21.000000000 -0400 ++++ tests/libtracker-client/Makefile.in.new 2010-11-02 13:56:43.708234437 -0400 +@@ -394,6 +394,7 @@ + + LDADD = \ + $(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \ ++ $(top_builddir)/src/libtracker-common/libtracker-common.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_CLIENT_LIBS) + +--- tests/libtracker-data/Makefile.am 2010-10-28 07:27:34.000000000 -0400 ++++ tests/libtracker-data/Makefile.am.new 2010-11-02 13:59:25.166864064 -0400 +@@ -45,6 +45,7 @@ + LDADD = \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ + $(top_builddir)/src/libtracker-data/libtracker-data.la \ ++ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(top_builddir)/tests/common/libtracker-testcommon.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_DATA_LIBS) +--- tests/libtracker-data/Makefile.in 2010-10-28 10:35:21.000000000 -0400 ++++ tests/libtracker-data/Makefile.in.new 2010-11-02 13:59:57.944983215 -0400 +@@ -522,6 +522,7 @@ + LDADD = \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ + $(top_builddir)/src/libtracker-data/libtracker-data.la \ ++ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(top_builddir)/tests/common/libtracker-testcommon.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_DATA_LIBS) +--- tests/libtracker-fts/Makefile.am 2010-10-28 07:27:34.000000000 -0400 ++++ tests/libtracker-fts/Makefile.am.new 2010-11-02 14:02:54.721996904 -0400 +@@ -24,6 +24,7 @@ + LDADD = \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ + $(top_builddir)/src/libtracker-data/libtracker-data.la \ ++ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(top_builddir)/tests/common/libtracker-testcommon.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_FTS_LIBS) +--- tests/libtracker-fts/Makefile.in 2010-10-28 10:35:23.000000000 -0400 ++++ tests/libtracker-fts/Makefile.in.new 2010-11-02 14:03:15.048983075 -0400 +@@ -461,6 +461,7 @@ + LDADD = \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ + $(top_builddir)/src/libtracker-data/libtracker-data.la \ ++ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(top_builddir)/tests/common/libtracker-testcommon.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_FTS_LIBS) +--- tests/libtracker-extract/Makefile.am 2010-10-28 07:27:34.000000000 -0400 ++++ tests/libtracker-extract/Makefile.am.new 2010-11-02 14:31:14.829982167 -0400 +@@ -17,6 +17,7 @@ + $(top_builddir)/tests/common/libtracker-testcommon.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ + $(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \ ++ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_EXTRACT_LIBS) + +--- tests/libtracker-extract/Makefile.in 2010-10-28 10:35:23.000000000 -0400 ++++ tests/libtracker-extract/Makefile.in.new 2010-11-02 14:31:45.803860572 -0400 +@@ -409,6 +409,7 @@ + $(top_builddir)/tests/common/libtracker-testcommon.la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ + $(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \ ++ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_EXTRACT_LIBS) + +--- tests/functional-tests/ipc/Makefile.am 2010-10-28 07:27:34.000000000 -0400 ++++ tests/functional-tests/ipc/Makefile.am.new 2010-11-02 17:08:41.752878801 -0400 +@@ -21,6 +21,7 @@ + $(top_builddir)/src/libtracker-bus/libtracker-bus.la \ + $(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ ++ $(top_builddir)/src/libtracker-data/libtracker-data.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_SPARQL_LIBS) + +--- tests/functional-tests/ipc/Makefile.in 2010-10-28 10:35:19.000000000 -0400 ++++ tests/functional-tests/ipc/Makefile.in.new 2010-11-02 17:09:12.009858547 -0400 +@@ -488,6 +488,7 @@ + $(top_builddir)/src/libtracker-bus/libtracker-bus.la \ + $(top_builddir)/src/libtracker-sparql/libtracker-sparql-$(TRACKER_API_VERSION).la \ + $(top_builddir)/src/libtracker-common/libtracker-common.la \ ++ $(top_builddir)/src/libtracker-data/libtracker-data.la \ + $(BUILD_LIBS) \ + $(LIBTRACKER_SPARQL_LIBS) + diff --git a/tracker-build-fix.patch b/tracker-build-fix.patch deleted file mode 100644 index ca5bd76..0000000 --- a/tracker-build-fix.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- src/tracker-store/Makefile.am 2010-08-19 12:12:34.000000000 -0400 -+++ src/tracker-store/Makefile.am.new 2010-08-27 10:50:06.330393972 -0400 -@@ -67,6 +67,7 @@ - $(plugin_libs) \ - $(top_builddir)/src/libtracker-data/libtracker-data.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(SQLITE3_LIBS) \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ ---- src/tracker-store/Makefile.in 2010-08-26 12:11:20.000000000 -0400 -+++ src/tracker-store/Makefile.in.new 2010-08-27 10:49:58.636167543 -0400 -@@ -432,6 +432,7 @@ - $(plugin_libs) \ - $(top_builddir)/src/libtracker-data/libtracker-data.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(SQLITE3_LIBS) \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ ---- src/tracker-status-icon/Makefile.am 2010-08-19 12:12:34.000000000 -0400 -+++ src/tracker-status-icon/Makefile.am.new 2010-08-27 11:49:55.511265601 -0400 -@@ -18,6 +18,7 @@ - # Note: the -lX11 is needed for XGetModifierMapping() and other X11 calls - tracker_status_icon_LDADD = \ - $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(TRACKER_APPS_LIBS) \ - $(PANGO_LIBS) \ ---- src/tracker-status-icon/Makefile.in 2010-08-26 12:11:20.000000000 -0400 -+++ src/tracker-status-icon/Makefile.in.new 2010-08-27 11:50:22.409182561 -0400 -@@ -411,6 +411,7 @@ - # Note: the -lX11 is needed for XGetModifierMapping() and other X11 calls - tracker_status_icon_LDADD = \ - $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(TRACKER_APPS_LIBS) \ - $(PANGO_LIBS) \ ---- src/tracker-search-bar/Makefile.am 2010-08-18 11:24:42.000000000 -0400 -+++ src/tracker-search-bar/Makefile.am.new 2010-08-27 12:37:22.262163283 -0400 -@@ -26,6 +26,7 @@ - - tracker_search_bar_LDADD = \ - $(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \ -+ $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(TRACKER_APPS_LIBS) \ - $(TRACKER_APPLETS_LIBS) \ - $(GDKPIXBUF_LIBS) \ ---- src/tracker-search-bar/Makefile.in 2010-08-26 12:11:20.000000000 -0400 -+++ src/tracker-search-bar/Makefile.in.new 2010-08-27 12:39:13.383515566 -0400 -@@ -423,6 +423,7 @@ - - tracker_search_bar_LDADD = \ - $(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \ -+ $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(TRACKER_APPS_LIBS) \ - $(TRACKER_APPLETS_LIBS) \ - $(GDKPIXBUF_LIBS) \ ---- utils/services/Makefile.am 2010-09-09 06:37:07.000000000 -0400 -+++ utils/services/Makefile.am.new 2010-09-09 13:04:54.568431854 -0400 -@@ -22,6 +22,7 @@ - ontology_validator_LDADD = \ - $(top_builddir)/src/libtracker-data/libtracker-data.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ - $(GLIB2_LIBS) -@@ -32,6 +33,7 @@ - data_validator_LDADD = \ - $(top_builddir)/src/libtracker-data/libtracker-data.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(DBUS_LIBS) \ - $(GLIB2_LIBS) \ - $(GIO_LIBS) ---- utils/services/Makefile.in 2010-09-09 10:19:51.000000000 -0400 -+++ utils/services/Makefile.in.new 2010-09-09 13:05:28.104243559 -0400 -@@ -394,6 +394,7 @@ - ontology_validator_LDADD = \ - $(top_builddir)/src/libtracker-data/libtracker-data.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(DBUS_LIBS) \ - $(GIO_LIBS) \ - $(GLIB2_LIBS) -@@ -404,6 +405,7 @@ - data_validator_LDADD = \ - $(top_builddir)/src/libtracker-data/libtracker-data.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(DBUS_LIBS) \ - $(GLIB2_LIBS) \ - $(GIO_LIBS) ---- examples/libtracker-miner/Makefile.am 2010-08-18 11:24:42.000000000 -0400 -+++ examples/libtracker-miner/Makefile.am.new 2010-09-09 13:48:33.440304951 -0400 -@@ -23,6 +23,7 @@ - tracker_miner_test_LDADD = \ - $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ - $(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(DBUS_LIBS) \ - $(GMODULE_LIBS) \ ---- examples/libtracker-miner/Makefile.in 2010-09-09 10:19:43.000000000 -0400 -+++ examples/libtracker-miner/Makefile.in.new 2010-09-09 13:49:15.929180352 -0400 -@@ -388,6 +388,7 @@ - tracker_miner_test_LDADD = \ - $(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \ - $(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \ -+ $(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \ - $(top_builddir)/src/libtracker-common/libtracker-common.la \ - $(DBUS_LIBS) \ - $(GMODULE_LIBS) \ diff --git a/tracker-evo-build-fix.patch b/tracker-evo-build-fix.patch new file mode 100644 index 0000000..f5787ed --- /dev/null +++ b/tracker-evo-build-fix.patch @@ -0,0 +1,132 @@ +--- src/plugins/evolution/tracker-evolution-plugin.c 2010-10-11 08:23:14.000000000 -0400 ++++ src/plugins/evolution/tracker-evolution-plugin.c.new 2010-10-22 15:52:48.327177285 -0400 +@@ -46,9 +46,10 @@ + #endif + + #include +-#include ++#include + #include + #include ++#include + + #include + +@@ -1271,6 +1272,7 @@ + + for (it = e_list_get_iterator (E_LIST (priv->accounts)); e_iterator_is_valid (it); e_iterator_next (it)) { + EAccount *account = (EAccount *) e_iterator_get (it); ++ EMailSession *session; + CamelProvider *provider; + CamelStore *store; + char *uri; +@@ -1291,7 +1293,7 @@ + continue; + } + +- if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) { ++ if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session), uri, CAMEL_PROVIDER_STORE, NULL))) { + continue; + } + +@@ -1382,6 +1384,14 @@ + CamelStore *store, + gchar *account_uri) + { ++ EShell *shell; ++ EShellBackend *shell_backend; ++ EMailSession *session; ++ ++ shell = e_shell_get_default (); ++ shell_backend = e_shell_get_backend_by_name (shell, "mail"); ++ session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend)); ++ + TrackerEvolutionPluginPrivate *priv = TRACKER_EVOLUTION_PLUGIN_GET_PRIVATE (self); + + if (!priv->registered_folders) { +@@ -1408,7 +1418,8 @@ + /* This is asynchronous and hooked to the mail/ API, so nicely + * integrated with the Evolution UI application */ + +- mail_get_folder (iter->uri, 0, register_on_get_folder, info, ++ mail_get_folder (session, iter->uri, 0, ++ register_on_get_folder, info, + mail_msg_unordered_push); + + if (iter->child) { +@@ -1466,6 +1477,14 @@ + CamelStore *store, + gchar *account_uri) + { ++ EShell *shell; ++ EShellBackend *shell_backend; ++ EMailSession *session; ++ ++ shell = e_shell_get_default (); ++ shell_backend = e_shell_get_backend_by_name (shell, "mail"); ++ session = e_mail_backend_get_session (E_MAIL_BACKEND (shell_backend)); ++ + /* Recursively walks all the folders in store */ + + while (titer) { +@@ -1478,7 +1497,8 @@ + /* This is asynchronous and hooked to the mail/ API, so nicely + * integrated with the Evolution UI application */ + +- mail_get_folder (titer->uri, 0, unregister_on_get_folder, info, ++ mail_get_folder (session, titer->uri, 0, ++ unregister_on_get_folder, info, + mail_msg_unordered_push); + + if (titer->child) { +@@ -1635,6 +1655,7 @@ + EAccount *account, + ClientRegistry *info) + { ++ EMailSession *session; + CamelProvider *provider; + CamelStore *store; + char *uri, *account_uri, *ptr; +@@ -1650,7 +1671,7 @@ + if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE)) + return; + +- if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) { ++ if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session), uri, CAMEL_PROVIDER_STORE, NULL))) { + return; + } + +@@ -1969,6 +1990,7 @@ + register_account (TrackerEvolutionPlugin *self, + EAccount *account) + { ++ EMailSession *session; + CamelProvider *provider; + CamelStore *store; + char *uri; +@@ -1984,7 +2006,7 @@ + if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE)) + return; + +- if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) { ++ if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session), uri, CAMEL_PROVIDER_STORE, NULL))) { + return; + } + +@@ -2040,6 +2062,7 @@ + unregister_account (TrackerEvolutionPlugin *self, + EAccount *account) + { ++ EMailSession *session; + CamelProvider *provider; + CamelStore *store; + char *uri = account->source->url; +@@ -2053,7 +2076,7 @@ + if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE)) + return; + +- if (!(store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL))) { ++ if (!(store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session), uri, CAMEL_PROVIDER_STORE, NULL))) { + return; + } + diff --git a/tracker.spec b/tracker.spec index d0781b2..d46dafa 100644 --- a/tracker.spec +++ b/tracker.spec @@ -1,20 +1,20 @@ Summary: Desktop-neutral search tool and indexer Name: tracker -Version: 0.9.24 -Release: 2%{?dist} +Version: 0.9.27 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: http://projects.gnome.org/tracker/ Source0: http://ftp.gnome.org/pub/GNOME/sources/tracker/0.9/%{name}-%{version}.tar.bz2 -Patch0: tracker-0.9-doc-build.patch -Patch1: tracker-build-fix.patch +Patch0: tracker-0.9-fedora-build-fixes.patch +Patch1: tracker-evo-build-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: poppler-devel evolution-devel libxml2-devel libgsf-devel BuildRequires: libuuid-devel libnotify-devel dbus-devel BuildRequires: gnome-desktop-devel nautilus-devel gnome-panel-devel BuildRequires: libjpeg-devel libexif-devel exempi-devel raptor-devel BuildRequires: libiptcdata-devel libtiff-devel libpng-devel giflib-devel -BuildRequires: sqlite-devel vala-devel libgee-devel pygtk2-devel +BuildRequires: sqlite-devel vala-devel libgee-devel pygtk2-devel qt4-devel 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 @@ -82,8 +82,8 @@ This package contains the documentation for tracker %build %configure --disable-static --enable-tracker-search-bar \ - --enable-gtk-doc --disable-functional-tests --disable-unit-tests -# Disable the unit tests for now, because of build issues. + --enable-gtk-doc --disable-functional-tests +# Disable the functional tests for now, they make use of python bytecodes. # Disable rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -182,6 +182,9 @@ fi %{_datadir}/gtk-doc/html/ontology/ %changelog +* Sun Nov 07 2010 Deji Akingunola - 0.9.27-1 +- Update to 0.9.27 + * Tue Oct 12 2010 Deji Akingunola - 0.9.24-2 - Rebuild for evolution-data-server-2.91.0.