rpms/gstreamer-ffmpeg/EL-6 .cvsignore, 1.12, 1.13 gstreamer-ffmpeg.spec, 1.20, 1.21 sources, 1.12, 1.13

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/gstreamer-ffmpeg/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32570/EL-6

Modified Files:
	.cvsignore gstreamer-ffmpeg.spec sources 
Log Message:
Branch for EL-6



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/EL-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Jan 2012 21:15:47 -0000	1.12
+++ .cvsignore	14 Jun 2012 18:51:27 -0000	1.13
@@ -1 +1 @@
-gst-ffmpeg-0.10.13.tar.bz2
+gst-ffmpeg-0.10.11.tar.bz2


Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/EL-6/gstreamer-ffmpeg.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gstreamer-ffmpeg.spec	28 Feb 2012 11:26:22 -0000	1.20
+++ gstreamer-ffmpeg.spec	14 Jun 2012 18:51:27 -0000	1.21
@@ -1,5 +1,5 @@
 Name:           gstreamer-ffmpeg
-Version:        0.10.13
+Version:        0.10.11
 Release:        2%{?dist}
 Summary:        GStreamer FFmpeg-based plug-ins
 Group:          Applications/Multimedia
@@ -10,7 +10,7 @@
 Patch0:         gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
 BuildRequires:  gstreamer-devel >= 0.10.0
 BuildRequires:  gstreamer-plugins-base-devel >= 0.10.0
-BuildRequires:  ffmpeg-devel >= 0.8.8
+BuildRequires:  ffmpeg-compat-devel >= 0.6.0
 BuildRequires:  orc-devel bzip2-devel
 
 %description
@@ -30,6 +30,7 @@
 
 
 %build
+export PKG_CONFIG_LIBDIR="%{_libdir}/ffmpeg-compat/pkgconfig"
 %configure --disable-dependency-tracking --disable-static \
   --with-package-name="gst-plugins-ffmpeg rpmfusion rpm" \
   --with-package-origin="http://rpmfusion.org/" \
@@ -50,18 +51,9 @@
 
 
 %changelog
-* Tue Feb 28 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.10.13-2
-- Rebuilt for x264/FFmpeg
-
-* Sun Jan 29 2012 Hans de Goede <j.w.r.degoede at gmail.com> - 0.10.13-1
-- New upstream release 0.10.13 (rf#2118, rf#2069)
-
-* Sun Sep  4 2011 Hans de Goede <j.w.r.degoede at gmail.com> - 0.10.12-1
-- New upstream release 0.10.12
-- Rebuild for ffmpeg-0.8
-
-* Thu Apr 21 2011 Hans de Goede <j.w.r.degoede at gmail.com> - 0.10.11-2
-- Rebuild for proper package kit magic provides (rhbz#695730, rf#1707)
+* Thu Jun 14 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.10.11-2
+- Branch for EL-6
+- Switch to ffmpeg-compat
 
 * Sat Jul 17 2010 Hans de Goede <j.w.r.degoede at gmail.com> 0.10.11-1
 - New upstream release 0.10.11


Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/EL-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Jan 2012 21:15:47 -0000	1.12
+++ sources	14 Jun 2012 18:51:27 -0000	1.13
@@ -1 +1 @@
-7f5beacaf1312db2db30a026b36888c4  gst-ffmpeg-0.10.13.tar.bz2
+0d23197ba7ac06ea34fa66d38469ebe5  gst-ffmpeg-0.10.11.tar.bz2