From 8339737fe2b86ee56405fd8b544fadd4e7fe6834 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Thu, 1 Aug 2013 11:10:35 +0000 Subject: [PATCH] * Thu Aug 01 2013 Julian Sikorski - 2.0-1 - Updated to 2.0 - Dropped the no longer needed bogus man dir work-around --- .gitignore | 2 +- ffmpeg.spec | 17 ++++++++--------- sources | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 5f571bc..63c223d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -ffmpeg-1.2.2.tar.bz2 +ffmpeg-2.0.tar.bz2 diff --git a/ffmpeg.spec b/ffmpeg.spec index 2a559e3..d451e7c 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -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 @@ make install DESTDIR=$RPM_BUILD_ROOT V=1 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 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/lib*.3 $RPM_BUILD_ROOT%{_mandir}/man3 %{_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 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/lib*.3 $RPM_BUILD_ROOT%{_mandir}/man3 %changelog +* Thu Aug 01 2013 Julian Sikorski - 2.0-1 +- Updated to 2.0 +- Dropped the no longer needed bogus man dir work-around + * Thu Aug 01 2013 Julian Sikorski - 1.2.2-1 - Updated to 1.2.2 diff --git a/sources b/sources index 60695c3..270d4ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4997660dfc077922e37d0583f9322f6b ffmpeg-1.2.2.tar.bz2 +13a0feb74474f89052f6b8ba1bce46be ffmpeg-2.0.tar.bz2