From 34a8f8b1de4bfa8fab4206db06bb8b97128327c81815f911722efbad85654a83 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Mar 2013 22:39:15 +0000 Subject: [PATCH] Accepting request 159151 from GNOME:Next Fix build against giflib 5 OBS-URL: https://build.opensuse.org/request/show/159151 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/tracker?expand=0&rev=28 --- tracker-0.14.4-giflib5.patch | 94 +++++++ tracker-0.14.4.tar.xz | 3 - tracker-0.15.4.tar.xz | 3 + tracker-evo-implicit.patch | 12 - tracker-extras.changes | 109 ++++++++ tracker-extras.spec | 147 +++++------ tracker-fix-include-sched-idle.patch | 10 - tracker-libgrss-0.5.patch | 380 --------------------------- tracker-removeable-media-off.patch | 13 - tracker.changes | 109 ++++++++ tracker.spec | 147 +++++------ 11 files changed, 449 insertions(+), 578 deletions(-) create mode 100644 tracker-0.14.4-giflib5.patch delete mode 100644 tracker-0.14.4.tar.xz create mode 100644 tracker-0.15.4.tar.xz delete mode 100644 tracker-evo-implicit.patch delete mode 100644 tracker-fix-include-sched-idle.patch delete mode 100644 tracker-libgrss-0.5.patch delete mode 100644 tracker-removeable-media-off.patch diff --git a/tracker-0.14.4-giflib5.patch b/tracker-0.14.4-giflib5.patch new file mode 100644 index 0000000..bb68378 --- /dev/null +++ b/tracker-0.14.4-giflib5.patch @@ -0,0 +1,94 @@ +diff --git a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c +index ce69ed4..e0d1e88 100644 +--- a/src/tracker-extract/tracker-extract-gif.c ++++ b/src/tracker-extract/tracker-extract-gif.c +@@ -75,6 +75,18 @@ ext_block_append(ExtBlock *extBlock, + return (GIF_OK); + } + ++#if GIFLIB_MAJOR >= 5 ++static void ++gif_error(int err) ++{ ++ const char * Err = GifErrorString(err); ++ if (Err != NULL) ++ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err); ++ else ++ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", err); ++} ++#endif ++ + static void + read_metadata (TrackerSparqlBuilder *preupdate, + TrackerSparqlBuilder *metadata, +@@ -100,14 +112,22 @@ read_metadata (TrackerSparqlBuilder *preupdate, + ExtBlock extBlock; + + if (DGifGetRecordType(gifFile, &RecordType) == GIF_ERROR) { ++#if GIFLIB_MAJOR < 5 + PrintGifError(); ++#else ++ gif_error(gifFile->Error); ++#endif + return; + } + + switch (RecordType) { + case IMAGE_DESC_RECORD_TYPE: + if (DGifGetImageDesc(gifFile) == GIF_ERROR) { ++#if GIFLIB_MAJOR < 5 + PrintGifError(); ++#else ++ gif_error(gifFile->Error); ++#endif + return; + } + +@@ -117,7 +137,11 @@ read_metadata (TrackerSparqlBuilder *preupdate, + framedata = g_malloc (framewidth*frameheight); + + if (DGifGetLine(gifFile, framedata, framewidth*frameheight)==GIF_ERROR) { ++#if GIFLIB_MAJOR < 5 + PrintGifError(); ++#else ++ gif_error(gifFile->Error); ++#endif + return; + } + +@@ -593,6 +617,9 @@ tracker_extract_get_metadata (TrackerExtractInfo *info) + gchar *filename, *uri; + GFile *file; + int fd; ++#if GIFLIB_MAJOR >= 5 ++ int err; ++#endif + + preupdate = tracker_extract_info_get_preupdate_builder (info); + metadata = tracker_extract_info_get_metadata_builder (info); +@@ -617,8 +644,13 @@ tracker_extract_get_metadata (TrackerExtractInfo *info) + return FALSE; + } + ++#if GIFLIB_MAJOR < 5 + if ((gifFile = DGifOpenFileHandle (fd)) == NULL) { + PrintGifError (); ++#else ++ if ((gifFile = DGifOpenFileHandle (fd, &err)) == NULL) { ++ gif_error(err); ++#endif + close (fd); + return FALSE; + } +@@ -639,7 +671,11 @@ tracker_extract_get_metadata (TrackerExtractInfo *info) + g_free (uri); + + if (DGifCloseFile (gifFile) != GIF_OK) { ++#if GIFLIB_MAJOR < 5 + PrintGifError (); ++#else ++ gif_error(gifFile->Error); ++#endif + } + + return TRUE; diff --git a/tracker-0.14.4.tar.xz b/tracker-0.14.4.tar.xz deleted file mode 100644 index 46a3914..0000000 --- a/tracker-0.14.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b818ee42b9007a94b2f8046edc4706bb2036187d5fd304e7ae23e5d2fcf85918 -size 5946796 diff --git a/tracker-0.15.4.tar.xz b/tracker-0.15.4.tar.xz new file mode 100644 index 0000000..a53f989 --- /dev/null +++ b/tracker-0.15.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32828209cd5c331aea310df938c3051b7616f637bbfeefedad58db46b0122875 +size 5990952 diff --git a/tracker-evo-implicit.patch b/tracker-evo-implicit.patch deleted file mode 100644 index 0543e3f..0000000 --- a/tracker-evo-implicit.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: tracker-0.14.1/src/plugins/evolution/tracker-evolution-plugin.c -=================================================================== ---- tracker-0.14.1.orig/src/plugins/evolution/tracker-evolution-plugin.c -+++ tracker-0.14.1/src/plugins/evolution/tracker-evolution-plugin.c -@@ -51,6 +51,7 @@ - #include - #include - #include -+#include - #elif defined(EVOLUTION_SHELL_3_2) - #include - #include diff --git a/tracker-extras.changes b/tracker-extras.changes index 8b9d570..fb7d708 100644 --- a/tracker-extras.changes +++ b/tracker-extras.changes @@ -1,3 +1,112 @@ +------------------------------------------------------------------- +Wed Mar 13 13:07:18 UTC 2013 - dimstar@opensuse.org + +- Add tracker-0.14.4-giflib5.patch: Fix build with giflib 5.0.x. + +------------------------------------------------------------------- +Wed Mar 13 07:57:02 UTC 2013 - dimstar@opensuse.org + +- Update to version 0.15.4: + + Build fixes: + - Fixed various compiler warnings. + - Fixed various introspection warnings. + - Switched out all uses of deprecated GStaticMutex for GMutex. + + Bugs fixed: bgo#643388. + + Updated translations. + +------------------------------------------------------------------- +Sat Mar 9 12:05:26 UTC 2013 - dimstar@opensuse.org + +- Update to version 0.15.3: + + build: + - Require GLib 2.35.1 for GTask API (was 2.28.0) + - Remove all cases of g_type_init() now it's deprecated in + GLib 2.35.x + + libtracker-common: Don't log to file by default, only + stdout/stderr. See TRACKER_USE_LOG_FILES env var for details. + + libtracker-miner: + - Fixed nasty stack corruption with TrackerIndexingTree filter + rules. + - Fixed vala bindings for TrackerMinerFS. + + tracker-extract-msoffice: Avoid deprecated + gsf_msole_metadata_read() API. + + tracker-search: + - Added snippets for result hits. + - Added colored output for result hits. + + Bugs fixed: bgo#693889, bgo#694146, bgo#693198, bgo#693198, + bg##694783, bgo#695157. + + Updated translations. +- Drop tracker-nonvoid.patch: fixed upstream. + +------------------------------------------------------------------- +Fri Feb 15 13:45:26 UTC 2013 - dimstar@opensuse.org + +- Update to version 0.15.2: + + Build: Required SQLite 3.7.9 (was 3.7.0) for FTS4 support + + New Features: + - Full Text Search (FTS) v4 support. + - Snippets provide context around a matched query. + - Offsets provide an index where a matched query is found in + context. + + Ontology: Deprecated tracker:fulltextNoLimit and removed use in + all other ontologies. + + libtracker-fts: Removed tracker_fts_config_min_word_length() + and config option. + + libtracker-miner: Fixed GNOME password provider, libsecret + expects "user" not "username". + + tracker-info: Fixed memory leaks. + + Bugs fixed: bgo#691847, bgo#692409, bgo#692603. +- Add tracker-nonvoid.patch: Fix non-void function not having a + return statement. + +------------------------------------------------------------------- +Sat Feb 9 20:35:25 UTC 2013 - dimstar@opensuse.org + +- Update to version 0.15.1: + + build: Fixes build error when supplying nautilis extensions + directory + + bgo#691807: Tracker should build against libgee 0.8 + + bgo#691804: tracker-cue-sheet not ported to Gstreamer 1.0 + + bgo#679870: libsecret migrations + + bgo#690170: Add nfo:MediaList type to .m3u playlist files + + bgo#692210: miner-manager: plug some memleaks + + libtracker-common: Add replacement function for flock() on + Solaris + + libtracker-miner: Fix libsecret password provider get call + using non-NULL GError + + tracker-miner-fs, store: Add MeeGo keys to desktop file. + + Updated translations. + +------------------------------------------------------------------- +Sat Feb 9 19:47:20 UTC 2013 - dimstar@opensuse.org + +- Update to version 0.15.0: + + Port to GStreamer 1.0 / gupnp-dlna-1.1. + + New Feature: Support GKqueueDirectoryMonitor API on BSD systems +- Drop tracker-libgrss-0.5.patch: fixed upstream. +- Drop tracker-fix-include-sched-idle.patch and + tracker-removeable-media-off.patch: they are outdated and were + only applied for openSUSE <= 11.4. +- Drop libtool BuildRequries: no longer needed. + +------------------------------------------------------------------- +Sat Feb 9 18:37:55 UTC 2013 - badshah400@gmail.com + +- Update to version 0.14.5: + + build: Fixes --with-nautilus-extensions-dir which was broken. + + bgo#692409: playlist extractor should index playlist title if + available. + + bgo#692603: Search can not find pdf files using author names. + + bgo#691807: Tracker should build against libgee 0.8. + + bgo#690170: Add nfo:MediaList type to .m3u playlist files. + + bgo#688287: build: don't build-depend on Dia. + + bgo#692210: miner-manager: plug some memleaks. + + bgo#688371: add support for GKqueueDirectoryMonitor. + + libtracker-common: Add replacement function for flock() on + Solaris + + tracker-miner-fs, store: Add MeeGo keys to desktop files + (OnlyShowIn, X-Meego-Priority keys). + ------------------------------------------------------------------- Mon Nov 5 08:53:45 UTC 2012 - dimstar@opensuse.org diff --git a/tracker-extras.spec b/tracker-extras.spec index 76d29bc..e087b97 100644 --- a/tracker-extras.spec +++ b/tracker-extras.spec @@ -1,7 +1,7 @@ # # spec file for package tracker-extras # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Luis Medinas, Portugal # # All modifications and additions to the file contributed by third parties @@ -49,28 +49,24 @@ # Do not edit this auto generated file! Edit tracker.spec. Name: tracker-extras %define _name tracker -Version: 0.14.4 +Version: 0.15.4 Release: 0 +%define TrackerAPI 0.16 +%define RPMTrackerAPI 0_16 Summary: Powerful object database, tag/metadata database, search tool and indexer License: GPL-2.0+ Group: Productivity/Other Url: http://projects.gnome.org/tracker/ -Source0: http://download.gnome.org/sources/tracker/0.14/%{_name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/tracker/0.15/%{_name}-%{version}.tar.xz Source1: README.SUSE.flickr Source2: README.SUSE.rss -# PATCH-FIX-OPENSUSE tracker-removeable-media-off.patch bgo622288 badshah400@gmail.com -- Disable indexing on removable media by default. This is only needed for 11.4 and earlier, as 12.1 and later have proper default values in GSettings. -Patch1: tracker-removeable-media-off.patch -# PATCH-FIX-OPENSUSE tracker-fix-include-sched-idle.patch malcolmlewis@opensuse.org -- Add linux/sched.h to includes for 11.4 only for the location of SCHED_IDLE. This is only needed for 11.4 and earlier. -Patch2: tracker-fix-include-sched-idle.patch -# PATCH-FIX-UPSTREAM tracker-libgrss-0.5.patch bgo#671751 dimstar@opensuse.org -- Support and Require libgrss-0.5 -Patch3: tracker-libgrss-0.5.patch -# PATCH-FIX-UPSTREAM tracker-evo-implicit.patch bgo#675413 dimstar@opensuse.org -- Include email-backend.h; fixes brp checks. -Patch4: tracker-evo-implicit.patch +# PATCH-FIX-UPSTREAM tracker-0.14.4-giflib5.patch bgo#695769 dimstar@opensuse.org -- Fix build with giglib 5.0.x +Patch0: tracker-0.14.4-giflib5.patch BuildRequires: NetworkManager-devel >= 0.8 BuildRequires: enca-devel BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: glib2-devel >= 2.28.0 +BuildRequires: glib2-devel >= 2.35.1 BuildRequires: gobject-introspection-devel BuildRequires: intltool %if 0%{?suse_version} >= 1130 @@ -80,18 +76,16 @@ BuildRequires: gnome-keyring-devel %endif # Not guarded by !%%{build_extras}, else we build files to have external generic # media players -BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.31 +BuildRequires: gstreamer-plugins-base-devel >= 0.10.31 BuildRequires: libicu-devel -# Needed for patch3 -BuildRequires: libtool BuildRequires: libupower-glib-devel BuildRequires: libuuid-devel -BuildRequires: sqlite3-devel +BuildRequires: sqlite3-devel >= 3.7.9 BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: vala >= 0.12.0 BuildRequires: zlib-devel -BuildRequires: pkgconfig(gee-1.0) +BuildRequires: pkgconfig(gee-0.8) %if !%{build_extras} # Dependencies for extractors / writeback BuildRequires: flac-devel @@ -101,7 +95,7 @@ BuildRequires: libexif-devel BuildRequires: libgsf-devel BuildRequires: libosinfo-devel >= 0.0.2 %if 0%{?suse_version} >= 1140 -BuildRequires: libgupnp-dlna-devel >= 0.5 +BuildRequires: libgupnp-dlna-devel >= 0.9.4 %endif BuildRequires: libexempi-devel BuildRequires: libgxps-devel @@ -139,7 +133,7 @@ BuildRequires: gtk3-devel BuildRequires: pkgconfig(rest-0.7) >= 0.6 %endif %if %{build_miner_rss} -BuildRequires: libgrss-devel +BuildRequires: libgrss-devel >= 0.5 %endif %if %{build_nautilus} BuildRequires: pkgconfig(libnautilus-extension) @@ -188,26 +182,26 @@ This package contains a miner to index files and applications. # name across multiple versions of tracker). # Yet, different libtracker-miner-* packages require their explicit # version of libtracker-common.so.0 as they link is done using rpath. -%package -n libtracker-common-0_14-0 +%package -n libtracker-common-%{RPMTrackerAPI}-0 Summary: Conveniance libraries for Tracker Group: System/Libraries -%description -n libtracker-common-0_14-0 +%description -n libtracker-common-%{RPMTrackerAPI}-0 Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. This package contains private conveniance libraries for the various tracker libraries. -%package -n libtracker-extract-0_14-0 +%package -n libtracker-extract-%{RPMTrackerAPI}-0 Summary: Extract library for Tracker Group: System/Libraries # rpm autodetects libtracker-common.so.0() symbol, which is provided by all versions of libtracker-common, so we need to help with an explicit Requires. -Requires: libtracker-common-0_14-0 +Requires: libtracker-common-%{RPMTrackerAPI}-0 Recommends: %{_name} %glib2_gsettings_schema_requires -%description -n libtracker-extract-0_14-0 +%description -n libtracker-extract-%{RPMTrackerAPI}-0 Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -222,14 +216,14 @@ including context linking and audit trails for a file object. It has the ability to index, store, harvest metadata, retrieve and search all types of files and other first class objects. -%package -n libtracker-miner-0_14-0 +%package -n libtracker-miner-%{RPMTrackerAPI}-0 Summary: Miner library for Tracker Group: System/Libraries # rpm autodetects libtracker-common.so.0() symbol, which is provided by all versions of libtracker-common, so we need to help with an explicit Requires. -Requires: libtracker-common-0_14-0 +Requires: libtracker-common-%{RPMTrackerAPI}-0 Recommends: %{_name} -%description -n libtracker-miner-0_14-0 +%description -n libtracker-miner-%{RPMTrackerAPI}-0 Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -244,11 +238,11 @@ including context linking and audit trails for a file object. It has the ability to index, store, harvest metadata, retrieve and search all types of files and other first class objects. -%package -n typelib-1_0-Tracker-0_14 +%package -n typelib-1_0-Tracker-%{RPMTrackerAPI} Summary: Sparql library for Tracker -- Introspection bindings Group: System/Libraries -%description -n typelib-1_0-Tracker-0_14 +%description -n typelib-1_0-Tracker-%{RPMTrackerAPI} Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -266,11 +260,11 @@ and search all types of files and other first class objects. This package provides the GObject Introspection bindings for the sparql library for Tracker. -%package -n typelib-1_0-TrackerExtract-0_14 +%package -n typelib-1_0-TrackerExtract-%{RPMTrackerAPI} Summary: Extract library for Tracker -- Introspection bindings Group: System/Libraries -%description -n typelib-1_0-TrackerExtract-0_14 +%description -n typelib-1_0-TrackerExtract-%{RPMTrackerAPI} Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -288,11 +282,11 @@ and search all types of files and other first class objects. This package provides the GObject Introspection bindings for the extract library for Tracker. -%package -n typelib-1_0-TrackerMiner-0_14 +%package -n typelib-1_0-TrackerMiner-%{RPMTrackerAPI} Summary: Miner library for Tracker -- Introspection bindings Group: System/Libraries -%description -n typelib-1_0-TrackerMiner-0_14 +%description -n typelib-1_0-TrackerMiner-%{RPMTrackerAPI} Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -310,14 +304,14 @@ and search all types of files and other first class objects. This package provides the GObject Introspection bindings for the miner library for Tracker. -%package -n libtracker-sparql-0_14-0 +%package -n libtracker-sparql-%{RPMTrackerAPI}-0 Summary: Sparql library for Tracker Group: System/Libraries # rpm autodetects libtracker-common.so.0() symbol, which is provided by all versions of libtracker-common, so we need to help with an explicit Requires. -Requires: libtracker-common-0_14-0 +Requires: libtracker-common-%{RPMTrackerAPI}-0 Recommends: %{_name} -%description -n libtracker-sparql-0_14-0 +%description -n libtracker-sparql-%{RPMTrackerAPI}-0 Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -335,12 +329,12 @@ and search all types of files and other first class objects. %package -n tracker-devel Summary: Tracker -- Development files Group: Development/Libraries/GNOME -Requires: libtracker-extract-0_14-0 = %{version} -Requires: libtracker-miner-0_14-0 = %{version} -Requires: libtracker-sparql-0_14-0 = %{version} -Requires: typelib-1_0-Tracker-0_14 = %{version} -Requires: typelib-1_0-TrackerExtract-0_14 = %{version} -Requires: typelib-1_0-TrackerMiner-0_14 = %{version} +Requires: libtracker-extract-%{RPMTrackerAPI}-0 = %{version} +Requires: libtracker-miner-%{RPMTrackerAPI}-0 = %{version} +Requires: libtracker-sparql-%{RPMTrackerAPI}-0 = %{version} +Requires: typelib-1_0-Tracker-%{RPMTrackerAPI} = %{version} +Requires: typelib-1_0-TrackerExtract-%{RPMTrackerAPI} = %{version} +Requires: typelib-1_0-TrackerMiner-%{RPMTrackerAPI} = %{version} %description -n tracker-devel Tracker is a powerful desktop-neutral first class object @@ -515,19 +509,12 @@ This package contains an nautilus plugin to tag files with Tracker. %prep %setup -q -n %{_name}-%{version} -translation-update-upstream -%if 0%{?suse_version} <= 1140 -%patch1 -p1 -%patch2 -%endif -%patch3 -p1 -%patch4 -p1 +%patch0 -p1 +#translation-update-upstream cp %{S:1} src/miners/flickr/README.SUSE cp %{S:2} src/miners/rss/README.SUSE %build -# Needed for patch3 -AUTOPOINT='intltoolize --automake --copy' autoreconf --verbose --force --install %configure \ %if !%{build_extras} --enable-libvorbis \ @@ -602,13 +589,13 @@ rm %{buildroot}%{_datadir}/icons/hicolor/*/apps/tracker.* # tracker-extras build can put icons in there without having to worry mkdir -p %{buildroot}%{_datadir}/tracker/icons/ -%fdupes %{buildroot}%{_datadir}/gtk-doc/html/ +#fdupes %{buildroot}%{_datadir}/gtk-doc/html/ %fdupes %{buildroot}%{_datadir}/vala/ %else ## Extras build: remove files from main, miner-files, devel, lang and lib subpackages -for file in `rpm -ql tracker tracker-devel tracker-miner-files libtracker-extract-0_14-0 libtracker-miner-0_14-0 libtracker-sparql-0_14-0 typelib-1_0-Tracker-0_14 typelib-1_0-TrackerExtract-0_14 typelib-1_0-TrackerMiner-0_14 libtracker-common-0_14-0`; do +for file in `rpm -ql tracker tracker-devel tracker-miner-files libtracker-extract-%{RPMTrackerAPI}-0 libtracker-miner-%{RPMTrackerAPI}-0 libtracker-sparql-%{RPMTrackerAPI}-0 typelib-1_0-Tracker-%{RPMTrackerAPI} typelib-1_0-TrackerExtract-%{RPMTrackerAPI} typelib-1_0-TrackerMiner-%{RPMTrackerAPI} libtracker-common-%{RPMTrackerAPI}-0`; do # do not remove directories (might contain files we want); -f to not fail if # file doesn't exist test ! -d %{buildroot}${file} && rm -f %{buildroot}${file} @@ -658,21 +645,21 @@ rm -rf %{buildroot} %postun -n %{_name}-miner-files %glib2_gsettings_schema_postun -%post -n libtracker-extract-0_14-0 +%post -n libtracker-extract-%{RPMTrackerAPI}-0 %glib2_gsettings_schema_post /sbin/ldconfig -%postun -n libtracker-extract-0_14-0 +%postun -n libtracker-extract-%{RPMTrackerAPI}-0 %glib2_gsettings_schema_postun /sbin/ldconfig -%post -n libtracker-miner-0_14-0 -p /sbin/ldconfig +%post -n libtracker-miner-%{RPMTrackerAPI}-0 -p /sbin/ldconfig -%postun -n libtracker-miner-0_14-0 -p /sbin/ldconfig +%postun -n libtracker-miner-%{RPMTrackerAPI}-0 -p /sbin/ldconfig -%post -n libtracker-sparql-0_14-0 -p /sbin/ldconfig +%post -n libtracker-sparql-%{RPMTrackerAPI}-0 -p /sbin/ldconfig -%postun -n libtracker-sparql-0_14-0 -p /sbin/ldconfig +%postun -n libtracker-sparql-%{RPMTrackerAPI}-0 -p /sbin/ldconfig %endif # !build_extras %if %{build_gui} @@ -715,9 +702,9 @@ rm -rf %{buildroot} %{_libexecdir}/tracker-extract %{_libexecdir}/tracker-store %{_libexecdir}/tracker-writeback -%dir %{_libdir}/tracker-0.14/ -%{_libdir}/tracker-0.14/extract-modules/ -%{_libdir}/tracker-0.14/writeback-modules/ +%dir %{_libdir}/tracker-%{TrackerAPI}/ +%{_libdir}/tracker-%{TrackerAPI}/extract-modules/ +%{_libdir}/tracker-%{TrackerAPI}/writeback-modules/ %{_datadir}/tracker/ %{_datadir}/dbus-1/services/org.freedesktop.Tracker1.Extract.service %{_datadir}/dbus-1/services/org.freedesktop.Tracker1.Writeback.service @@ -772,45 +759,45 @@ rm -rf %{buildroot} %{_datadir}/tracker/miners/tracker-miner-files.desktop %{_mandir}/man1/tracker-miner-fs.1%{ext_man} -%files -n libtracker-common-0_14-0 +%files -n libtracker-common-%{RPMTrackerAPI}-0 %defattr(-,root,root) -%{_libdir}/tracker-0.14/libtracker-common.so.* -%{_libdir}/tracker-0.14/libtracker-data.so.* +%{_libdir}/tracker-%{TrackerAPI}/libtracker-common.so.* +%{_libdir}/tracker-%{TrackerAPI}/libtracker-data.so.* -%files -n libtracker-extract-0_14-0 +%files -n libtracker-extract-%{RPMTrackerAPI}-0 %defattr(-,root,root) %{_libdir}/libtracker-extract*.so.* %{_datadir}/glib-2.0/schemas/org.freedesktop.Tracker.Extract.gschema.xml -%files -n libtracker-miner-0_14-0 +%files -n libtracker-miner-%{RPMTrackerAPI}-0 %defattr(-,root,root) %{_libdir}/libtracker-miner*.so.* -%files -n libtracker-sparql-0_14-0 +%files -n libtracker-sparql-%{RPMTrackerAPI}-0 %defattr(-, root, root) %{_libdir}/libtracker-sparql*.so.* -%files -n typelib-1_0-Tracker-0_14 +%files -n typelib-1_0-Tracker-%{RPMTrackerAPI} %defattr(-,root,root) -%{_libdir}/girepository-1.0/Tracker-0.14.typelib +%{_libdir}/girepository-1.0/Tracker-%{TrackerAPI}.typelib -%files -n typelib-1_0-TrackerExtract-0_14 +%files -n typelib-1_0-TrackerExtract-%{RPMTrackerAPI} %defattr(-,root,root) -%{_libdir}/girepository-1.0/TrackerExtract-0.14.typelib +%{_libdir}/girepository-1.0/TrackerExtract-%{TrackerAPI}.typelib -%files -n typelib-1_0-TrackerMiner-0_14 +%files -n typelib-1_0-TrackerMiner-%{RPMTrackerAPI} %defattr(-,root,root) -%{_libdir}/girepository-1.0/TrackerMiner-0.14.typelib +%{_libdir}/girepository-1.0/TrackerMiner-%{TrackerAPI}.typelib %files -n tracker-devel %defattr(-,root,root) %{_libdir}/lib*.so -%{_includedir}/tracker-0.14/ -%{_libdir}/tracker-0.14/libtracker-common.so -%{_libdir}/tracker-0.14/libtracker-data.so -%{_libdir}/pkgconfig/tracker-extract-0.14.pc -%{_libdir}/pkgconfig/tracker-miner-0.14.pc -%{_libdir}/pkgconfig/tracker-sparql-0.14.pc +%{_includedir}/tracker-%{TrackerAPI}/ +%{_libdir}/tracker-%{TrackerAPI}/libtracker-common.so +%{_libdir}/tracker-%{TrackerAPI}/libtracker-data.so +%{_libdir}/pkgconfig/tracker-extract-%{TrackerAPI}.pc +%{_libdir}/pkgconfig/tracker-miner-%{TrackerAPI}.pc +%{_libdir}/pkgconfig/tracker-sparql-%{TrackerAPI}.pc %{_datadir}/gir-1.0/*.gir %{_datadir}/gtk-doc/html/libtracker-miner/ %{_datadir}/gtk-doc/html/libtracker-extract/ diff --git a/tracker-fix-include-sched-idle.patch b/tracker-fix-include-sched-idle.patch deleted file mode 100644 index 108ad86..0000000 --- a/tracker-fix-include-sched-idle.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/libtracker-common/tracker-sched.c 2011-10-06 08:07:14.000000000 -0500 -+++ src/libtracker-common/tracker-sched.c.orig 2011-10-13 16:43:03.000000000 -0500 -@@ -26,6 +26,7 @@ - #endif - - #include -+#include - #include - - #include diff --git a/tracker-libgrss-0.5.patch b/tracker-libgrss-0.5.patch deleted file mode 100644 index 8b477c5..0000000 --- a/tracker-libgrss-0.5.patch +++ /dev/null @@ -1,380 +0,0 @@ -From d78c684bc16cb845869303b34766003777d8cc39 Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Fri, 9 Mar 2012 22:05:26 +0100 -Subject: [PATCH] Support and require libgrss-0.5 (Bug #671751) - ---- - configure.ac | 4 +- - src/miners/rss/tracker-miner-rss.c | 96 ++++++++++++++++++------------------ - 2 files changed, 50 insertions(+), 50 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 30c8253..927b4b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -189,7 +189,7 @@ LIBSTREAMANALYZER_REQUIRED=0.7.0 - GEE_REQUIRED=0.3 - TAGLIB_REQUIRED=1.6 - GNOME_KEYRING_REQUIRED=2.26 --LIBGRSS_REQUIRED=0.3 -+LIBGRSS_REQUIRED=0.5 - REST_REQUIRED=0.6 - NETWORK_MANAGER_REQUIRED=0.8 - GSTREAMER_REQUIRED=0.10.31 -@@ -434,7 +434,7 @@ fi - - # Check requirements for tracker-miner-rss - TRACKER_MINER_RSS_REQUIRED="glib-2.0 >= $GLIB_REQUIRED -- libgrss-0 >= $LIBGRSS_REQUIRED" -+ libgrss-0.5 >= $LIBGRSS_REQUIRED" - - PKG_CHECK_MODULES(TRACKER_MINER_RSS, [$TRACKER_MINER_RSS_REQUIRED], - [have_tracker_miner_rss=yes], -diff --git a/src/miners/rss/tracker-miner-rss.c b/src/miners/rss/tracker-miner-rss.c -index 5d32634..e36084a 100644 ---- a/src/miners/rss/tracker-miner-rss.c -+++ b/src/miners/rss/tracker-miner-rss.c -@@ -39,7 +39,7 @@ struct _TrackerMinerRSSPrivate { - gboolean stopped; - gchar *last_status; - -- FeedsPool *pool; -+ GrssFeedsPool *pool; - gint now_fetching; - GDBusConnection *connection; - guint graph_updated_id; -@@ -50,14 +50,14 @@ struct _TrackerMinerRSSPrivate { - - typedef struct { - TrackerMinerRSS *miner; -- FeedChannel *channel; -+ GrssFeedChannel *channel; - gint timeout_id; - GCancellable *cancellable; - } FeedChannelUpdateData; - - typedef struct { - TrackerMinerRSS *miner; -- FeedItem *item; -+ GrssFeedItem *item; - GCancellable *cancellable; - } FeedItemInsertData; - -@@ -76,14 +76,14 @@ static void retrieve_and_schedule_feeds (TrackerMinerRSS *mine - static gboolean feed_channel_changed_timeout_cb (gpointer user_data); - static void feed_channel_update_data_free (FeedChannelUpdateData *fcud); - static void feed_item_insert_data_free (FeedItemInsertData *fiid); --static void feed_fetching_cb (FeedsPool *pool, -- FeedChannel *feed, -+static void feed_fetching_cb (GrssFeedsPool *pool, -+ GrssFeedChannel *feed, - gpointer user_data); --static void feed_ready_cb (FeedsPool *pool, -- FeedChannel *feed, -+static void feed_ready_cb (GrssFeedsPool *pool, -+ GrssFeedChannel *feed, - GList *items, - gpointer user_data); --static const gchar *get_message_url (FeedItem *item); -+static const gchar *get_message_url (GrssFeedItem *item); - - G_DEFINE_TYPE (TrackerMinerRSS, tracker_miner_rss, TRACKER_TYPE_MINER) - -@@ -150,7 +150,7 @@ tracker_miner_rss_init (TrackerMinerRSS *object) - NULL, - (GDestroyNotify) feed_channel_update_data_free); - -- priv->pool = feeds_pool_new (); -+ priv->pool = grss_feeds_pool_new (); - g_signal_connect (priv->pool, "feed-fetching", G_CALLBACK (feed_fetching_cb), object); - g_signal_connect (priv->pool, "feed-ready", G_CALLBACK (feed_ready_cb), object); - priv->now_fetching = 0; -@@ -193,7 +193,7 @@ graph_updated_cb (GDBusConnection *connection, - - static FeedChannelUpdateData * - feed_channel_update_data_new (TrackerMinerRSS *miner, -- FeedChannel *channel) -+ GrssFeedChannel *channel) - { - FeedChannelUpdateData *fcud; - -@@ -235,7 +235,7 @@ feed_channel_update_data_free (FeedChannelUpdateData *fcud) - - static FeedItemInsertData * - feed_item_insert_data_new (TrackerMinerRSS *miner, -- FeedItem *item) -+ GrssFeedItem *item) - { - FeedItemInsertData *fiid; - -@@ -305,7 +305,7 @@ feed_channel_changed_timeout_cb (gpointer user_data) - now = time (NULL); - uri = g_object_get_data (G_OBJECT (fcud->channel), "subject"); - -- g_message ("Updating mfo:updatedTime for channel '%s'", feed_channel_get_title (fcud->channel)); -+ g_message ("Updating mfo:updatedTime for channel '%s'", grss_feed_channel_get_title (fcud->channel)); - - /* I hope there will be soon a SPARQL command to just update a - * value instead to delete and re-insert it -@@ -344,13 +344,13 @@ static void - feed_channel_change_updated_time (FeedItemInsertData *fiid) - { - TrackerMinerRSSPrivate *priv; -- FeedChannel *channel; -+ GrssFeedChannel *channel; - FeedChannelUpdateData *fcud; - - priv = TRACKER_MINER_RSS_GET_PRIVATE (fiid->miner); - - /* Check we don't already have an update request for this channel */ -- channel = feed_item_get_parent (fiid->item); -+ channel = grss_feed_item_get_parent (fiid->item); - - fcud = g_hash_table_lookup (priv->channel_updates, channel); - if (fcud) { -@@ -371,9 +371,9 @@ feed_channel_change_updated_time (FeedItemInsertData *fiid) - } - - static void --feed_fetching_cb (FeedsPool *pool, -- FeedChannel *channel, -- gpointer user_data) -+feed_fetching_cb (GrssFeedsPool *pool, -+ GrssFeedChannel *channel, -+ gpointer user_data) - { - gint avail; - gdouble prog; -@@ -382,7 +382,7 @@ feed_fetching_cb (FeedsPool *pool, - - miner = TRACKER_MINER_RSS (user_data); - priv = TRACKER_MINER_RSS_GET_PRIVATE (miner); -- avail = feeds_pool_get_listened_num (priv->pool); -+ avail = grss_feeds_pool_get_listened_num (priv->pool); - - priv->now_fetching++; - -@@ -390,7 +390,7 @@ feed_fetching_cb (FeedsPool *pool, - priv->now_fetching = avail; - - g_message ("Fetching channel details, source:'%s' (in progress: %d/%d)", -- feed_channel_get_source (channel), -+ grss_feed_channel_get_source (channel), - priv->now_fetching, - avail); - -@@ -408,7 +408,7 @@ feed_item_insert_cb (GObject *source, - const gchar *title; - - fiid = user_data; -- title = feed_item_get_title (fiid->item); -+ title = grss_feed_item_get_title (fiid->item); - error = NULL; - - tracker_sparql_connection_update_finish (TRACKER_SPARQL_CONNECTION (source), result, &error); -@@ -441,7 +441,7 @@ feed_item_check_exists_cb (GObject *source_object, - TrackerSparqlCursor *cursor; - GError *error; - TrackerSparqlBuilder *sparql; -- FeedChannel *channel; -+ GrssFeedChannel *channel; - gboolean has_geolocation; - - fiid = user_data; -@@ -475,12 +475,12 @@ feed_item_check_exists_cb (GObject *source_object, - } - - url = get_message_url (fiid->item); -- channel = feed_item_get_parent (fiid->item); -+ channel = grss_feed_item_get_parent (fiid->item); - - str = tracker_sparql_cursor_get_string (cursor, 0, NULL); - if (str && g_ascii_strcasecmp (str, "true") == 0) { - g_message (" Item already exists '%s'", -- feed_item_get_title (fiid->item)); -+ grss_feed_item_get_title (fiid->item)); - - if (cursor) { - g_object_unref (cursor); -@@ -495,7 +495,7 @@ feed_item_check_exists_cb (GObject *source_object, - - sparql = tracker_sparql_builder_new_update (); - -- has_geolocation = feed_item_get_geo_point (fiid->item, &latitude, &longitude); -+ has_geolocation = grss_feed_item_get_geo_point (fiid->item, &latitude, &longitude); - tracker_sparql_builder_insert_open (sparql, NULL); - - if (has_geolocation) { -@@ -523,7 +523,7 @@ feed_item_check_exists_cb (GObject *source_object, - tracker_sparql_builder_object (sparql, "_:location"); - } - -- tmp_string = feed_item_get_title (fiid->item); -+ tmp_string = grss_feed_item_get_title (fiid->item); - if (tmp_string != NULL) { - g_message (" Title:'%s'", tmp_string); - -@@ -531,7 +531,7 @@ feed_item_check_exists_cb (GObject *source_object, - tracker_sparql_builder_object_unvalidated (sparql, tmp_string); - } - -- tmp_string = feed_item_get_description (fiid->item); -+ tmp_string = grss_feed_item_get_description (fiid->item); - if (tmp_string != NULL) { - tracker_sparql_builder_predicate (sparql, "nie:plainTextContent"); - tracker_sparql_builder_object_unvalidated (sparql, tmp_string); -@@ -553,7 +553,7 @@ feed_item_check_exists_cb (GObject *source_object, - tracker_sparql_builder_predicate (sparql, "mfo:downloadedTime"); - tracker_sparql_builder_object_date (sparql, &t); - -- t = feed_item_get_publish_time (fiid->item); -+ t = grss_feed_item_get_publish_time (fiid->item); - tracker_sparql_builder_predicate (sparql, "nie:contentCreated"); - tracker_sparql_builder_object_date (sparql, &t); - -@@ -579,16 +579,16 @@ feed_item_check_exists_cb (GObject *source_object, - - static void - feed_item_check_exists (TrackerMinerRSS *miner, -- FeedItem *item) -+ GrssFeedItem *item) - { - FeedItemInsertData *fiid; -- FeedChannel *feed; -+ GrssFeedChannel *feed; - gchar *query; - gchar *communication_channel; - const gchar *url; - - url = get_message_url (item); -- feed = feed_item_get_parent (item); -+ feed = grss_feed_item_get_parent (item); - communication_channel = g_object_get_data (G_OBJECT (feed), "subject"); - - query = g_strdup_printf ("ASK {" -@@ -610,10 +610,10 @@ feed_item_check_exists (TrackerMinerRSS *miner, - } - - static void --feed_ready_cb (FeedsPool *pool, -- FeedChannel *channel, -- GList *items, -- gpointer user_data) -+feed_ready_cb (GrssFeedsPool *pool, -+ GrssFeedChannel *channel, -+ GList *items, -+ gpointer user_data) - { - TrackerMinerRSS *miner; - TrackerMinerRSSPrivate *priv; -@@ -636,10 +636,10 @@ feed_ready_cb (FeedsPool *pool, - } - - g_message ("Verifying channel:'%s' is up to date", -- feed_channel_get_title (channel)); -+ grss_feed_channel_get_title (channel)); - - for (iter = items; iter; iter = iter->next) { -- FeedItem *item = iter->data; -+ GrssFeedItem *item = iter->data; - - feed_item_check_exists (miner, item); - } -@@ -654,7 +654,7 @@ feeds_retrieve_cb (GObject *source_object, - TrackerSparqlCursor *cursor; - GError *error = NULL; - TrackerMinerRSSPrivate *priv; -- FeedChannel *chan; -+ GrssFeedChannel *chan; - gint count; - - cursor = tracker_sparql_connection_query_finish (TRACKER_SPARQL_CONNECTION (source_object), -@@ -691,12 +691,12 @@ feeds_retrieve_cb (GObject *source_object, - interval = tracker_sparql_cursor_get_string (cursor, 2, NULL); - subject = tracker_sparql_cursor_get_string (cursor, 3, NULL); - -- chan = feed_channel_new (); -+ chan = grss_feed_channel_new (); - g_object_set_data_full (G_OBJECT (chan), - "subject", - g_strdup (subject), - g_free); -- feed_channel_set_source (chan, g_strdup (source)); -+ grss_feed_channel_set_source (chan, g_strdup (source)); - - /* TODO How to manage feeds with an update mfo:updateInterval == 0 ? - * Here the interval is forced to be at least 1 minute, but perhaps those -@@ -705,7 +705,7 @@ feeds_retrieve_cb (GObject *source_object, - mins = strtoull (interval, NULL, 10); - if (mins <= 0) - mins = 1; -- feed_channel_set_update_interval (chan, mins); -+ grss_feed_channel_set_update_interval (chan, mins); - - g_message (" '%s' (%s) - update interval of %s minutes", - title, -@@ -720,7 +720,7 @@ feeds_retrieve_cb (GObject *source_object, - } - - priv = TRACKER_MINER_RSS_GET_PRIVATE (user_data); -- feeds_pool_listen (priv->pool, channels); -+ grss_feeds_pool_listen (priv->pool, channels); - - g_object_unref (cursor); - -@@ -753,13 +753,13 @@ retrieve_and_schedule_feeds (TrackerMinerRSS *miner) - } - - static const gchar * --get_message_url (FeedItem *item) -+get_message_url (GrssFeedItem *item) - { - const gchar *url; - -- feed_item_get_real_source (item, &url, NULL); -+ grss_feed_item_get_real_source (item, &url, NULL); - if (url == NULL) -- url = feed_item_get_source (item); -+ url = grss_feed_item_get_source (item); - return url; - } - -@@ -772,7 +772,7 @@ miner_started (TrackerMiner *miner) - - priv = TRACKER_MINER_RSS_GET_PRIVATE (miner); - retrieve_and_schedule_feeds (TRACKER_MINER_RSS (miner)); -- feeds_pool_switch (priv->pool, TRUE); -+ grss_feeds_pool_switch (priv->pool, TRUE); - } - - static void -@@ -781,7 +781,7 @@ miner_stopped (TrackerMiner *miner) - TrackerMinerRSSPrivate *priv; - - priv = TRACKER_MINER_RSS_GET_PRIVATE (miner); -- feeds_pool_switch (priv->pool, FALSE); -+ grss_feeds_pool_switch (priv->pool, FALSE); - g_object_set (miner, "progress", 1.0, "status", "Idle", NULL); - } - -@@ -791,7 +791,7 @@ miner_paused (TrackerMiner *miner) - TrackerMinerRSSPrivate *priv; - - priv = TRACKER_MINER_RSS_GET_PRIVATE (miner); -- feeds_pool_switch (priv->pool, FALSE); -+ grss_feeds_pool_switch (priv->pool, FALSE); - - /* Save last status */ - g_free (priv->last_status); -@@ -807,7 +807,7 @@ miner_resumed (TrackerMiner *miner) - TrackerMinerRSSPrivate *priv; - - priv = TRACKER_MINER_RSS_GET_PRIVATE (miner); -- feeds_pool_switch (priv->pool, TRUE); -+ grss_feeds_pool_switch (priv->pool, TRUE); - - /* Resume */ - g_object_set (miner, "status", priv->last_status ? priv->last_status : "Idle", NULL); --- -1.7.9.2 - diff --git a/tracker-removeable-media-off.patch b/tracker-removeable-media-off.patch deleted file mode 100644 index eb1dac6..0000000 --- a/tracker-removeable-media-off.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tracker-0.9.19/src/miners/fs/tracker-config.c -=================================================================== ---- tracker-0.9.19.orig/src/miners/fs/tracker-config.c -+++ tracker-0.9.19/src/miners/fs/tracker-config.c -@@ -44,7 +44,7 @@ - #define DEFAULT_INITIAL_SLEEP 15 /* 0->1000 */ - #define DEFAULT_ENABLE_MONITORS TRUE - #define DEFAULT_THROTTLE 0 /* 0->20 */ --#define DEFAULT_INDEX_REMOVABLE_DEVICES TRUE -+#define DEFAULT_INDEX_REMOVABLE_DEVICES FALSE - #define DEFAULT_INDEX_OPTICAL_DISCS FALSE - #define DEFAULT_INDEX_ON_BATTERY FALSE - #define DEFAULT_INDEX_ON_BATTERY_FIRST_TIME TRUE diff --git a/tracker.changes b/tracker.changes index 8b9d570..fb7d708 100644 --- a/tracker.changes +++ b/tracker.changes @@ -1,3 +1,112 @@ +------------------------------------------------------------------- +Wed Mar 13 13:07:18 UTC 2013 - dimstar@opensuse.org + +- Add tracker-0.14.4-giflib5.patch: Fix build with giflib 5.0.x. + +------------------------------------------------------------------- +Wed Mar 13 07:57:02 UTC 2013 - dimstar@opensuse.org + +- Update to version 0.15.4: + + Build fixes: + - Fixed various compiler warnings. + - Fixed various introspection warnings. + - Switched out all uses of deprecated GStaticMutex for GMutex. + + Bugs fixed: bgo#643388. + + Updated translations. + +------------------------------------------------------------------- +Sat Mar 9 12:05:26 UTC 2013 - dimstar@opensuse.org + +- Update to version 0.15.3: + + build: + - Require GLib 2.35.1 for GTask API (was 2.28.0) + - Remove all cases of g_type_init() now it's deprecated in + GLib 2.35.x + + libtracker-common: Don't log to file by default, only + stdout/stderr. See TRACKER_USE_LOG_FILES env var for details. + + libtracker-miner: + - Fixed nasty stack corruption with TrackerIndexingTree filter + rules. + - Fixed vala bindings for TrackerMinerFS. + + tracker-extract-msoffice: Avoid deprecated + gsf_msole_metadata_read() API. + + tracker-search: + - Added snippets for result hits. + - Added colored output for result hits. + + Bugs fixed: bgo#693889, bgo#694146, bgo#693198, bgo#693198, + bg##694783, bgo#695157. + + Updated translations. +- Drop tracker-nonvoid.patch: fixed upstream. + +------------------------------------------------------------------- +Fri Feb 15 13:45:26 UTC 2013 - dimstar@opensuse.org + +- Update to version 0.15.2: + + Build: Required SQLite 3.7.9 (was 3.7.0) for FTS4 support + + New Features: + - Full Text Search (FTS) v4 support. + - Snippets provide context around a matched query. + - Offsets provide an index where a matched query is found in + context. + + Ontology: Deprecated tracker:fulltextNoLimit and removed use in + all other ontologies. + + libtracker-fts: Removed tracker_fts_config_min_word_length() + and config option. + + libtracker-miner: Fixed GNOME password provider, libsecret + expects "user" not "username". + + tracker-info: Fixed memory leaks. + + Bugs fixed: bgo#691847, bgo#692409, bgo#692603. +- Add tracker-nonvoid.patch: Fix non-void function not having a + return statement. + +------------------------------------------------------------------- +Sat Feb 9 20:35:25 UTC 2013 - dimstar@opensuse.org + +- Update to version 0.15.1: + + build: Fixes build error when supplying nautilis extensions + directory + + bgo#691807: Tracker should build against libgee 0.8 + + bgo#691804: tracker-cue-sheet not ported to Gstreamer 1.0 + + bgo#679870: libsecret migrations + + bgo#690170: Add nfo:MediaList type to .m3u playlist files + + bgo#692210: miner-manager: plug some memleaks + + libtracker-common: Add replacement function for flock() on + Solaris + + libtracker-miner: Fix libsecret password provider get call + using non-NULL GError + + tracker-miner-fs, store: Add MeeGo keys to desktop file. + + Updated translations. + +------------------------------------------------------------------- +Sat Feb 9 19:47:20 UTC 2013 - dimstar@opensuse.org + +- Update to version 0.15.0: + + Port to GStreamer 1.0 / gupnp-dlna-1.1. + + New Feature: Support GKqueueDirectoryMonitor API on BSD systems +- Drop tracker-libgrss-0.5.patch: fixed upstream. +- Drop tracker-fix-include-sched-idle.patch and + tracker-removeable-media-off.patch: they are outdated and were + only applied for openSUSE <= 11.4. +- Drop libtool BuildRequries: no longer needed. + +------------------------------------------------------------------- +Sat Feb 9 18:37:55 UTC 2013 - badshah400@gmail.com + +- Update to version 0.14.5: + + build: Fixes --with-nautilus-extensions-dir which was broken. + + bgo#692409: playlist extractor should index playlist title if + available. + + bgo#692603: Search can not find pdf files using author names. + + bgo#691807: Tracker should build against libgee 0.8. + + bgo#690170: Add nfo:MediaList type to .m3u playlist files. + + bgo#688287: build: don't build-depend on Dia. + + bgo#692210: miner-manager: plug some memleaks. + + bgo#688371: add support for GKqueueDirectoryMonitor. + + libtracker-common: Add replacement function for flock() on + Solaris + + tracker-miner-fs, store: Add MeeGo keys to desktop files + (OnlyShowIn, X-Meego-Priority keys). + ------------------------------------------------------------------- Mon Nov 5 08:53:45 UTC 2012 - dimstar@opensuse.org diff --git a/tracker.spec b/tracker.spec index 823d4ad..a248f33 100644 --- a/tracker.spec +++ b/tracker.spec @@ -1,7 +1,7 @@ # # spec file for package tracker # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Luis Medinas, Portugal # # All modifications and additions to the file contributed by third parties @@ -48,28 +48,24 @@ Name: tracker %define _name tracker -Version: 0.14.4 +Version: 0.15.4 Release: 0 +%define TrackerAPI 0.16 +%define RPMTrackerAPI 0_16 Summary: Powerful object database, tag/metadata database, search tool and indexer License: GPL-2.0+ Group: Productivity/Other Url: http://projects.gnome.org/tracker/ -Source0: http://download.gnome.org/sources/tracker/0.14/%{_name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/tracker/0.15/%{_name}-%{version}.tar.xz Source1: README.SUSE.flickr Source2: README.SUSE.rss -# PATCH-FIX-OPENSUSE tracker-removeable-media-off.patch bgo622288 badshah400@gmail.com -- Disable indexing on removable media by default. This is only needed for 11.4 and earlier, as 12.1 and later have proper default values in GSettings. -Patch1: tracker-removeable-media-off.patch -# PATCH-FIX-OPENSUSE tracker-fix-include-sched-idle.patch malcolmlewis@opensuse.org -- Add linux/sched.h to includes for 11.4 only for the location of SCHED_IDLE. This is only needed for 11.4 and earlier. -Patch2: tracker-fix-include-sched-idle.patch -# PATCH-FIX-UPSTREAM tracker-libgrss-0.5.patch bgo#671751 dimstar@opensuse.org -- Support and Require libgrss-0.5 -Patch3: tracker-libgrss-0.5.patch -# PATCH-FIX-UPSTREAM tracker-evo-implicit.patch bgo#675413 dimstar@opensuse.org -- Include email-backend.h; fixes brp checks. -Patch4: tracker-evo-implicit.patch +# PATCH-FIX-UPSTREAM tracker-0.14.4-giflib5.patch bgo#695769 dimstar@opensuse.org -- Fix build with giglib 5.0.x +Patch0: tracker-0.14.4-giflib5.patch BuildRequires: NetworkManager-devel >= 0.8 BuildRequires: enca-devel BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: glib2-devel >= 2.28.0 +BuildRequires: glib2-devel >= 2.35.1 BuildRequires: gobject-introspection-devel BuildRequires: intltool %if 0%{?suse_version} >= 1130 @@ -79,18 +75,16 @@ BuildRequires: gnome-keyring-devel %endif # Not guarded by !%%{build_extras}, else we build files to have external generic # media players -BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.31 +BuildRequires: gstreamer-plugins-base-devel >= 0.10.31 BuildRequires: libicu-devel -# Needed for patch3 -BuildRequires: libtool BuildRequires: libupower-glib-devel BuildRequires: libuuid-devel -BuildRequires: sqlite3-devel +BuildRequires: sqlite3-devel >= 3.7.9 BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: vala >= 0.12.0 BuildRequires: zlib-devel -BuildRequires: pkgconfig(gee-1.0) +BuildRequires: pkgconfig(gee-0.8) %if !%{build_extras} # Dependencies for extractors / writeback BuildRequires: flac-devel @@ -100,7 +94,7 @@ BuildRequires: libexif-devel BuildRequires: libgsf-devel BuildRequires: libosinfo-devel >= 0.0.2 %if 0%{?suse_version} >= 1140 -BuildRequires: libgupnp-dlna-devel >= 0.5 +BuildRequires: libgupnp-dlna-devel >= 0.9.4 %endif BuildRequires: libexempi-devel BuildRequires: libgxps-devel @@ -138,7 +132,7 @@ BuildRequires: gtk3-devel BuildRequires: pkgconfig(rest-0.7) >= 0.6 %endif %if %{build_miner_rss} -BuildRequires: libgrss-devel +BuildRequires: libgrss-devel >= 0.5 %endif %if %{build_nautilus} BuildRequires: pkgconfig(libnautilus-extension) @@ -187,26 +181,26 @@ This package contains a miner to index files and applications. # name across multiple versions of tracker). # Yet, different libtracker-miner-* packages require their explicit # version of libtracker-common.so.0 as they link is done using rpath. -%package -n libtracker-common-0_14-0 +%package -n libtracker-common-%{RPMTrackerAPI}-0 Summary: Conveniance libraries for Tracker Group: System/Libraries -%description -n libtracker-common-0_14-0 +%description -n libtracker-common-%{RPMTrackerAPI}-0 Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. This package contains private conveniance libraries for the various tracker libraries. -%package -n libtracker-extract-0_14-0 +%package -n libtracker-extract-%{RPMTrackerAPI}-0 Summary: Extract library for Tracker Group: System/Libraries # rpm autodetects libtracker-common.so.0() symbol, which is provided by all versions of libtracker-common, so we need to help with an explicit Requires. -Requires: libtracker-common-0_14-0 +Requires: libtracker-common-%{RPMTrackerAPI}-0 Recommends: %{_name} %glib2_gsettings_schema_requires -%description -n libtracker-extract-0_14-0 +%description -n libtracker-extract-%{RPMTrackerAPI}-0 Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -221,14 +215,14 @@ including context linking and audit trails for a file object. It has the ability to index, store, harvest metadata, retrieve and search all types of files and other first class objects. -%package -n libtracker-miner-0_14-0 +%package -n libtracker-miner-%{RPMTrackerAPI}-0 Summary: Miner library for Tracker Group: System/Libraries # rpm autodetects libtracker-common.so.0() symbol, which is provided by all versions of libtracker-common, so we need to help with an explicit Requires. -Requires: libtracker-common-0_14-0 +Requires: libtracker-common-%{RPMTrackerAPI}-0 Recommends: %{_name} -%description -n libtracker-miner-0_14-0 +%description -n libtracker-miner-%{RPMTrackerAPI}-0 Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -243,11 +237,11 @@ including context linking and audit trails for a file object. It has the ability to index, store, harvest metadata, retrieve and search all types of files and other first class objects. -%package -n typelib-1_0-Tracker-0_14 +%package -n typelib-1_0-Tracker-%{RPMTrackerAPI} Summary: Sparql library for Tracker -- Introspection bindings Group: System/Libraries -%description -n typelib-1_0-Tracker-0_14 +%description -n typelib-1_0-Tracker-%{RPMTrackerAPI} Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -265,11 +259,11 @@ and search all types of files and other first class objects. This package provides the GObject Introspection bindings for the sparql library for Tracker. -%package -n typelib-1_0-TrackerExtract-0_14 +%package -n typelib-1_0-TrackerExtract-%{RPMTrackerAPI} Summary: Extract library for Tracker -- Introspection bindings Group: System/Libraries -%description -n typelib-1_0-TrackerExtract-0_14 +%description -n typelib-1_0-TrackerExtract-%{RPMTrackerAPI} Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -287,11 +281,11 @@ and search all types of files and other first class objects. This package provides the GObject Introspection bindings for the extract library for Tracker. -%package -n typelib-1_0-TrackerMiner-0_14 +%package -n typelib-1_0-TrackerMiner-%{RPMTrackerAPI} Summary: Miner library for Tracker -- Introspection bindings Group: System/Libraries -%description -n typelib-1_0-TrackerMiner-0_14 +%description -n typelib-1_0-TrackerMiner-%{RPMTrackerAPI} Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -309,14 +303,14 @@ and search all types of files and other first class objects. This package provides the GObject Introspection bindings for the miner library for Tracker. -%package -n libtracker-sparql-0_14-0 +%package -n libtracker-sparql-%{RPMTrackerAPI}-0 Summary: Sparql library for Tracker Group: System/Libraries # rpm autodetects libtracker-common.so.0() symbol, which is provided by all versions of libtracker-common, so we need to help with an explicit Requires. -Requires: libtracker-common-0_14-0 +Requires: libtracker-common-%{RPMTrackerAPI}-0 Recommends: %{_name} -%description -n libtracker-sparql-0_14-0 +%description -n libtracker-sparql-%{RPMTrackerAPI}-0 Tracker is a powerful desktop-neutral first class object database, tag/metadata database, search tool and indexer. @@ -334,12 +328,12 @@ and search all types of files and other first class objects. %package -n tracker-devel Summary: Tracker -- Development files Group: Development/Libraries/GNOME -Requires: libtracker-extract-0_14-0 = %{version} -Requires: libtracker-miner-0_14-0 = %{version} -Requires: libtracker-sparql-0_14-0 = %{version} -Requires: typelib-1_0-Tracker-0_14 = %{version} -Requires: typelib-1_0-TrackerExtract-0_14 = %{version} -Requires: typelib-1_0-TrackerMiner-0_14 = %{version} +Requires: libtracker-extract-%{RPMTrackerAPI}-0 = %{version} +Requires: libtracker-miner-%{RPMTrackerAPI}-0 = %{version} +Requires: libtracker-sparql-%{RPMTrackerAPI}-0 = %{version} +Requires: typelib-1_0-Tracker-%{RPMTrackerAPI} = %{version} +Requires: typelib-1_0-TrackerExtract-%{RPMTrackerAPI} = %{version} +Requires: typelib-1_0-TrackerMiner-%{RPMTrackerAPI} = %{version} %description -n tracker-devel Tracker is a powerful desktop-neutral first class object @@ -514,19 +508,12 @@ This package contains an nautilus plugin to tag files with Tracker. %prep %setup -q -n %{_name}-%{version} -translation-update-upstream -%if 0%{?suse_version} <= 1140 -%patch1 -p1 -%patch2 -%endif -%patch3 -p1 -%patch4 -p1 +%patch0 -p1 +#translation-update-upstream cp %{S:1} src/miners/flickr/README.SUSE cp %{S:2} src/miners/rss/README.SUSE %build -# Needed for patch3 -AUTOPOINT='intltoolize --automake --copy' autoreconf --verbose --force --install %configure \ %if !%{build_extras} --enable-libvorbis \ @@ -601,13 +588,13 @@ rm %{buildroot}%{_datadir}/icons/hicolor/*/apps/tracker.* # tracker-extras build can put icons in there without having to worry mkdir -p %{buildroot}%{_datadir}/tracker/icons/ -%fdupes %{buildroot}%{_datadir}/gtk-doc/html/ +#fdupes %{buildroot}%{_datadir}/gtk-doc/html/ %fdupes %{buildroot}%{_datadir}/vala/ %else ## Extras build: remove files from main, miner-files, devel, lang and lib subpackages -for file in `rpm -ql tracker tracker-devel tracker-miner-files libtracker-extract-0_14-0 libtracker-miner-0_14-0 libtracker-sparql-0_14-0 typelib-1_0-Tracker-0_14 typelib-1_0-TrackerExtract-0_14 typelib-1_0-TrackerMiner-0_14 libtracker-common-0_14-0`; do +for file in `rpm -ql tracker tracker-devel tracker-miner-files libtracker-extract-%{RPMTrackerAPI}-0 libtracker-miner-%{RPMTrackerAPI}-0 libtracker-sparql-%{RPMTrackerAPI}-0 typelib-1_0-Tracker-%{RPMTrackerAPI} typelib-1_0-TrackerExtract-%{RPMTrackerAPI} typelib-1_0-TrackerMiner-%{RPMTrackerAPI} libtracker-common-%{RPMTrackerAPI}-0`; do # do not remove directories (might contain files we want); -f to not fail if # file doesn't exist test ! -d %{buildroot}${file} && rm -f %{buildroot}${file} @@ -657,21 +644,21 @@ rm -rf %{buildroot} %postun -n %{_name}-miner-files %glib2_gsettings_schema_postun -%post -n libtracker-extract-0_14-0 +%post -n libtracker-extract-%{RPMTrackerAPI}-0 %glib2_gsettings_schema_post /sbin/ldconfig -%postun -n libtracker-extract-0_14-0 +%postun -n libtracker-extract-%{RPMTrackerAPI}-0 %glib2_gsettings_schema_postun /sbin/ldconfig -%post -n libtracker-miner-0_14-0 -p /sbin/ldconfig +%post -n libtracker-miner-%{RPMTrackerAPI}-0 -p /sbin/ldconfig -%postun -n libtracker-miner-0_14-0 -p /sbin/ldconfig +%postun -n libtracker-miner-%{RPMTrackerAPI}-0 -p /sbin/ldconfig -%post -n libtracker-sparql-0_14-0 -p /sbin/ldconfig +%post -n libtracker-sparql-%{RPMTrackerAPI}-0 -p /sbin/ldconfig -%postun -n libtracker-sparql-0_14-0 -p /sbin/ldconfig +%postun -n libtracker-sparql-%{RPMTrackerAPI}-0 -p /sbin/ldconfig %endif # !build_extras %if %{build_gui} @@ -714,9 +701,9 @@ rm -rf %{buildroot} %{_libexecdir}/tracker-extract %{_libexecdir}/tracker-store %{_libexecdir}/tracker-writeback -%dir %{_libdir}/tracker-0.14/ -%{_libdir}/tracker-0.14/extract-modules/ -%{_libdir}/tracker-0.14/writeback-modules/ +%dir %{_libdir}/tracker-%{TrackerAPI}/ +%{_libdir}/tracker-%{TrackerAPI}/extract-modules/ +%{_libdir}/tracker-%{TrackerAPI}/writeback-modules/ %{_datadir}/tracker/ %{_datadir}/dbus-1/services/org.freedesktop.Tracker1.Extract.service %{_datadir}/dbus-1/services/org.freedesktop.Tracker1.Writeback.service @@ -771,45 +758,45 @@ rm -rf %{buildroot} %{_datadir}/tracker/miners/tracker-miner-files.desktop %{_mandir}/man1/tracker-miner-fs.1%{ext_man} -%files -n libtracker-common-0_14-0 +%files -n libtracker-common-%{RPMTrackerAPI}-0 %defattr(-,root,root) -%{_libdir}/tracker-0.14/libtracker-common.so.* -%{_libdir}/tracker-0.14/libtracker-data.so.* +%{_libdir}/tracker-%{TrackerAPI}/libtracker-common.so.* +%{_libdir}/tracker-%{TrackerAPI}/libtracker-data.so.* -%files -n libtracker-extract-0_14-0 +%files -n libtracker-extract-%{RPMTrackerAPI}-0 %defattr(-,root,root) %{_libdir}/libtracker-extract*.so.* %{_datadir}/glib-2.0/schemas/org.freedesktop.Tracker.Extract.gschema.xml -%files -n libtracker-miner-0_14-0 +%files -n libtracker-miner-%{RPMTrackerAPI}-0 %defattr(-,root,root) %{_libdir}/libtracker-miner*.so.* -%files -n libtracker-sparql-0_14-0 +%files -n libtracker-sparql-%{RPMTrackerAPI}-0 %defattr(-, root, root) %{_libdir}/libtracker-sparql*.so.* -%files -n typelib-1_0-Tracker-0_14 +%files -n typelib-1_0-Tracker-%{RPMTrackerAPI} %defattr(-,root,root) -%{_libdir}/girepository-1.0/Tracker-0.14.typelib +%{_libdir}/girepository-1.0/Tracker-%{TrackerAPI}.typelib -%files -n typelib-1_0-TrackerExtract-0_14 +%files -n typelib-1_0-TrackerExtract-%{RPMTrackerAPI} %defattr(-,root,root) -%{_libdir}/girepository-1.0/TrackerExtract-0.14.typelib +%{_libdir}/girepository-1.0/TrackerExtract-%{TrackerAPI}.typelib -%files -n typelib-1_0-TrackerMiner-0_14 +%files -n typelib-1_0-TrackerMiner-%{RPMTrackerAPI} %defattr(-,root,root) -%{_libdir}/girepository-1.0/TrackerMiner-0.14.typelib +%{_libdir}/girepository-1.0/TrackerMiner-%{TrackerAPI}.typelib %files -n tracker-devel %defattr(-,root,root) %{_libdir}/lib*.so -%{_includedir}/tracker-0.14/ -%{_libdir}/tracker-0.14/libtracker-common.so -%{_libdir}/tracker-0.14/libtracker-data.so -%{_libdir}/pkgconfig/tracker-extract-0.14.pc -%{_libdir}/pkgconfig/tracker-miner-0.14.pc -%{_libdir}/pkgconfig/tracker-sparql-0.14.pc +%{_includedir}/tracker-%{TrackerAPI}/ +%{_libdir}/tracker-%{TrackerAPI}/libtracker-common.so +%{_libdir}/tracker-%{TrackerAPI}/libtracker-data.so +%{_libdir}/pkgconfig/tracker-extract-%{TrackerAPI}.pc +%{_libdir}/pkgconfig/tracker-miner-%{TrackerAPI}.pc +%{_libdir}/pkgconfig/tracker-sparql-%{TrackerAPI}.pc %{_datadir}/gir-1.0/*.gir %{_datadir}/gtk-doc/html/libtracker-miner/ %{_datadir}/gtk-doc/html/libtracker-extract/