RPM Packaging: massive update

2 files changed, 77 insertions, 76 deletions

diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode-14.0.0.spec
index 6c6ba8936..06231e7eb 100644
--- a/redhat/dependencies/akode/akode-14.0.0.spec
+++ b/redhat/dependencies/akode/akode-14.0.0.spec
@@ -41,6 +41,12 @@
 %define _variant .opt
 %endif
 
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%define libakode %{_lib}akode
+%else
+%define libakode libakode
+%endif
+
 Name:		trinity-akode 
 Summary: 	Audio-decoding framework 
 Group: 		System Environment/Libraries
@@ -48,24 +54,31 @@ 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:	cmake >= 2.8
+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
@@ -75,7 +88,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
@@ -88,12 +101,11 @@ BuildRequires: jack-audio-connection-kit-devel
 BuildRequires: libsamplerate-devel
 %endif
 
-%if 0
 # PULSEAUDIO support
 %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
@@ -102,21 +114,13 @@ BuildRequires: pulseaudio-libs-devel
 BuildRequires: pulseaudio-devel
 %endif
 %endif
-%endif
 
 # 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: cmake >= 2.8
-BuildRequires: libtool
 BuildRequires: alsa-lib-devel
 BuildRequires: libvorbis-devel
 BuildRequires: speex-devel
@@ -162,14 +166,15 @@ aKode also has the following audio outputs:
 Summary: Headers for developing programs that will use %{name} 
 Group:   Development/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-%{?_with_jack:Requires: %{name}-jack = %{?epoch:%{epoch}:}%{version}-%{release}}
-%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{?epoch:%{epoch}:}%{version}-%{release}}
-%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{?epoch:%{epoch}:}%{version}-%{release}}
-%{?_with_libmad:Requires: %{name}-libmad = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_jack:Requires: %{libakode}_jack_sink = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_pulseaudio:Requires: %{libakode}_polyp_sink = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_libsamplerate:Requires: %{libakode}_src_resampler = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_libmad:Requires: %{libakode}_mpeg_decoder  = %{?epoch:%{epoch}:}%{version}-%{release}}
 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,-)
@@ -177,7 +182,7 @@ This package contains the development files for Akode.
 %{_includedir}/*
 %{_libdir}/libakode.la
 %{_libdir}/libakode.so
-#%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/akode.pc
 
 %post devel
 /sbin/ldconfig
@@ -189,23 +194,24 @@ This package contains the development files for Akode.
 
 %if "%{?_with_jack}" != ""
 
-%package jack 
+%package -n %{libakode}_jack_sink
 Summary: Jack audio output backend for %{name}
 Group:   Development/Libraries
+Provides: libakode_jack_sink = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description jack 
+%description -n %{libakode}_jack_sink
 This package contains the Jack audio output backend for Akode.
 
-%files jack 
+%files -n %{libakode}_jack_sink
 %defattr(-,root,root,-)
 %{_libdir}/libakode_jack_sink.la
 %{_libdir}/libakode_jack_sink.so
 
-%post jack
+%post -n %{libakode}_jack_sink
 /sbin/ldconfig
 
-%postun jack
+%postun -n %{libakode}_jack_sink
 /sbin/ldconfig
 
 %endif
@@ -214,24 +220,25 @@ This package contains the Jack audio output backend for Akode.
 
 %if "%{?_with_pulseaudio}" != ""
 
-%package pulseaudio
+%package -n %{libakode}_polyp_sink
 Summary: Pulseaudio output backend for %{name}
 Group:   Development/Libraries
+Provides: libakode_polyp_sink = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description pulseaudio
+%description -n %{libakode}_polyp_sink
 This package contains the pulseaudio backend for Akode.
 Recommended for network transparent audio.
 
-%files pulseaudio
+%files -n %{libakode}_polyp_sink
 %defattr(-,root,root,-)
 %{_libdir}/libakode_polyp_sink.la
 %{_libdir}/libakode_polyp_sink.so
 
-%post pulseaudio
+%post -n %{libakode}_polyp_sink
 /sbin/ldconfig
 
-%postun pulseaudio
+%postun -n %{libakode}_polyp_sink
 /sbin/ldconfig
 
 %endif
@@ -241,25 +248,24 @@ Recommended for network transparent audio.
 # Packaged separately to keep main/core %{akode} package LGPL-clean.
 %if "%{?_with_libsamplerate:1}" == "1"
 
-%package libsamplerate 
+%package -n %{libakode}_src_resampler
 Summary: Resampler based on libsamplerate for %{name}
 Group:   Development/Libraries
-License: GPLv2+
+Provides: libakode_src_resampler = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description libsamplerate 
+%description -n %{libakode}_src_resampler 
 This package contains the samplerate decoder for Akode.
 
-# License: GPLv2+
-%files libsamplerate
+%files -n %{libakode}_src_resampler
 %defattr(-,root,root,-)
 %{_libdir}/libakode_src_resampler.la
 %{_libdir}/libakode_src_resampler.so
 
-%post libsamplerate
+%post -n %{libakode}_src_resampler
 /sbin/ldconfig
 
-%postun libsamplerate 
+%postun -n %{libakode}_src_resampler 
 /sbin/ldconfig
 
 %endif
@@ -268,22 +274,24 @@ This package contains the samplerate decoder for Akode.
 
 %if "%{?_with_libmad}" != ""
 
-%package libmad
+%package -n %{libakode}_mpeg_decoder
 Summary: Decoder based on libmad for %{name}
 Group:   Development/Libraries
+Provides: libakode_mpeg_decoder = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description libmad 
+%description -n %{libakode}_mpeg_decoder 
 This package contains the mad decoder for Akode.
 
-%files libmad
+%files -n %{libakode}_mpeg_decoder
+%defattr(-,root,root,-)
 %{_libdir}/libakode_mpeg_decoder.la
 %{_libdir}/libakode_mpeg_decoder.so
 
-%post libmad
+%post -n %{libakode}_mpeg_decoder
 /sbin/ldconfig
 
-%postun libmad 
+%postun -n %{libakode}_mpeg_decoder 
 /sbin/ldconfig
 
 %endif
@@ -297,7 +305,7 @@ This package contains the mad decoder for Akode.
 ##########
 
 %prep
-%setup -q -n akode
+%setup -q -n akode-2.0.2
 
 
 %build
@@ -323,7 +331,7 @@ fi
   -DWITH_LIBLTDL="OFF" \
   -DWITH_ALSA_SINK="ON" \
   %{!?_with_jack:-DWITH_JACK_SINK="OFF"} %{?_with_jack:-DWITH_JACK_SINK="ON"} \
-  %{!?_with_pulseaudio:-DWITH_POLYP_SINK="OFF"} %{?_with_pulseaudio:-DWITH_POLYP_SINK="ON"} \
+  %{!?_with_pulseaudio:-DWITH_PULSE_SINK="OFF"} %{?_with_pulseaudio:-DWITH_PULSE_SINK="ON"} \
   -DWITH_OSS_SINK="ON" \
   -DWITH_SUN_SINK="OFF" \
   \
@@ -337,21 +345,10 @@ fi
 %__make %{?_smp_mflags} || %__make
 
 
-#  %{?_with_flac} %{!?_with_flac:--without-flac} \
-#  %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
-#  --with-speex \
-#  --with-vorbis \
-#  --without-ffmpeg \
-#  %{?_with_libmad} %{!?_with_libmad:--without-libmad}
-
-
 %install
 %__rm -rf %{buildroot} 
 %__make install DESTDIR=%{?buildroot} -C build
 
-# unpackaged files
-#%__rm -f %{buildroot}%{tde_libdir}/*.a
-
 # rpmdocs
 for file in AUTHORS COPYING NEWS README TODO ; do
   test -s  "$file" && install -p -m644 -D "$file" "rpmdocs/$file"
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