SHA256
1
0
forked from pool/tracker

Accepting request 87625 from GNOME:Apps

Pushing G:A

OBS-URL: https://build.opensuse.org/request/show/87625
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tracker?expand=0&rev=38
This commit is contained in:
Lars Vogdt 2011-10-13 10:27:36 +00:00 committed by Git OBS Bridge
parent 77850cd3d5
commit 9f686c7652
5 changed files with 34 additions and 54 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:944d11c439d8c9ec8514e0d7b91219e7fabbc27e826c6e1769d0beaf8cf4682b
size 8006219

3
tracker-0.12.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4c3244a3e174100ade44fc14d52070cf446e9f0feb9e5e4843119694d89e552b
size 8011619

View File

@ -1,42 +0,0 @@
From 584e4a678b9b4b873ab8ac6cdc82b91b5b184df9 Mon Sep 17 00:00:00 2001
From: Martyn Russell <martyn@lanedo.com>
Date: Thu, 29 Sep 2011 10:55:16 +0100
Subject: [PATCH] firefox: Don't try to load 0.10.x libraries, we're using APIs not available there
Fixes GB#660123.
---
src/plugins/firefox/chrome/content/bindings.js | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/plugins/firefox/chrome/content/bindings.js b/src/plugins/firefox/chrome/content/bindings.js
index 87c2756..1c5dff2 100644
--- a/src/plugins/firefox/chrome/content/bindings.js
+++ b/src/plugins/firefox/chrome/content/bindings.js
@@ -2,7 +2,7 @@ if (!org.bustany.TrackerFox.TrackerSparql || !org.bustany.TrackerFox.TrackerSpar
org.bustany.TrackerFox.TrackerSparql = {
__initialized: true,
- _trackerSparqlPath: "libtracker-sparql-0.10.so.0",
+ _trackerSparqlPath: "libtracker-sparql-0.12.so.0",
_lib: null,
init: function () {
@@ -18,14 +18,8 @@ org.bustany.TrackerFox.TrackerSparql = {
try {
tracker._lib = ctypes.open (tracker._trackerSparqlPath);
} catch (e) {
- tracker._trackerSparqlPath = "libtracker-sparql-0.12.so.0";
-
- try {
- tracker._lib = ctypes.open (tracker._trackerSparqlPath);
- } catch (e) {
- dump("Could not load libtracker-sparql 0.10 or 0.12\n");
- return false;
- }
+ dump("Could not load libtracker-sparql 0.12\n");
+ return false;
}
// GLib types
--
1.7.4.1

View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Mon Oct 10 08:12:21 UTC 2011 - vuntz@opensuse.org
- Update to version 0.12.4:
+ libtracker-common:
- Fixed missing include directive for utils tests
- Disable configure.ac checks for ioprio_set()
+ libtracker-data: Set journal_size_limit to 10 MB
+ tracker-extract: Fixed critical when FD list is missing
+ tracker-extract-oasis: Ignore empty values and invalid dates
+ tracker-extract-gstreamer: Fixed division by zero
+ tracker-extract-gif: Fixed file descriptor leak in error case
+ tracker-extract-pdf: Fixed file descriptor leak in error cases
+ tracker-miner-fs: Fixed theme icon URIs for application indexing
+ firefox, thunderbird: Don't operate with tracker 0.10
libraries, only 0.12
+ functional-tests updates.
+ Bugs fixed: bgo#647575, bgo#660350, bgo#659995, bgo#660589,
bgo#660601, bgo#660123, bgo#657183, nokia#257478, nokia#284711,
nokia#217566, nokia#285251.
+ Updated translations.
- Drop tracker-firefox-no-tracker-0.10.patch: fixed upstream.
- Do not rebuild gtk-doc documentation:
+ The tarball now correctly installs the documentation without a
rebuild, except the ontology one. This is a good enough
trade-off (as building requires some dependencies).
+ Remove dia and gtk-doc BuildRequires.
+ Stop passing --enable-gtk-doc to configure.
-------------------------------------------------------------------
Thu Oct 6 15:23:58 UTC 2011 - vuntz@opensuse.org

View File

@ -23,8 +23,9 @@
%define thunderbird_appid \{3550f703-e582-4d05-9a08-453d09bdfdc6\}
Name: tracker
Version: 0.12.3
Version: 0.12.4
Release: 1
# FIXME: missing pkgconfig(libcue) BuildRequires: we don't have this packaged...
License: GPLv2+
Summary: Powerful object database, tag/metadata database, search tool and indexer
Url: http://projects.gnome.org/tracker/
@ -32,16 +33,12 @@ Group: Productivity/Other
Source0: http://download.gnome.org/sources/tracker/0.12/%{name}-%{version}.tar.bz2
Source1: README.SUSE.flickr
Source2: README.SUSE.rss
# PATCH-FIX-UPSTREAM tracker-firefox-no-tracker-0.10.patch bgo#660123 vuntz@opensuse.org -- Don't try to use tracker 0.10 libraries from Firefox extension
Patch0: tracker-firefox-no-tracker-0.10.patch
# 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
# It's a bit annoying to require those for the build, see bgo#655618.
BuildRequires: MozillaFirefox
BuildRequires: MozillaThunderbird
BuildRequires: NetworkManager-devel >= 0.8
# Needed for the gtk-doc
BuildRequires: dia
BuildRequires: enca-devel
%if 0%{?build_evo}
BuildRequires: evolution-data-server-devel
@ -55,7 +52,6 @@ BuildRequires: glib2-devel >= 2.28.0
BuildRequires: gobject-introspection-devel
BuildRequires: graphviz
BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.31
BuildRequires: gtk-doc
BuildRequires: gtk3-devel
BuildRequires: intltool
BuildRequires: libexempi-devel
@ -357,7 +353,6 @@ This package contains an nautilus plugin to tag files with Tracker.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%if 0%{?suse_version} <= 1140
%patch1 -p1
%endif
@ -372,7 +367,6 @@ cp %{S:2} src/miners/rss/README.SUSE
--enable-tracker-search-bar \
--enable-tracker-preferences \
--disable-functional-tests \
--enable-gtk-doc \
--with-firefox-plugin-dir="%{_datadir}/mozilla/extensions/%{firefox_appid}" \
--with-thunderbird-plugin-dir="%{_datadir}/mozilla/extensions/%{thunderbird_appid}"
%__make %{?_smp_mflags} V=1
@ -594,7 +588,6 @@ rm -rf %{buildroot}
%{_datadir}/gtk-doc/html/libtracker-miner/
%{_datadir}/gtk-doc/html/libtracker-extract/
%{_datadir}/gtk-doc/html/libtracker-sparql
%{_datadir}/gtk-doc/html/ontology/
%dir %{_datadir}/vala
%dir %{_datadir}/vala/vapi
%{_datadir}/vala/vapi/*.deps