rpms/ffmpeg/F-14 .cvsignore, 1.17, 1.18 sources, 1.18, 1.19 ffmpeg.spec, 1.35, 1.36
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13587
Modified Files:
.cvsignore sources ffmpeg.spec
Log Message:
Update to 0.6.2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 4 Jul 2010 22:19:26 -0000 1.17
+++ .cvsignore 12 Apr 2011 20:28:21 -0000 1.18
@@ -1 +1 @@
-ffmpeg-20100704.tar.bz2
+ffmpeg-0.6.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 10 Jan 2011 21:43:56 -0000 1.18
+++ sources 12 Apr 2011 20:28:21 -0000 1.19
@@ -1 +1 @@
-fccd69057e331c2541bb024b1e92e864 ffmpeg-20110110.tar.bz2
+f7819307dad55aa0d6b40ac0e862884d ffmpeg-0.6.2.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-14/ffmpeg.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ffmpeg.spec 10 Jan 2011 21:43:56 -0000 1.35
+++ ffmpeg.spec 12 Apr 2011 20:28:21 -0000 1.36
@@ -1,11 +1,11 @@
# TODO: add make test to %%check section
-%global svn 20110110
+#global svn 20110110
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.6.1
-Release: 1.%{svn}svn%{?dist}
+Version: 0.6.2
+Release: 1%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -13,7 +13,7 @@
%endif
Group: Applications/Multimedia
URL: http://ffmpeg.org/
-Source0: ffmpeg-%{svn}.tar.bz2
+Source0: ffmpeg-%{version}.tar.bz2
Source1: ffmpeg-snapshot.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -112,7 +112,7 @@
%prep
-%setup -q -n ffmpeg-%{svn}
+%setup -q -n ffmpeg-%{version}
%build
%ifarch ppc ppc64
@@ -148,8 +148,6 @@
%endif
make %{?_smp_mflags}
-make documentation
-make alltools
popd
%if 0%{!?ffmpegsuffix:1}
@@ -173,7 +171,7 @@
rm -rf $RPM_BUILD_ROOT
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
-install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
+#install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
popd
%if 0%{!?ffmpegsuffix:1}
pushd simd
@@ -199,7 +197,7 @@
%{_bindir}/ffplay
%{_bindir}/ffprobe
%{_bindir}/ffserver
-%{_bindir}/qt-faststart
+#{_bindir}/qt-faststart
%{_mandir}/man1/ffmpeg.1*
%{_mandir}/man1/ffplay.1*
%{_mandir}/man1/ffprobe.1*
@@ -230,6 +228,9 @@
%changelog
+* Wed Apr 06 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.6.2-1
+- Update to 0.6.2
+
* Mon Jan 10 2011 Dominik Mierzejewski <rpm at greysector.net> -
0.6.1-1.20110110svn
- 20110110 snapshot
- bump version to post-0.6.1 to allow stable 0.6.1 update in older branches