diff --git a/vlc.changes b/vlc.changes index d8702e9..565225e 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 14 16:14:57 UTC 2017 - dimstar@opensuse.org + +- Prepare for Tumbleweed potentially changing suse_version: request + ffmpeg2 for all suse_version >= 1330 (not == 1330 only). + ------------------------------------------------------------------- Thu Sep 21 11:20:24 UTC 2017 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 27fb170..52f690d 100644 --- a/vlc.spec +++ b/vlc.spec @@ -199,7 +199,7 @@ BuildRequires: pkgconfig(libchromaprint) >= 0.6.0 %if 0%{?suse_version} >= 1320 BuildRequires: pkgconfig(ncursesw) %endif -%if (0%{?suse_version} == 1330) || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200) +%if (0%{?suse_version} >= 1330) || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200) # for TW, we favor ffmpeg2-devel. Older distros have ffmpeg 2.x intree BuildRequires: ffmpeg2-devel %endif @@ -312,10 +312,10 @@ using GStreamer and its submodules as a backend to decode streams. %if 0%{?BUILD_ORIG} %package codecs Summary: Additional codecs for the VLC media player -Group: Productivity/Multimedia/Video/Players # We require the unrestricted libavcodec - same ABI version we linked -Requires: %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted) +Group: Productivity/Multimedia/Video/Players Requires: %{name}-noX = %{version} +Requires: %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted) Supplements: %{name}-noX %description codecs