rpms/tracker/FC-6 tracker-desktop.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tracker.spec, 1.2, 1.3 trackerd.desktop, 1.1, NONE

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/tracker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9366/FC-6

Modified Files:
	.cvsignore sources tracker.spec 
Added Files:
	tracker-desktop.patch 
Removed Files:
	trackerd.desktop 
Log Message:
auto-import tracker-0.5.2-1 on branch FC-6 from tracker-0.5.2-1.src.rpm
Update to 0.5.2

tracker-desktop.patch:

--- NEW FILE tracker-desktop.patch ---
--- Makefile.am	2006-11-20 23:57:45.000000000 -0500
+++ Makefile.am.new	2006-11-20 23:58:00.000000000 -0500
@@ -1,7 +1,9 @@
 SUBDIRS = data src filters thumbnailers docs po
 
 pkgconfigdir = $(libdir)/pkgconfig
+xdgconfigdir = $(sysconfdir)/xdg/autostart
 pkgconfig_DATA = tracker.pc
+xdgconfig_DATA = trackerd.desktop
 
 debian_files = \
 	debian/changelog \
@@ -34,12 +36,11 @@
 
 EXTRA_DIST = \
 	$(pkgconfig_DATA) \
+	$(xdgconfig_DATA) \
 	AUTHORS NEWS INSTALL COPYING README \
 	ChangeLog \
 	configure.in \
 	rdf-query-examples/*.rdf \
-	trackerd.desktop \
-	trackerd-kde.desktop \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
--- trackerd.desktop	2006-11-15 19:08:17.000000000 -0500
+++ trackerd.desktop.new	2006-11-20 20:37:59.000000000 -0500
@@ -8,5 +8,8 @@
 Terminal=false
 Type=Application
 Categories=
-OnlyShowIn=GNOME;
 X-GNOME-Autostart-enabled=true
+X-KDE-autostart-after=panel
+X-KDE-StartupNotify=false
+X-KDE-UniqueApplet=true
+NoDisplay=true
--- src/tracker-search-tool/tracker-search-tool.desktop.in	2006-11-20 08:11:41.000000000 -0500
+++ src/tracker-search-tool/tracker-search-tool.desktop.in.new	2006-11-20 20:24:40.000000000 -0500
@@ -6,6 +6,6 @@
 Icon=gnome-searchtool
 Terminal=false
 Type=Application
-Categories=GTK;Application;Utility;
+Categories=GTK;Utility;
 StartupNotify=true
-NoDisplay=true 
+NoDisplay=true


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2006 16:08:21 -0000	1.2
+++ .cvsignore	21 Nov 2006 08:27:16 -0000	1.3
@@ -1 +1 @@
-tracker-0.5.1.tar.gz
+tracker-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2006 16:08:21 -0000	1.2
+++ sources	21 Nov 2006 08:27:16 -0000	1.3
@@ -1 +1 @@
-133f836b1fa768aac9fc8d3255176da5  tracker-0.5.1.tar.gz
+1bccb8522668a791366aeb25d43b5da7  tracker-0.5.2.tar.gz


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/tracker.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tracker.spec	9 Nov 2006 16:24:03 -0000	1.2
+++ tracker.spec	21 Nov 2006 08:27:16 -0000	1.3
@@ -1,16 +1,17 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
-Version: 0.5.1
+Version: 0.5.2
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
 Source0: http://www.gnome.org/~jamiemcc/tracker/tracker-%{version}.tar.gz
-Source1: trackerd.desktop
+Patch0: tracker-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gmime-devel, poppler-devel, gettext
 BuildRequires: gnome-desktop-devel, gamin-devel
 BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel
+BuildRequires: desktop-file-utils, intltool
 %if "%fedora" >= "6"
 BuildRequires: sqlite-devel
 %else
@@ -44,6 +45,7 @@
 
 %prep
 %setup -q
+%patch -p0 -b .desktop
 
 %build
 %if "%fedora" >= "6"
@@ -59,12 +61,19 @@
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
-# Add an autostart for trackerd
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/
+# Add an autostart for trackerd (for KDE)
+mkdir -p %{buildroot}%{_datadir}/autostart
+cp -pr trackerd.desktop %{buildroot}%{_datadir}/autostart/
+
+desktop-file-install --delete-original                   \
+        --vendor="fedora"                           \
+        --dir=%{buildroot}%{_datadir}/applications   \
+        %{buildroot}%{_datadir}/applications/%{name}-search-tool.desktop
 
 rm -rf %{buildroot}%{_libdir}/*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -72,7 +81,7 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/htmless
@@ -80,7 +89,9 @@
 %{_bindir}/tracker*
 %{_datadir}/tracker/
 %{_datadir}/pixmaps/tracker/
+%{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/tracker.service
+%{_datadir}/autostart/*.desktop
 %{_libdir}/*.so.*
 %{_mandir}/man1/tracker*.1.gz
 %{_sysconfdir}/xdg/autostart/trackerd.desktop
@@ -92,6 +103,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Nov 06 2006 Deji Akingunola <dakingun at gmail.com> - 0.5.2-1
+- Update to 0.5.2
+
 * Mon Nov 06 2006 Deji Akingunola <dakingun at gmail.com> - 0.5.1-1
 - Update to new version
 


--- trackerd.desktop DELETED ---