From ddfe35e642f85959d41edfa58d2015616d9e36fde4f76c8b5c19b451a993f5f2 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 28 Oct 2011 17:44:59 +0000
Subject: [PATCH] Accepting request 89694 from GNOME:Apps

Replaced category SystemSetup by X-SuSE-ControlCenter-Personal for rpmlint-friendliness (forwarded request 89689 from badshah400)

OBS-URL: https://build.opensuse.org/request/show/89694
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tracker?expand=0&rev=42
---
 tracker-extras.changes | 18 ++++++++++++++++++
 tracker-extras.spec    |  6 +++++-
 tracker.changes        | 18 ++++++++++++++++++
 tracker.spec           |  6 +++++-
 4 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/tracker-extras.changes b/tracker-extras.changes
index e4aed0d..308d64c 100644
--- a/tracker-extras.changes
+++ b/tracker-extras.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Oct 28 14:09:18 UTC 2011 - badshah400@gmail.com
+
+- Replace category SystemSetup by X-SuSE-ControlCenter-Personal to
+  suppress rpmlint warnings 
+
+-------------------------------------------------------------------
+Fri Oct 28 10:17:53 UTC 2011 - badshah400@gmail.com
+
+- Categorise tracker-gui as System Tools using
+  %suse_update_desktop_file to replace existing categories
+  (bnc#714333)
+
+-------------------------------------------------------------------
+Fri Oct 14 15:39:40 UTC 2011 - fcrozat@suse.com
+
+- Only enable thunderbird support for 12.1 or later.
+
 -------------------------------------------------------------------
 Fri Oct 14 13:22:34 UTC 2011 - malcolmlewis@opensuse.org
 
diff --git a/tracker-extras.spec b/tracker-extras.spec
index d40bc85..d7974df 100644
--- a/tracker-extras.spec
+++ b/tracker-extras.spec
@@ -36,7 +36,11 @@
 %define build_miner_flickr 1
 %define build_miner_rss 1
 %define build_nautilus 1
+%if 0%{?suse_version} > 1140
 %define build_thunderbird 1
+%else
+%define build_thunderbird 0
+%endif
 %endif
 
 %define firefox_appid      \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -536,7 +540,7 @@ rm %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/tracker.mo
 %suse_update_desktop_file %{buildroot}%{_datadir}/tracker/miners/tracker-miner-rss.desktop
 %endif
 %if %{build_gui}
-%suse_update_desktop_file tracker-preferences X-SuSE-ControlCenter-Personal
+%suse_update_desktop_file -r tracker-preferences System X-SuSE-ControlCenter-Personal 
 %suse_update_desktop_file tracker-needle DesktopUtility
 %endif
 %if %{build_thunderbird}
diff --git a/tracker.changes b/tracker.changes
index e4aed0d..308d64c 100644
--- a/tracker.changes
+++ b/tracker.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Oct 28 14:09:18 UTC 2011 - badshah400@gmail.com
+
+- Replace category SystemSetup by X-SuSE-ControlCenter-Personal to
+  suppress rpmlint warnings 
+
+-------------------------------------------------------------------
+Fri Oct 28 10:17:53 UTC 2011 - badshah400@gmail.com
+
+- Categorise tracker-gui as System Tools using
+  %suse_update_desktop_file to replace existing categories
+  (bnc#714333)
+
+-------------------------------------------------------------------
+Fri Oct 14 15:39:40 UTC 2011 - fcrozat@suse.com
+
+- Only enable thunderbird support for 12.1 or later.
+
 -------------------------------------------------------------------
 Fri Oct 14 13:22:34 UTC 2011 - malcolmlewis@opensuse.org
 
diff --git a/tracker.spec b/tracker.spec
index 17914a9..84538e3 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -36,7 +36,11 @@
 %define build_miner_flickr 1
 %define build_miner_rss 1
 %define build_nautilus 1
+%if 0%{?suse_version} > 1140
 %define build_thunderbird 1
+%else
+%define build_thunderbird 0
+%endif
 %endif
 
 %define firefox_appid      \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -534,7 +538,7 @@ rm %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/tracker.mo
 %suse_update_desktop_file %{buildroot}%{_datadir}/tracker/miners/tracker-miner-rss.desktop
 %endif
 %if %{build_gui}
-%suse_update_desktop_file tracker-preferences X-SuSE-ControlCenter-Personal
+%suse_update_desktop_file -r tracker-preferences System X-SuSE-ControlCenter-Personal 
 %suse_update_desktop_file tracker-needle DesktopUtility
 %endif
 %if %{build_thunderbird}