rpms/ffmpeg2dirac/devel ffmpeg2dirac.spec,1.3,1.4

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/ffmpeg2dirac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11708

Modified Files:
	ffmpeg2dirac.spec 
Log Message:
* Wed Feb 08 2012 Nicolas Chauvet <kwizart at gmail.com>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild



Index: ffmpeg2dirac.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg2dirac/devel/ffmpeg2dirac.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ffmpeg2dirac.spec	22 Sep 2011 12:01:08 -0000	1.3
+++ ffmpeg2dirac.spec	8 Feb 2012 21:46:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ffmpeg2dirac
 Version:        0.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Convert any file that ffmpeg can decode to dirac or theora
 
 Group:          Applications/Multimedia
@@ -65,10 +65,19 @@
 
 
 %changelog
+* Wed Feb 08 2012 Nicolas Chauvet <kwizart at gmail.com>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+<<<<<<< ffmpeg2dirac.spec
+* Sat Sep 03 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.2.0-1
+- Update to 0.2.0
+
+=======
 * Thu Sep 22 2011 Nicolas Chauvet <kwizart at gmail.com> - 0.2.0-1
 - Update to 0.2.0
 - Add Patch for FFmpeg-0.8
 
+>>>>>>> 1.3
 * Fri Oct 16 2009 kwizart <kwizart at gmail.com> - 0.1.0-4
 - Rebuild for F-12