[tracker/f15/master: 12/12] fix merge and build against new gupnp-dlna

[Peter Robinson]

commit 5c249fdde7fb2ce0f9fd66effd12e447a9c2b37f
Merge: 9b26d69 42d6b04
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Apr 13 22:50:46 2011 +0100

    fix merge and build against new gupnp-dlna

 .gitignore                           |    5 +
 sources                              |    2 +-
 tracker-0.9-fedora-build-fixes.patch |  134 ----------------------------------
 tracker.spec                         |   40 +++++-----
 4 files changed, 25 insertions(+), 156 deletions(-)
---