rpms/tracker/FC-6 tracker-desktop.patch, 1.1, 1.2 tracker.spec, 1.3, 1.4

[Deji Akingunola (deji)]

Author: deji

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

Modified Files:
	tracker-desktop.patch tracker.spec 
Log Message:
* Tue Nov 21 2006 Deji Akingunola <dakingun at gmail.com> - 0.5.2-1
- Patching Makefile.am doesn't work!


tracker-desktop.patch:

Index: tracker-desktop.patch
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/tracker-desktop.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tracker-desktop.patch	21 Nov 2006 08:27:16 -0000	1.1
+++ tracker-desktop.patch	21 Nov 2006 08:49:38 -0000	1.2
@@ -1,16 +1,27 @@
---- 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 @@
+--- 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
- 
++xdgconfig_DATA= trackerd.desktop
  debian_files = \
  	debian/changelog \
-@@ -34,12 +36,11 @@
+ 	debian/compat \
+@@ -331,12 +334,11 @@
  
  EXTRA_DIST = \
  	$(pkgconfig_DATA) \
@@ -24,6 +35,54 @@
  	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 @@


Index: tracker.spec
===================================================================
RCS file: /cvs/extras/rpms/tracker/FC-6/tracker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tracker.spec	21 Nov 2006 08:27:16 -0000	1.3
+++ tracker.spec	21 Nov 2006 08:49:38 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: An object database, tag/metadata database, search tool and indexer
 Name: tracker
 Version: 0.5.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 License: GPL
 Group: Applications/System
 URL: http://www.gnome.org/~jamiemcc/tracker/
@@ -103,7 +103,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Mon Nov 06 2006 Deji Akingunola <dakingun at gmail.com> - 0.5.2-1
+* Tue Nov 21 2006 Deji Akingunola <dakingun at gmail.com> - 0.5.2-1
+- Patching Makefile.am doesn't work!
+
+* Mon Nov 20 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