pool/tracker
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 243139 from home:dimstar:branches:GNOME:Factory

Browse Source 
Fix build with TB 31

OBS-URL: https://build.opensuse.org/request/show/243139
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/tracker?expand=0&rev=58
This commit is contained in:
Bjørn Lie 2014-07-31 11:26:29 +00:00 committed by Git OBS Bridge
parent 30171adcf9
commit c9f5243bb5
5 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tracker-extras.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jul 31 09:53:00 UTC 2014 - dimstar@opensuse.org
- Add tracker-thunderbird.patch: Accept that the command
'thunderbird' might have output to STDERR (glib slice warnings).
To not break detection of TB, we redirect STDERR output to
/dev/null.
-------------------------------------------------------------------
Wed Jul 23 00:07:53 UTC 2014 - dimstar@opensuse.org

3
tracker-extras.spec
View File

@ -61,6 +61,8 @@ Source2: README.SUSE.rss
Patch0: tracker-extract-private.patch
# PATCH-FIX-UPSTREAM tracker-missing-include.patch dimstar@opensuse.org -- Add missing includes, taken from git
Patch1: tracker-missing-include.patch
# PATCH-FIX-UPSTREAM tracker-thunderbird.patch dimstar@opensuse.org -- Accept that tracker might have some stderr output as well (glib slice)
Patch2: tracker-thunderbird.patch
BuildRequires: NetworkManager-devel >= 0.8
BuildRequires: enca-devel
BuildRequires: fdupes
@ -481,6 +483,7 @@ This package contains an nautilus plugin to tag files with Tracker.
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
cp %{S:1} .
translation-update-upstream
cp %{S:2} src/miners/rss/README.SUSE

13
tracker-thunderbird.patch Normal file
View File

@ -0,0 +1,13 @@
Index: tracker-1.0.2/configure.ac
===================================================================
--- tracker-1.0.2.orig/configure.ac
+++ tracker-1.0.2/configure.ac
@@ -427,7 +427,7 @@ have_tracker_miner_thunderbird="no "
AC_PATH_PROG(THUNDERBIRD, thunderbird, thunderbird)
if test -n $THUNDERBIRD; then
- thunderbird_version=`$THUNDERBIRD --version | cut -d" " -f3`
+ thunderbird_version=`$THUNDERBIRD --version 2>/dev/null | awk '{print $NF}'`
AX_COMPARE_VERSION([$thunderbird_version], ge, [$TRACKER_MINER_THUNDERBIRD_REQUIRED],
have_tracker_miner_thunderbird="yes",

8
tracker.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jul 31 09:53:00 UTC 2014 - dimstar@opensuse.org
- Add tracker-thunderbird.patch: Accept that the command
'thunderbird' might have output to STDERR (glib slice warnings).
To not break detection of TB, we redirect STDERR output to
/dev/null.
-------------------------------------------------------------------
Wed Jul 23 00:07:53 UTC 2014 - dimstar@opensuse.org

3
tracker.spec
View File

@ -60,6 +60,8 @@ Source2: README.SUSE.rss
Patch0: tracker-extract-private.patch
# PATCH-FIX-UPSTREAM tracker-missing-include.patch dimstar@opensuse.org -- Add missing includes, taken from git
Patch1: tracker-missing-include.patch
# PATCH-FIX-UPSTREAM tracker-thunderbird.patch dimstar@opensuse.org -- Accept that tracker might have some stderr output as well (glib slice)
Patch2: tracker-thunderbird.patch
BuildRequires: NetworkManager-devel >= 0.8
BuildRequires: enca-devel
BuildRequires: fdupes
@ -480,6 +482,7 @@ This package contains an nautilus plugin to tag files with Tracker.
%setup -q -n %{_name}-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
cp %{S:1} .
translation-update-upstream
cp %{S:2} src/miners/rss/README.SUSE