From ffaa912975f8f31b0daa221a1d604f65fc9b429d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 2 Jun 2018 14:27:43 +0200 Subject: RPM: disable lame support when building on OBS --- redhat/applications/k3b/k3b-14.0.0.spec | 3 +++ redhat/applications/kaffeine/kaffeine-14.0.0.spec | 2 ++ redhat/applications/tderadio/tderadio-14.0.0.spec | 21 ++++++++++++++++++--- .../tdemultimedia/tdemultimedia-14.0.0-cmake.spec | 3 ++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec index 9944a1fa6..9970464d2 100644 --- a/redhat/applications/k3b/k3b-14.0.0.spec +++ b/redhat/applications/k3b/k3b-14.0.0.spec @@ -191,6 +191,7 @@ BuildRequires: libmad-devel %endif # LAME support +%if 0%{?opensuse_bs} == 0 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %define with_lame 1 %if 0%{?mgaversion} || 0%{?mdkversion} @@ -211,6 +212,7 @@ BuildRequires: libmp3lame-devel BuildRequires: lame-devel %endif %endif +%endif # FFMPEG support %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} @@ -445,6 +447,7 @@ fi -DWITH_MUSICBRAINZ="OFF" \ -DWITH_FFMPEG_ALL_CODECS="ON" \ -DWITH_MUSEPACK="ON" \ + -DWITH_LAME="%{!?with_lame:OFF}%{?with_lame:ON}" \ .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec index a52e93fcb..d38e6a27d 100644 --- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec +++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec @@ -154,6 +154,7 @@ BuildRequires: libxine-devel %endif # LAME support +%if 0%{?opensuse_bs} == 0 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} %define with_lame 1 @@ -175,6 +176,7 @@ BuildRequires: libmp3lame-devel BuildRequires: lame-devel %endif %endif +%endif # WTF support %if 0%{?mgaversion} || 0%{?mdkversion} diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec index 8b1cb0393..8754b1fd0 100644 --- a/redhat/applications/tderadio/tderadio-14.0.0.spec +++ b/redhat/applications/tderadio/tderadio-14.0.0.spec @@ -83,15 +83,30 @@ BuildRequires: brp-check-trinity BuildRequires: libsndfile-devel %{?with_lirc:BuildRequires: lirc-devel} +# LAME support +%if 0%{?opensuse_bs} == 0 +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} +%define with_lame 1 + %if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}twolame-devel +%if 0%{?pclinuxos} +BuildRequires: liblame-devel +%else +%if 0%{?mgaversion} >= 6 +BuildRequires: %{_lib}mp3lame-devel +%else +BuildRequires: %{_lib}lame-devel +%endif +%endif %endif %if 0%{?suse_version} -BuildRequires: libtwolame-devel +BuildRequires: libmp3lame-devel %endif -%if 0%{?rhel} || 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} BuildRequires: lame-devel %endif +%endif +%endif Obsoletes: trinity-kradio < %{version}-%{release} Provides: trinity-kradio = %{version}-%{release} diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec index 1e3cec7a1..97540d5d4 100644 --- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec +++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec @@ -185,6 +185,7 @@ BuildRequires: libxine-devel %endif # LAME support +%if 0%{?opensuse_bs} == 0 %define with_lame 1 %if 0%{?mgaversion} || 0%{?mdkversion} @@ -198,10 +199,10 @@ BuildRequires: %{_lib}lame-devel %endif %endif %endif - %if 0%{?suse_version} BuildRequires: libmp3lame-devel %endif +%endif # IDN support BuildRequires: libidn-devel -- cgit v1.2.1