auto-import tracker-0.5.2-1 on branch devel from tracker-0.5.2-1.src.rpm

Update to 0.5.2
2006-11-21 07:43:59 +00:00 · 2006-11-21 07:43:59 +00:00 · ddb972574f
commit ddb972574f
parent f700e9d9dc
5 changed files with 130 additions and 18 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-tracker-0.5.1.tar.gz
+tracker-0.5.2.tar.gz
--- a/2
+++ b/2
@ -1 +1 @@
-133f836b1fa768aac9fc8d3255176da5  tracker-0.5.1.tar.gz
+1bccb8522668a791366aeb25d43b5da7  tracker-0.5.2.tar.gz
--- a/tracker-desktop.patch
+++ b/tracker-desktop.patch
@ -0,0 +1,108 @@
+--- Makefile.in	2006-11-20 13:34:48.000000000 -0500
+++ Makefile.in.new	2006-11-20 21:21:11.000000000 -0500
+@@ -66,8 +66,9 @@
+     *) f=$$p;; \
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xdgconfigdir)"
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+xdgconfigDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(pkgconfig_DATA)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -299,7 +300,9 @@
+ target_alias = @target_alias@
+ 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 \
+ 	debian/compat \
+@@ -331,12 +334,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 \
+@@ -422,6 +424,15 @@
+ 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ 	done
+install-xdgconfigDATA: $(xdgconfig_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(xdgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(xdgconfigdir)"
+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(xdgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
+	  $(xdgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(xdgconfigdir)/$$f"; \
+	done
+ 
+ uninstall-pkgconfigDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -430,6 +441,13 @@
+ 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ 	done
+uninstall-xdgconfigDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(xdgconfig_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(xdgconfigdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(xdgconfigdir)/$$f"; \
+	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -710,7 +728,7 @@
+ all-am: Makefile $(DATA) config.h
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
+	for dir in "$(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(xdgconfigdir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+ install: install-recursive
+@@ -758,7 +776,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-pkgconfigDATA
+install-data-am: install-pkgconfigDATA install-xdgconfigDATA
+ 
+ install-exec-am:
+ 
+--- 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
--- a/tracker.spec
+++ b/tracker.spec
@ -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 @@ developing with tracker

 %prep
 %setup -q
+%patch -p0 -b .desktop

 %build
 %if "%fedora" >= "6"
@ -59,12 +61,19 @@ make
 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 @@ rm -rf %{buildroot}

 %postun -p /sbin/ldconfig

-%files
+%files -f %{name}.lang
 %defattr(-, root, root, -)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/htmless
@ -80,7 +89,9 @@ rm -rf %{buildroot}
 %{_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 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/*.pc

 %changelog
+* Mon Nov 06 2006 Deji Akingunola <dakingun@gmail.com> - 0.5.2-1
+- Update to 0.5.2
+
 * Mon Nov 06 2006 Deji Akingunola <dakingun@gmail.com> - 0.5.1-1
 - Update to new version

--- a/trackerd.desktop
+++ b/trackerd.desktop
@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Tracker
-Comment=Tracker indexer and search tool daemon
-Icon=
-Exec=trackerd
-Terminal=false
-Type=Application
-Categories=
-X-GNOME-Autostart-enabled=true