[rygel/f16: 3/3] fix merge

[Peter Robinson]

commit bcccb53ef26c1ac35600eeac632d716cad7c705e
Merge: 5e8a58b dea273c
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Sep 20 17:17:47 2011 +0100

    fix merge

 rygel.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --cc rygel.spec
index 3b49148,1d09838..99fd810
--- a/rygel.spec
+++ b/rygel.spec
@@@ -112,14 -110,12 +110,20 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_datadir}/vala/vapi/rygel-1.0.vapi
  
  %changelog
 +* Tue Sep 20 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.12.2-1
 +- stable release 0.12.2
 +- http://ftp.gnome.org/pub/GNOME/sources/rygel/0.12/rygel-0.12.2.news
 +
 +* Wed Sep 14 2011 Peter Robinson <pbrobinson at fedoraproject.org> 0.12.1-1
 +- stable release 0.12.1
 +- http://ftp.gnome.org/pub/GNOME/sources/rygel/0.12/rygel-0.12.1.news
 +
+ * Tue Sep  6 2011 Zeeshan Ali <zeenix at redhat.com> 0.12.0-3
+ - We don't need vala and gupnp-vala to build from release tarball.
+ 
+ * Tue Sep  6 2011 Zeeshan Ali <zeenix at redhat.com> 0.12.0-2
+ - Rebuild against latest gssdp and gupnp*.
+ 
  * Mon Sep  5 2011 Peter Robinson <pbrobinson at fedoraproject.org> 0.12.0-1
  - Update to stable release 0.12.0
  - http://ftp.gnome.org/pub/GNOME/sources/rygel/0.12/rygel-0.12.0.news