Mageia 2: add support for MGA2 build in redhat packages

2 files changed, 129 insertions, 75 deletions

diff --git a/redhat/extras/akode/trinity-akode.spec b/redhat/extras/akode/trinity-akode.spec
index 7f24416ce..1395777de 100644
--- a/redhat/extras/akode/trinity-akode.spec
+++ b/redhat/extras/akode/trinity-akode.spec
@@ -1,10 +1,27 @@
-%define _prefix /opt/trinity
-%define _docdir %{_datadir}/doc
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE 3.5.13 specific building variables
+%define tde_bindir %{_prefix}/bin
+%define tde_datadir %{_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{_prefix}/include
+%define tde_libdir %{_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+
+%define tde_tdeappdir %{tde_datadir}/applications/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 Summary: Audio-decoding framework 
 Name:	 trinity-akode 
 Version: 2.0.2
-Release: 1%{?dist}
+Release: 1%{?dist}%{?_variant}
 
 License: LGPLv2+
 Group: 	 System Environment/Libraries
@@ -30,19 +47,26 @@ Patch10: akode-autotools.patch
 %define _with_libsamplerate --with-libsamplerate
 
 # Pulseaudio is not available on RHEL 5 and earlier
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion}
 %define _with_pulseaudio --with-pulseaudio
 %endif
 
 BuildRequires: automake libtool
 BuildRequires: alsa-lib-devel
-%{?_with_flac:BuildRequires: flac-devel}
-%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
 %{?_with_libsamplerate:BuildRequires: libsamplerate-devel}
 BuildRequires: libvorbis-devel
-%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
 BuildRequires: speex-devel
 
+%if 0%{?mgaversion}
+%{?_with_jack:BuildRequires: %{_lib}jack-devel}
+%{?_with_flac:BuildRequires: %{_lib}flac-devel}
+%{?_with_pulseaudio:BuildRequires: %{_lib}pulseaudio-devel}
+%else
+%{?_with_flac:BuildRequires: flac-devel}
+%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
+%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel}
+%endif
+
 %description
 aKode is a simple audio-decoding frame-work that provides a uniform
 interface to decode the most common audio-formats. It also has a direct
@@ -100,9 +124,9 @@ Requires: %{name} = %{version}-%{release}
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
-%__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+%__sed -i "admin/acinclude.m4.in" \
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -110,6 +134,10 @@ Requires: %{name} = %{version}-%{release}
 
 %build
 %configure \
+  --bindir=%{tde_bindir} \
+  --libdir=%{tde_libdir} \
+  --includedir=%{tde_includedir} \
+  --datadir=%{tde_datadir} \
   --disable-static \
   --enable-shared \
   --disable-debug --disable-warnings --disable-dependency-tracking \
@@ -136,9 +164,7 @@ Requires: %{name} = %{version}-%{release}
 %__make install DESTDIR=%{buildroot}
 
 # unpackaged files
-%__rm -f %{buildroot}%{_libdir}/lib*.la
 %__rm -f %{buildroot}%{_libdir}/lib*.a
-#rm -f %{buildroot}%{_libdir}/libakode_oss_sink.so
 
 # rpmdocs
 for file in AUTHORS COPYING NEWS README TODO ; do
@@ -150,49 +176,68 @@ done
 %__rm -rf %{buildroot} 
 
 
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun 
+/sbin/ldconfig
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
 %doc rpmdocs/* 
-%{_bindir}/akodeplay
-%{_libdir}/libakode.so.*
-%{_libdir}/libakode_alsa_sink.so
-%{_libdir}/libakode_mpc_decoder.so
-%{_libdir}/libakode_oss_sink.so
-%{_libdir}/libakode_xiph_decoder.so
+%{tde_bindir}/akodeplay
+%{tde_libdir}/libakode.so.*
+%{tde_libdir}/libakode_alsa_sink.la
+%{tde_libdir}/libakode_alsa_sink.so
+%{tde_libdir}/libakode_mpc_decoder.la
+%{tde_libdir}/libakode_mpc_decoder.so
+%{tde_libdir}/libakode_oss_sink.la
+%{tde_libdir}/libakode_oss_sink.so
+%{tde_libdir}/libakode_xiph_decoder.la
+%{tde_libdir}/libakode_xiph_decoder.so
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/akode-config
-%{_includedir}/*
-%{_libdir}/libakode.so
-%{_libdir}/pkgconfig/*.pc
+%{tde_bindir}/akode-config
+%{tde_includedir}/*
+%{tde_libdir}/libakode.la
+%{tde_libdir}/libakode.so
+%{tde_libdir}/pkgconfig/*.pc
 
 %if "%{?_with_jack:1}" == "1"
 %files jack 
 %defattr(-,root,root,-)
-%{_libdir}/libakode_jack_sink.so
+%{tde_libdir}/libakode_jack_sink.la
+%{tde_libdir}/libakode_jack_sink.so
 %endif
 
 # License: GPLv2+
 %if "%{?_with_libsamplerate:1}" == "1"
 %files libsamplerate
 %defattr(-,root,root,-)
-%{_libdir}/libakode_src_resampler.so
+%{tde_libdir}/libakode_src_resampler.la
+%{tde_libdir}/libakode_src_resampler.so
 %endif
 
 %if "%{?_with_pulseaudio:1}" == "1"
 %files pulseaudio
 %defattr(-,root,root,-)
-%{_libdir}/libakode_polyp_sink.so
+%{tde_libdir}/libakode_polyp_sink.la
+%{tde_libdir}/libakode_polyp_sink.so
 %endif
 
 
 %changelog
+* Tue Jul 30 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-2
+- Re-adds '.la' files
+
 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> 2.0.2-1
 - Port to TDE 3.5.13
 - Based on spec file from Fedora 9 'akode-2.0.2-5'
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index ade6d7490..faf09237e 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -6,7 +6,7 @@
 
 Name:		trinity-desktop
 Version:	3.5.13
-Release:	4%{?dist}%{?_variant}
+Release:	5%{?dist}%{?_variant}
 License:	GPL
 Summary:	Meta-package to install TDE
 Group:		User Interface/Desktops
@@ -22,24 +22,29 @@ BuildArch:	noarch
 Source0:	trinity-3.5.13-fedora.repo
 Source1:	trinity-3.5.13-rhel.repo
 
-Requires:	trinity-kdeaccessibility >= %{version}
-Requires:	trinity-kdeaddons >= %{version}
-Requires:	trinity-kdeadmin >= %{version}
-Requires:	trinity-kdeartwork >= %{version}
-Requires:	trinity-kdeartwork-icons >= %{version}
-Requires:	trinity-kdebase >= %{version}
-Requires:	trinity-kdebindings >= %{version}
-Requires:	trinity-kdeedu >= %{version}
-Requires:	trinity-kdegames >= %{version}
-Requires:	trinity-kdegraphics >= %{version}
-Requires:	trinity-kdemultimedia >= %{version}
-Requires:	trinity-kdenetwork >= %{version}
-Requires:	trinity-kdepim >= %{version}
-Requires:	trinity-kdeutils >= %{version}
-Requires:	trinity-kdetoys >= %{version}
-Requires:	trinity-repo >= %{version}
+Obsoletes:	trinity-desktop-extras < %{version}-%{release}
+Provides:	trinity-desktop-extras = %{version}-%{release}
+
+Requires:	trinity-tdeaccessibility >= %{version}
+Requires:	trinity-tdeaddons >= %{version}
+Requires:	trinity-tdeadmin >= %{version}
+Requires:	trinity-tdeartwork >= %{version}
+Requires:	trinity-tdebase >= %{version}
+Requires:	trinity-tdebindings >= %{version}
+Requires:	trinity-tdeedu >= %{version}
+Requires:	trinity-tdegames >= %{version}
+Requires:	trinity-tdegraphics >= %{version}
+Requires:	trinity-tdemultimedia >= %{version}
+Requires:	trinity-tdenetwork >= %{version}
+Requires:	trinity-tdepim >= %{version}
+Requires:	trinity-tdeutils >= %{version}
+Requires:	trinity-tdetoys >= %{version}
 Requires:	hal
 
+%if 0%{?rhel} || 0%{?fedora}
+Requires:	trinity-repo >= %{version}
+%endif
+
 %description
 The TDE project aims to keep the KDE3.5 computing style alive, as well as 
 polish off any rough edges that were present as of KDE 3.5.10. Along 
@@ -49,42 +54,43 @@ Toward that end, significant new enhancements have already been made in
 areas such as display control, network connectivity, user 
 authentication, and much more!
 
-%package dev
+%files
+
+##########
+
+%package devel
 Group:		User Interface/Desktops
 Summary:	Meta-package to install TDE development tools
 
-Requires:	trinity-kdesdk >= %{version}
-Requires:	trinity-kdevelop >= %{version}
-Requires:	trinity-kdewebdev >= %{version}
+Obsoletes:	trinity-desktop-dev < %{version}-%{release}
+Provides:	trinity-desktop-dev = %{version}-%{release}
 
-%description dev
-%{summary}
+Requires:	trinity-tdesdk >= %{version}
+Requires:	trinity-tdevelop >= %{version}
+Requires:	trinity-tdewebdev >= %{version}
 
-%package extras
-Group:		User Interface/Desktops
-Summary:	Meta-package to install extra TDE packages
+%description devel
+%{summary}
 
-Requires:	trinity-kdeaddons-extras >= %{version}
-Requires:	trinity-kdebase-extras >= %{version}
-Requires:	trinity-kdegraphics-extras >= %{version}
-Requires:	trinity-kdemultimedia-extras >= %{version}
-#Requires:	trinity-kdenetwork-extras >= %{version}
-Requires:	trinity-kdeutils-extras >= %{version}
+%files devel
 
-%description extras
-%{summary}
+##########
 
 %package all
 Group:		User Interface/Desktops
 Summary:	Meta-package to install all TDE packages
 
-Requires:	%{name} == %{version}
-Requires:	%{name}-dev == %{version}
-Requires:	%{name}-extras == %{version}
+Requires:	%{name} = %{version}
+Requires:	%{name}-devel = %{version}
 
 %description all
 %{summary}
 
+%files all
+
+##########
+
+%if 0%{?rhel} || 0%{?fedora}
 %package -n trinity-repo
 Group:		User Interface/Desktops
 Summary:	Yum configuration files for Trinity
@@ -92,6 +98,13 @@ Summary:	Yum configuration files for Trinity
 %description -n trinity-repo
 %{summary}
 
+%files -n trinity-repo
+%{_sysconfdir}/yum.repos.d/*.repo
+%endif
+
+
+##########
+
 %prep
 
 %build
@@ -115,20 +128,16 @@ Summary:	Yum configuration files for Trinity
   >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-el%{rhel}.repo
 %endif
 
+%if 0%{?fedora} || 0%{?rhel}
 %__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo
-
-%files
-
-%files dev
-
-%files extras
-
-%files all
-
-%files -n trinity-repo
-%{_sysconfdir}/yum.repos.d/*.repo
+%endif
 
 %changelog
+* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
+- Updates to reflect new packages names
+- Add Mageia 2 support
+- Removes 'extras' packages
+
 * Wed Jun 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
 - Enable mirrorlist