[ffgtk: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/ffgtk

[Louis Lagendijk]

commit c158fed1f06560fce78064c64b84825f3c1602e0
Merge: 95750aa cc672ac
Author: Louis Lagendijk <louis at lagendijk.xs4all.nl>
Date:   Thu Jan 26 22:42:54 2012 +0100

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/ffgtk
    
    Conflicts:
    	ffgtk.spec

 ffgtk.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc ffgtk.spec
index 9b8693f,c6aedfd..5d75db8
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@@ -157,15 -172,13 +157,18 @@@ f
  
  %files plugin-gstreamer
  %defattr(-,root,root,-)
 -%{_libdir}/ffgtk/plugins/lib_audio_gstreamer.so.0
 -%{_libdir}/ffgtk/plugins/lib_audio_gstreamer.so.0.0.0
 +%{_libdir}/ffgtk/plugins/lib_audio_gstreamer.so
  
  %changelog
 +* Thu Jan 26 2012 Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.1-1
 +- New upstream release 0.8.1, lots of bugfixes
 +- Fixed printer creation for cups with a systemd unit file (BZ#768640)A
 +- glib patches were incomplete. Compile using new --disable-Werror flag
 +  for configure 
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.94-11
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Mon Nov 28 2011 Milan Crha <mcrha at redhat.com> 0.7.94-10
  - Rebuild against newer evolution-data-server