From cb917600ba76c2d581ad75d35c99299dd9fb0d1d1b2e230e1847080a909a4989 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Mon, 28 Aug 2017 10:47:01 +0000
Subject: [PATCH] - Remove lame/mad/twolame conditional because it is always
 present

OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=2
---
 mpd.spec | 40 +---------------------------------------
 1 file changed, 1 insertion(+), 39 deletions(-)

diff --git a/mpd.spec b/mpd.spec
index 1eecd58..35c287e 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -18,9 +18,6 @@
 
 
 %bcond_with    faad
-%bcond_with    lame
-%bcond_with    mad
-%bcond_with    twolame
 
 %if !%{defined _userunitdir}
 %define _userunitdir /usr/lib/systemd/user
@@ -42,27 +39,16 @@ Patch1:         mpd-configh.patch
 BuildRequires:  automake
 BuildRequires:  autoconf
 BuildRequires:  pkg-config
-%if 0%{?suse_version} > 1320
 BuildRequires:  libboost_headers-devel
-%else
-BuildRequires:  boost-devel
-%endif
 #uildRequires:  cdrkit-cdrtools-compat
 %if 0%{?suse_version} > 1320
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 %else
-# mpd requires C++14 support.
-%if 0%{?sle_version} == 120100
-# Leap 42.1
-BuildRequires:  gcc5
-BuildRequires:  gcc5-c++
-%else
 # Leap 42.2+ / SLE12SP2Backports
 BuildRequires:  gcc6
 BuildRequires:  gcc6-c++
 %endif
-%endif
 BuildRequires:  libcue-devel
 BuildRequires:  libmikmod-devel
 # MPD_ENABLE_AUTO_LIB
@@ -70,9 +56,7 @@ BuildRequires:  pkgconfig(bzip2)
 %if %{with faad}
 BuildRequires:  faad2-devel
 %endif
-%if %{with lame}
 BuildRequires:  libmp3lame-devel
-%endif
 # MPD_ENABLE_AUTO_PKG
 BuildRequires:  pkgconfig(alsa) >= 0.9.0
 BuildRequires:  pkgconfig(ao)
@@ -100,9 +84,7 @@ BuildRequires:  pkgconfig(libmpg123)
 BuildRequires:  pkgconfig(libpulse) >= 0.9.16
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libupnp)
-%if %{with mad}
 BuildRequires:  pkgconfig(mad)
-%endif
 BuildRequires:  pkgconfig(ogg)
 BuildRequires:  pkgconfig(openal)
 BuildRequires:  pkgconfig(opus)
@@ -113,9 +95,7 @@ BuildRequires:  pkgconfig(smbclient) >= 0.2
 BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  pkgconfig(soxr)
 BuildRequires:  pkgconfig(sqlite3) >= 3.7.3
-%if %{with twolame}
 BuildRequires:  pkgconfig(twolame)
-%endif
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(vorbisenc)
 BuildRequires:  pkgconfig(wavpack)
@@ -153,25 +133,14 @@ Please read README.mpd how to configure it.
 export CC=gcc
 export CXX=g++
 %else
-# mpd requires C++14 support.
-%if 0%{?sle_version} == 120100
-# Leap 42.1
-export CC=gcc-5
-export CXX=g++-5
-%else
 # Leap 42.2+ / SLE12SP2Backports
 export CC=gcc-6
 export CXX=g++-6
 %endif
-%endif
-#Need to run as makefile.in built with later version of automake. 
-[ -x autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
+NOCONFIGURE=1 ./autogen.sh
 %configure \
         --disable-sidplay \
         --disable-aac \
-        --disable-mad \
-        --disable-lame-encoder \
-        --disable-twolame-encoder \
         \
     --enable-syslog \
     --enable-eventfd \
@@ -235,9 +204,7 @@ export CXX=g++-6
     --enable-flac \
     --enable-fluidsynth \
     --enable-gme \
-%if %{with mad}
     --enable-mad \
-%endif
     --enable-mpg123 \
     --enable-modplug \
     --enable-opus \
@@ -247,12 +214,8 @@ export CXX=g++-6
     --disable-wildmidi \
     --enable-shine-encoder \
     --enable-vorbis-encoder \
-%if %{with lame}
     --enable-lame-encoder \
-%endif
-%if %{with twolame}
     --enable-twolame-encoder \
-%endif
     --enable-alsa \
     --disable-roar \
     --disable-sndio \
@@ -284,7 +247,6 @@ ln -s service %{buildroot}%{_sbindir}/rcmpd
 %pre
 # add mpd user only when installing first time
 getent passwd mpd >/dev/null || useradd -r -g audio -d /var/lib/mpd -s /sbin/nologin -c "user for mpd" mpd
-exit 0
 %service_add_pre mpd.service
 
 %post