[gstreamer-plugins-fc: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/gstreamer-plugins-fc

[Michael Schwendt]

commit 40bea16ce06f09a4099d508c7b824e521d5926ae
Merge: 3bfea6a aaf3496
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Apr 26 21:07:59 2013 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/gstreamer-plugins-fc
    
    Conflicts:
    	gstreamer-plugins-fc.spec

 gstreamer-plugins-fc.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc gstreamer-plugins-fc.spec
index ecf1867,01f9024..addf3e4
--- a/gstreamer-plugins-fc.spec
+++ b/gstreamer-plugins-fc.spec
@@@ -3,7 -3,7 +3,7 @@@
  
  Name: gstreamer-plugins-fc
  Version: 0.2
- Release: 4%{?dist}
 -Release: 5%{?dist}
++Release: 6%{?dist}
  Summary: Future Composer input plugin for GStreamer
  Group: Applications/Multimedia
  License: GPLv2+
@@@ -52,10 -44,12 +52,16 @@@ find $RPM_BUILD_ROOT -name '*.la' -exe
  
  
  %changelog
- * Fri Apr 26 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 0.2-4
++* Fri Apr 26 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 0.2-6
 +- BR automake autoconf libtool and reconf for aarch64 updates (#925503).
 +- Update configure.in and rename it to configure.ac.
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-5
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2-4
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Fri Jan  6 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 0.2-3
  - rebuild for GCC 4.7 as requested
  - add %%{?_isa} to explicit gstreamer dep