1 files changed, 23 insertions, 19 deletions

diff --git a/redhat/dependencies/akode/akode-3.5.13.2.spec b/redhat/dependencies/akode/akode-3.5.13.2.spec
index 89b2546e3..57c5ed631 100644
--- a/redhat/dependencies/akode/akode-3.5.13.2.spec
+++ b/redhat/dependencies/akode/akode-3.5.13.2.spec
@@ -21,7 +21,9 @@
 
 # TDE variables
 %define tde_epoch 1
+%if "%{?tde_version}" == ""
 %define tde_version 3.5.13.2
+%endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -46,24 +48,32 @@ Epoch:		%{tde_epoch}
 Version:	2.0.2
 Release:	1%{?dist}%{?_variant}
 URL:		http://www.kde-apps.org/content/show.php?content=30375
-
-License:	LGPLv2+
 #URL:		http://carewolf.com/akode/  
 
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
 Source0:	akode-%{tde_version}.tar.gz
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:  gcc-c++
+BuildRequires:	libtool
+
+# TQT support
+BuildRequires:	libtqt4-devel
+BuildRequires:	trinity-filesystem >= %{tde_version}
 
 # FLAC support
 %define _with_flac --with-flac
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
 BuildRequires: libflac-devel
-%else
-BuildRequires: %{_lib}flac-devel
-%endif
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: flac-devel
@@ -73,7 +83,7 @@ BuildRequires: flac-devel
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define _with_jack --with-jack
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}jack-devel
+BuildRequires: libjack-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: jack-audio-connection-kit-devel
@@ -90,7 +100,7 @@ BuildRequires: libsamplerate-devel
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define _with_pulseaudio --with-pulseaudio
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}pulseaudio-devel
+BuildRequires: libpulseaudio-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires: pulseaudio-libs-devel
@@ -103,16 +113,9 @@ BuildRequires: pulseaudio-devel
 # MAD support
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %define _with_libmad --with-libmad
-%if 0%{?mdkversion} || 0%{?mgaversion}
-BuildRequires:		%{_lib}mad-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 BuildRequires:		libmad-devel
 %endif
-%endif
-
 
-BuildRequires: automake libtool
 BuildRequires: alsa-lib-devel
 BuildRequires: libvorbis-devel
 BuildRequires: speex-devel
@@ -166,6 +169,7 @@ Requires: pkgconfig
 
 %description devel
 This package contains the development files for Akode.
+It is needed if you intend to build an application linked against Akode.
 
 %files devel
 %defattr(-,root,root,-)
@@ -240,13 +244,11 @@ Recommended for network transparent audio.
 %package libsamplerate 
 Summary: Resampler based on libsamplerate for %{name}
 Group:   Development/Libraries
-License: GPLv2+
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libsamplerate 
 This package contains the samplerate decoder for Akode.
 
-# License: GPLv2+
 %files libsamplerate
 %defattr(-,root,root,-)
 %{tde_libdir}/libakode_src_resampler.la
@@ -273,6 +275,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 This package contains the mad decoder for Akode.
 
 %files libmad
+%defattr(-,root,root,-)
 %{tde_libdir}/libakode_mpeg_decoder.la
 %{tde_libdir}/libakode_mpeg_decoder.so
 
@@ -301,6 +304,7 @@ This package contains the mad decoder for Akode.
 
 
 %build
+unset QTDIR QTINC QTLIB
 export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H"
 
 %configure \
@@ -328,12 +332,12 @@ export CXXFLAGS="${RPM_OPT_FLAGS} -DHAVE_STDINT_H"
   --without-ffmpeg \
   %{?_with_libmad} %{!?_with_libmad:--without-libmad}
 
-%__make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 %__rm -rf %{buildroot} 
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{?buildroot}
 
 # unpackaged files
 %__rm -f %{buildroot}%{tde_libdir}/*.a