[tracker/f16: 15/15] fix merge

[Peter Robinson]

commit 0d8448eb5864dc942c2c6b2770bcc3d8f61c03c9
Merge: 2e53a9f a34935e
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Oct 11 12:18:32 2011 +0100

    fix merge

 .gitignore   |   17 +----------------
 tracker.spec |   23 ++++++++++++++++++-----
 2 files changed, 19 insertions(+), 21 deletions(-)
---
diff --cc .gitignore
index bad4f91,32c4588..80143d7
--- a/.gitignore
+++ b/.gitignore
@@@ -1,16 -1,18 +1,1 @@@
--tracker-0.8.13.tar.bz2
--/tracker-0.8.16.tar.bz2
--/tracker-0.9.24.tar.bz2
--/tracker-0.9.27.tar.bz2
--/tracker-0.9.30.tar.bz2
--/tracker-0.9.33.tar.bz2
--/tracker-0.9.35.tar.bz2
--/tracker-0.9.36.tar.bz2
--/tracker-0.10.0.tar.bz2
--/tracker-0.10.2.tar.bz2
--/tracker-0.10.3.tar.bz2
--/tracker-0.10.5.tar.bz2
--/tracker-0.10.8.tar.bz2
--/tracker-0.10.10.tar.bz2
--/tracker-0.11.2.tar.xz
- /tracker-0.12.1.tar.xz
 -/tracker-0.12.0.tar.xz
 -/tracker-0.12.3.tar.xz
 -/tracker-0.12.4.tar.xz
++/tracker-0.*.tar.xz
diff --cc tracker.spec
index 8e1b84a,f7889bc..cb5ce30
--- a/tracker.spec
+++ b/tracker.spec
@@@ -10,10 -10,9 +10,9 @@@ Source0:	http://download.gnome.org/sour
  BuildRequires:	poppler-glib-devel evolution-devel libxml2-devel libgsf-devel
  BuildRequires:	libuuid-devel dbus-glib-devel
  BuildRequires:	nautilus-devel
- #BuildRequires:	gnome-panel-devel
  BuildRequires:	libjpeg-devel libexif-devel exempi-devel raptor-devel
  BuildRequires:	libiptcdata-devel libtiff-devel libpng-devel giflib-devel
 -BuildRequires:	sqlite-devel vala-devel libgee06-devel
 +BuildRequires:	sqlite-devel vala-devel libgee-devel
  BuildRequires:  gstreamer-plugins-base-devel gstreamer-devel id3lib-devel
  BuildRequires:	totem-pl-parser-devel libvorbis-devel flac-devel enca-devel
  BuildRequires:	upower-devel gnome-keyring-devel NetworkManager-glib-devel
@@@ -211,10 -213,10 +213,13 @@@ glib-compile-schemas %{_datadir}/glib-2
  - Update to 0.12.4 stable release
  - http://download.gnome.org/sources/tracker/0.12/tracker-0.12.4.changes
  
 +* Mon Oct  3 2011 Marek Kasik <mkasik at redhat.com> - 0.12.3-2
 +- Rebuild (poppler-0.18.0 stable)
 +
- * Mon Sep 26 2011 Deji Akingunola <dakingun at gmail.com> - 0.12.3-1
+ * Fri Sep 30 2011 Tomas Bzatek <tbzatek at redhat.com> - 0.12.3-2
+ - Rebuilt for new 0.18 poppler
+ 
+ * Tue Sep 27 2011 Deji Akingunola <dakingun at gmail.com> - 0.12.3-1
  - Update to 0.12.3 stable release
  
  * Fri Sep 23 2011 Deji Akingunola <dakingun at gmail.com> - 0.12.2-1