rpms/ffmpeg/devel .cvsignore, 1.45, 1.46 ffmpeg.spec, 1.91, 1.92 sources, 1.45, 1.46
Author: belegdol
Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25340
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Thu Aug 01 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.0-1
- Updated to 2.0
- Dropped the no longer needed bogus man dir work-around
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore 1 Aug 2013 08:49:11 -0000 1.45
+++ .cvsignore 1 Aug 2013 11:10:35 -0000 1.46
@@ -1 +1 @@
-ffmpeg-1.2.2.tar.bz2
+ffmpeg-2.0.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ffmpeg.spec 1 Aug 2013 08:49:11 -0000 1.91
+++ ffmpeg.spec 1 Aug 2013 11:10:36 -0000 1.92
@@ -13,7 +13,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 1.2.2
+Version: 2.0
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -241,11 +241,6 @@
popd
%endif
-#work around bogus man dir
-install -d $RPM_BUILD_ROOT%{_mandir}/man3
-mv $RPM_BUILD_ROOT%{_mandir}/man1/lib*.3 $RPM_BUILD_ROOT%{_mandir}/man3
-
-
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
@@ -259,9 +254,9 @@
%{_bindir}/ffserver
%{_bindir}/qt-faststart
%{_mandir}/man1/ffmpeg*.1*
-%{_mandir}/man1/ffplay.1*
-%{_mandir}/man1/ffprobe.1*
-%{_mandir}/man1/ffserver.1*
+%{_mandir}/man1/ffplay*.1*
+%{_mandir}/man1/ffprobe*.1*
+%{_mandir}/man1/ffserver*.1*
%{_datadir}/ffmpeg
%endif
@@ -287,6 +282,10 @@
%changelog
+* Thu Aug 01 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 2.0-1
+- Updated to 2.0
+- Dropped the no longer needed bogus man dir work-around
+
* Thu Aug 01 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.2.2-1
- Updated to 1.2.2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources 1 Aug 2013 08:49:11 -0000 1.45
+++ sources 1 Aug 2013 11:10:36 -0000 1.46
@@ -1 +1 @@
-4997660dfc077922e37d0583f9322f6b ffmpeg-1.2.2.tar.bz2
+13a0feb74474f89052f6b8ba1bce46be ffmpeg-2.0.tar.bz2