Hello community,
here is the log from the commit of package tracker for openSUSE:Factory checked in at 2014-08-01 07:06:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tracker (Old)
and /work/SRC/openSUSE:Factory/.tracker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tracker"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tracker/tracker-extras.changes 2014-07-25 12:43:15.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.tracker.new/tracker-extras.changes 2014-08-01 07:06:25.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Jul 31 09:53:00 UTC 2014 - dimstar(a)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.
+
+-------------------------------------------------------------------
tracker.changes: same change
New:
----
tracker-thunderbird.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tracker-extras.spec ++++++
--- /var/tmp/diff_new_pack.7LZzYH/_old 2014-08-01 07:06:26.000000000 +0200
+++ /var/tmp/diff_new_pack.7LZzYH/_new 2014-08-01 07:06:26.000000000 +0200
@@ -61,6 +61,8 @@
Patch0: tracker-extract-private.patch
# PATCH-FIX-UPSTREAM tracker-missing-include.patch dimstar(a)opensuse.org -- Add missing includes, taken from git
Patch1: tracker-missing-include.patch
+# PATCH-FIX-UPSTREAM tracker-thunderbird.patch dimstar(a)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 @@
%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
++++++ tracker.spec ++++++
--- /var/tmp/diff_new_pack.7LZzYH/_old 2014-08-01 07:06:26.000000000 +0200
+++ /var/tmp/diff_new_pack.7LZzYH/_new 2014-08-01 07:06:26.000000000 +0200
@@ -60,6 +60,8 @@
Patch0: tracker-extract-private.patch
# PATCH-FIX-UPSTREAM tracker-missing-include.patch dimstar(a)opensuse.org -- Add missing includes, taken from git
Patch1: tracker-missing-include.patch
+# PATCH-FIX-UPSTREAM tracker-thunderbird.patch dimstar(a)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 @@
%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
++++++ tracker-thunderbird.patch ++++++
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",
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org