diff --git a/flac.spec b/flac.spec index 0d3dd20..4798bb0 100644 --- a/flac.spec +++ b/flac.spec @@ -1,10 +1,3 @@ -# Disable if you don't need xmms -%global with_xmms !0%{?rhel} - -%if %{with_xmms} -%define xmms_inputdir %(xmms-config --input-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/General) -%endif - Summary: An encoder/decoder for the Free Lossless Audio Codec Name: flac Version: 1.3.3 @@ -15,10 +8,6 @@ URL: https://www.xiph.org/flac/ Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: libogg-devel BuildRequires: gcc gcc-c++ automake autoconf libtool gettext-devel doxygen -%if %{with_xmms} -BuildRequires: xmms-devel desktop-file-utils -Source1: xmms-flac.desktop -%endif %ifarch %{ix86} # 2.0 supports symbol visibility BuildRequires: nasm >= 2.0 @@ -40,6 +29,8 @@ This package contains the command-line tools and documentation. %package libs Summary: Libraries for the Free Lossless Audio Codec Obsoletes: flac < 1.2.1-11 +# xmms-flac dropped in 1.3.3-8 +Obsoletes: xmms-flac < 1.3.3-8 %description libs FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC @@ -59,19 +50,6 @@ Requires: pkgconfig This package contains all the files needed to develop applications that will use the Free Lossless Audio Codec. -%if %{with_xmms} -%package -n xmms-flac -Summary: XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files -# The entire FLAC sources are covered by multiple licenses, but the xmms plugin -# is only GPLv2+ -License: GPLv2+ - -%description -n xmms-flac -FLAC is a Free Lossless Audio Codec. The FLAC format supports streaming, -seeking, and archival, and gives 25-75% compression on typical CD audio. -This is the input plugin for XMMS to be able to read FLAC files. -%endif - %prep %setup -q %patch1 -p1 -b .cve-2020-0499 @@ -84,11 +62,7 @@ This is the input plugin for XMMS to be able to read FLAC files. export CFLAGS="%{optflags} -funroll-loops" %configure \ --htmldir=%{_docdir}/flac/html \ -%if %{with_xmms} - --enable-xmms-plugin \ -%else --disable-xmms-plugin \ -%endif --disable-silent-rules \ --disable-thorough-tests @@ -97,10 +71,6 @@ export CFLAGS="%{optflags} -funroll-loops" %install %make_install -%if %{with_xmms} -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} -%endif - # split documentation mv %{buildroot}%{_docdir}/flac* ./flac-doc mkdir -p flac-doc-devel @@ -108,9 +78,6 @@ mv flac-doc{/html/api,-devel} rm flac-doc/FLAC.tag rm %{buildroot}%{_libdir}/*.la -%if %{with_xmms} -rm %{buildroot}%{xmms_inputdir}/*.la -%endif %check make check @@ -135,13 +102,6 @@ make check %{_libdir}/pkgconfig/* %{_datadir}/aclocal/*.m4 -%if %{with_xmms} -%files -n xmms-flac -%license COPYING.GPL -%{_datadir}/applications/xmms-flac.desktop -%{xmms_inputdir}/libxmms-flac.so -%endif - %changelog * Fri Feb 19 2021 Adam Jackson - 1.3.3-7 - Fix the previous change to actually build in RHEL diff --git a/xmms-flac.desktop b/xmms-flac.desktop deleted file mode 100644 index 64b823d..0000000 --- a/xmms-flac.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=XMMS -Exec=xmms -p -e %F -Icon=xmms -MimeType=audio/x-flac;audio/flac; -Categories=AudioVideo;Player; -Terminal=false -Type=Application -NoDisplay=true