Author: belegdol
Update of /cvs/free/rpms/ffmpeg/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1141
Modified Files:
.cvsignore ffmpeg.spec sources
Log Message:
* Mon Jan 07 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-1
- Updated to 1.1
- Added new man pages
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore 4 Dec 2012 06:37:47 -0000 1.38
+++ .cvsignore 7 Jan 2013 21:30:23 -0000 1.39
@@ -1 +1 @@
-ffmpeg-1.0.1.tar.bz2
+ffmpeg-1.1.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ffmpeg.spec 4 Dec 2012 06:37:47 -0000 1.73
+++ ffmpeg.spec 7 Jan 2013 21:30:23 -0000 1.74
@@ -13,7 +13,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 1.0.1
+Version: 1.1
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
@@ -233,6 +233,10 @@
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
@@ -246,7 +250,7 @@
%{_bindir}/ffprobe
%{_bindir}/ffserver
%{_bindir}/qt-faststart
-%{_mandir}/man1/ffmpeg.1*
+%{_mandir}/man1/ffmpeg*.1*
%{_mandir}/man1/ffplay.1*
%{_mandir}/man1/ffprobe.1*
%{_mandir}/man1/ffserver.1*
@@ -255,6 +259,7 @@
%files libs
%{_libdir}/lib*.so.*
+%{_mandir}/man3/lib*.3.gz
%if 0%{!?ffmpegsuffix:1}
%ifarch sparc sparc64
%{_libdir}/v9/lib*.so.*
@@ -274,6 +279,10 @@
%changelog
+* Mon Jan 07 2013 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-1
+- Updated to 1.1
+- Added new man pages
+
* Tue Dec 04 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.1-1
- Updated to 1.0.1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 4 Dec 2012 06:37:47 -0000 1.38
+++ sources 7 Jan 2013 21:30:23 -0000 1.39
@@ -1 +1 @@
-dbbb88ce5525dea22b24aaa098a9bcc2 ffmpeg-1.0.1.tar.bz2
+578c590a0e996c1fc71acb666c0ed858 ffmpeg-1.1.tar.bz2