Attachment 2587 Details for Bug 6809 – proposed patch for ffmpeg

[patch] proposed patch for ffmpeg

svndiff (text/plain), 1.27 KB, created by Barry Jackson on 2012-07-28 16:21:11 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Barry Jackson

Created: 2012-07-28 16:21:11 CEST

Size: 1.27 KB

patch

obsolete

>Index: SPECS/ffmpeg.spec
>===================================================================
>--- SPECS/ffmpeg.spec	(revision 275337)
>+++ SPECS/ffmpeg.spec	(working copy)
>@@ -3,12 +3,16 @@
> %define release %mkrel 1
> 
> %define avcmajor 54
>+%define avcmajorprev 53
> %define avclibname %mklibname avcodec %avcmajor
>+%define avclibnameprev %mklibname avcodec %avcmajorprev
> %define develname %mklibname %name -d
> %define staticname %mklibname %name -s -d
> 
> %define avfmajor 54
>+%define avfmajorprev 53
> %define avflibname %mklibname avformat %avfmajor
>+%define avflibnameprev %mklibname avformat %avfmajorprev
> 
> %define postprocmajor 52
> %define postproclibname %mklibname postproc %postprocmajor
>@@ -113,6 +117,7 @@
> Summary:        Shared library part of ffmpeg
> Provides:       libffmpeg = %{version}-%{release}
> Obsoletes:	%{_lib}ffmpeg53 < 0.8.2-2
>+Obsoletes:	%{avclibnameprev}
> 
> %description -n %{avclibname}
> ffmpeg is a hyper fast realtime audio/video encoder, a streaming server
>@@ -143,7 +148,7 @@
> %package -n %{avflibname}
> Group:          System/Libraries
> Summary:        Shared library part of ffmpeg
>-Obsoletes:	%{_lib}avformats53 < %{version}-%{release}
>+Obsoletes:	%{avflibnameprev}
> 
> %description -n %{avflibname}
> ffmpeg is a hyper fast realtime audio/video encoder, a streaming server

Index: SPECS/ffmpeg.spec
===================================================================
--- SPECS/ffmpeg.spec	(revision 275337)
+++ SPECS/ffmpeg.spec	(working copy)
@@ -3,12 +3,16 @@
 %define release %mkrel 1
 
 %define avcmajor 54
+%define avcmajorprev 53
 %define avclibname %mklibname avcodec %avcmajor
+%define avclibnameprev %mklibname avcodec %avcmajorprev
 %define develname %mklibname %name -d
 %define staticname %mklibname %name -s -d
 
 %define avfmajor 54
+%define avfmajorprev 53
 %define avflibname %mklibname avformat %avfmajor
+%define avflibnameprev %mklibname avformat %avfmajorprev
 
 %define postprocmajor 52
 %define postproclibname %mklibname postproc %postprocmajor
@@ -113,6 +117,7 @@
 Summary:        Shared library part of ffmpeg
 Provides:       libffmpeg = %{version}-%{release}
 Obsoletes:	%{_lib}ffmpeg53 < 0.8.2-2
+Obsoletes:	%{avclibnameprev}
 
 %description -n %{avclibname}
 ffmpeg is a hyper fast realtime audio/video encoder, a streaming server
@@ -143,7 +148,7 @@
 %package -n %{avflibname}
 Group:          System/Libraries
 Summary:        Shared library part of ffmpeg
-Obsoletes:	%{_lib}avformats53 < %{version}-%{release}
+Obsoletes:	%{avflibnameprev}
 
 %description -n %{avflibname}
 ffmpeg is a hyper fast realtime audio/video encoder, a streaming server

Actions: View | Diff

Attachments on bug 6809: 2587