[tracker/f17] 0.14.2-2

Rex Dieter rdieter at fedoraproject.org
Wed Aug 15 13:51:50 UTC 2012 

commit 94ab3c461b47945cdb6cb1813d8a67bf4428f350
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 15 08:47:28 2012 -0500

    0.14.2-2
    
    - tighten subpkg deps
    - fix icon scriptlet
    - -devel: drop extraneous dep on pkgconfig
    - tracker should not auto-start in KDE/XFCE (#771601)
    
    Conflicts:
    	tracker.spec

 tracker-0.14.2-onlyshowin.patch |   48 +++++++++++++++++++++++++++++++++++++++
 tracker.spec                    |   34 ++++++++++++++++++---------
 2 files changed, 71 insertions(+), 11 deletions(-)
---
diff --git a/tracker-0.14.2-onlyshowin.patch b/tracker-0.14.2-onlyshowin.patch
new file mode 100644
index 0000000..faec1b7
--- /dev/null
+++ b/tracker-0.14.2-onlyshowin.patch
@@ -0,0 +1,48 @@
+diff -up tracker-0.14.2/data/tracker-miner-flickr.desktop.in.in.onlyshowin tracker-0.14.2/data/tracker-miner-flickr.desktop.in.in
+--- tracker-0.14.2/data/tracker-miner-flickr.desktop.in.in.onlyshowin	2012-04-19 04:16:38.000000000 -0500
++++ tracker-0.14.2/data/tracker-miner-flickr.desktop.in.in	2012-08-15 08:42:51.608931597 -0500
+@@ -11,7 +11,7 @@ X-KDE-autostart-after=panel
+ X-KDE-StartupNotify=false
+ X-KDE-UniqueApplet=true
+ NoDisplay=true
+-OnlyShowIn=GNOME;KDE;XFCE;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=tracker
+ X-GNOME-Bugzilla-Component=Miners
+diff -up tracker-0.14.2/data/tracker-miner-fs.desktop.in.in.onlyshowin tracker-0.14.2/data/tracker-miner-fs.desktop.in.in
+--- tracker-0.14.2/data/tracker-miner-fs.desktop.in.in.onlyshowin	2011-04-20 03:05:59.000000000 -0500
++++ tracker-0.14.2/data/tracker-miner-fs.desktop.in.in	2012-08-15 08:40:52.983414620 -0500
+@@ -11,7 +11,7 @@ X-KDE-autostart-after=panel
+ X-KDE-StartupNotify=false
+ X-KDE-UniqueApplet=true
+ NoDisplay=true
+-OnlyShowIn=GNOME;KDE;XFCE;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=tracker
+ X-GNOME-Bugzilla-Component=Miners
+diff -up tracker-0.14.2/data/tracker-miner-rss.desktop.in.in.onlyshowin tracker-0.14.2/data/tracker-miner-rss.desktop.in.in
+--- tracker-0.14.2/data/tracker-miner-rss.desktop.in.in.onlyshowin	2012-04-19 04:16:38.000000000 -0500
++++ tracker-0.14.2/data/tracker-miner-rss.desktop.in.in	2012-08-15 08:43:19.730580028 -0500
+@@ -11,7 +11,7 @@ X-KDE-autostart-after=panel
+ X-KDE-StartupNotify=false
+ X-KDE-UniqueApplet=true
+ NoDisplay=true
+-OnlyShowIn=GNOME;KDE;XFCE;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=tracker
+ X-GNOME-Bugzilla-Component=Miners
+diff -up tracker-0.14.2/data/tracker-store.desktop.in.in.onlyshowin tracker-0.14.2/data/tracker-store.desktop.in.in
+--- tracker-0.14.2/data/tracker-store.desktop.in.in.onlyshowin	2011-04-20 03:05:59.000000000 -0500
++++ tracker-0.14.2/data/tracker-store.desktop.in.in	2012-08-15 08:39:58.672093608 -0500
+@@ -11,7 +11,7 @@ X-KDE-autostart-after=panel
+ X-KDE-StartupNotify=false
+ X-KDE-UniqueApplet=true
+ NoDisplay=true
+-OnlyShowIn=GNOME;KDE;XFCE;
++OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=tracker
+ X-GNOME-Bugzilla-Component=Store
diff --git a/tracker.spec b/tracker.spec
index b3e8079..a8996ea 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -1,13 +1,17 @@
 Summary:	Desktop-neutral search tool and indexer
 Name:		tracker
 Version:	0.14.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/System
 URL:		http://projects.gnome.org/tracker/
 Source0:	http://download.gnome.org/sources/tracker/0.14/%{name}-%{version}.tar.xz
 Patch0:		tracker-extract-pdf-crash-fix.patch
 
+# only autostart in Gnome, see also
+# https://bugzilla.redhat.com/show_bug.cgi?id=771601
+Patch1:  tracker-0.14.2-onlyshowin.patch
+
 BuildRequires:	poppler-glib-devel evolution-devel libxml2-devel libgsf-devel
 BuildRequires:	libuuid-devel dbus-glib-devel
 BuildRequires:	nautilus-devel
@@ -44,8 +48,7 @@ all types of files and other first class objects
 %package devel
 Summary:	Headers for developing programs that will use %{name}
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	pkgconfig
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	dbus-glib-devel gtk2-devel
 
 %description devel
@@ -55,7 +58,7 @@ developing with tracker
 %package ui-tools
 Summary:	Tracker search tool(s)
 Group:		User Interface/Desktops
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 Obsoletes:	paperbox <= 0.4.4
 Obsoletes:	tracker-search-tool <= 0.12.0
 
@@ -75,7 +78,7 @@ Tracker's evolution plugin
 %package firefox-plugin
 Summary:	A simple bookmark exporter for Tracker
 Group:		User Interface/Desktops
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description firefox-plugin
 This Firefox addon exports your bookmarks to Tracker, so that you can search
@@ -84,7 +87,7 @@ for them for example using tracker-needle.
 %package nautilus-plugin
 Summary:	Tracker's nautilus plugin
 Group:		User Interface/Desktops
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description nautilus-plugin
 Tracker's nautilus plugin, provides 'tagging' functionality. Ability to perform
@@ -93,7 +96,7 @@ search in nuautilus using tracker is built-in directly in the nautilus package.
 %package miner-flickr
 Summary:	Tracker's Flickr data miner
 Group:		User Interface/Desktops
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description miner-flickr
 Tracker's Flickr data miner.
@@ -101,7 +104,7 @@ Tracker's Flickr data miner.
 %package thunderbird-plugin
 Summary:	Thunderbird extension to export mails to Tracker
 Group:		User Interface/Desktops
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description thunderbird-plugin
 A simple Thunderbird extension to export mails to Tracker.
@@ -117,6 +120,7 @@ This package contains the documentation for tracker
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1 -b .onlyshowin
 
 %global evo_plugins_dir %(pkg-config evolution-plugin-3.0 --variable=plugindir)
 
@@ -156,9 +160,6 @@ rm -rf %{buildroot}%{_datadir}/tracker-tests
 
 %post ui-tools
 touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 
 %postun
 /sbin/ldconfig
@@ -167,13 +168,18 @@ if [ $1 -eq 0 ]; then
 fi
 
 %postun ui-tools
+if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
+fi
 
 %posttrans
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
@@ -252,6 +258,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gtk-doc/html/ontology/
 
 %changelog
+* Wed Aug 15 2012 Rex Dieter <rdieter at fedoraproject.org> - 0.14.2-2
+- tighten subpkg deps
+- fix icon scriptlet
+- -devel: drop extraneous dep on pkgconfig
+- tracker should not auto-start in KDE/XFCE (#771601)
+
 * Mon Jul 30 2012 Deji Akingunola <dakingun at gmail.com> - 0.14.2-1
 - Update to 0.14.2 (http://download.gnome.org/sources/tracker/0.14/tracker-0.14.2.changes)

More information about the scm-commits mailing list