commit 66205b18d64bc001bf4bc4dc8cd5dcc0e41aa150
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 4 20:03:05 2022 +0100
Fixup for el
ffmpeg.spec | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 942443d..c431d38 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -253,7 +253,7 @@ and video, MPEG4, h263, ac3, asf, avi, real, mjpeg, and flash.
%package libs
Summary: Libraries for %{name}
-%if 0%{?fedora} < 38
+%if 0%{?fedora} && 0%{?fedora} < 38
Conflicts: libavcodec-free
Conflicts: libavfilter-free
Conflicts: libavformat-free
@@ -273,7 +273,7 @@ This package contains the libraries for %{name}
%package -n libavdevice%{?flavor}
Summary: Special devices muxing/demuxing library
-%if 0%{?fedora} < 38
+%if 0%{?fedora} && 0%{?fedora} < 38
Conflicts: libavdevice-free
%endif
Requires: %{name}-libs%{_isa} = %{version}-%{release}
@@ -416,7 +416,7 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/
%build
%{?_with_cuda:export PATH=${PATH}:%{_cuda_bindir}}
%{ff_configure}\
-%if 0%{?fedora} > 37
+%if 0%{?fedora} && 0%{?fedora} > 37
--libdir=%{_libdir}/%{name} \
--shlibdir=%{_libdir}/%{name} \
%else
@@ -481,7 +481,7 @@ rm -r %{buildroot}%{_datadir}/%{name}/examples
install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%endif
-%if 0%{?fedora} > 37
+%if 0%{?fedora} && 0%{?fedora} > 37
install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
echo -e "%{_libdir}/%{name}\n" >
%{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf
mv %{buildroot}%{_libdir}{/%{name},}/pkgconfig
@@ -507,7 +507,7 @@ mv %{buildroot}%{_libdir}{/%{name},}/pkgconfig
%files libs
%doc CREDITS README.md
%license COPYING.*
-%if 0%{?fedora} > 37
+%if 0%{?fedora} && 0%{?fedora} > 37
%{_sysconfdir}/ld.so.conf.d/%{name}-%{_lib}.conf
%{_libdir}/%{name}/lib*.so.*
%exclude %{_libdir}/%{name}/libavdevice%{?build_suffix}.so.*
@@ -520,7 +520,7 @@ mv %{buildroot}%{_libdir}{/%{name},}/pkgconfig
}
%files -n libavdevice%{?flavor}
-%if 0%{?fedora} > 37
+%if 0%{?fedora} && 0%{?fedora} > 37
%{_libdir}/%{name}/libavdevice%{?build_suffix}.so.*
%else
%{_libdir}/libavdevice%{?build_suffix}.so.*