RHEL/Fedora: some more updates for MGA2/MDV2011 building

1 files changed, 166 insertions, 136 deletions

diff --git a/redhat/applications/amarok/trinity-amarok.spec b/redhat/applications/amarok/trinity-amarok.spec
index 4ebe7ed1e..3252bd4fa 100644
--- a/redhat/applications/amarok/trinity-amarok.spec
+++ b/redhat/applications/amarok/trinity-amarok.spec
@@ -1,25 +1,31 @@
 # Basic package informations
 %define kdecomp amarok
-%define version 1.4.10
-%define release 6
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires:	cmake >= 2.8
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_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
 
-Name:    trinity-%{kdecomp}
-Summary: Media player
-Version: %{version}
-Release: %{release}%{?dist}%{?_variant}
+%define _docdir %{tde_docdir}
+
+
+Name:		trinity-%{kdecomp}
+Summary:	Media player
+Version:	1.4.10
+Release:	6%{?dist}%{?_variant}
 
 Group: 	    Applications/Multimedia
 License:    GPLv2+
@@ -78,36 +84,42 @@ BuildRequires:  postgresql-devel
 BuildRequires:  SDL-devel
 BuildRequires:  taglib-devel
 BuildRequires:	sqlite-devel
-BuildRequires:	trinity-libkarma-devel karma-sharp
+%if 0%{?rhel} || 0%{?fedora}
+BuildRequires:	trinity-libkarma-devel
+BuildRequires:	trinity-karma-sharp
+%else
+BuildRequires:	libkarma-devel
+BuildRequires:	karma-sharp
+%endif
 # not used anymore, in favor of libvisual ? -- Rex
 #%{?fedora:BuildRequires:  xmms-devel}
 BuildRequires:	dbus-devel
 BuildRequires:	dbus-tqt-devel
 BuildRequires:	trinity-akode-devel
+BuildRequires:	trinity-konqueror-devel
+
+# ruby
+BuildRequires:	ruby
+BuildRequires:  ruby-devel
 
 # To open the selected browser, works with Patch2
 Requires:  xdg-utils
 Requires(post): xdg-utils
 Requires(postun): xdg-utils
 
-%if "%{?_prefix}" == "%{_usr}"
-Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
-
-Obsoletes: amarok-devel < %{version}-%{release}
-%if 0%{?fedora} > 6 && 0%{?fedora} < 9
-# need to keep this around for previous releases, so not to break multilib compat.
-Provides:  amarok-devel = %{version}-%{release}
+# xine-lib
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:  libxine-devel
+%else
+BuildRequires:  xine-lib-devel
 %endif
 
-# engines, etc...
-# old, obsolete ones: arts, akode
-Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
-%endif
 
-# xine-lib
-BuildRequires:  xine-lib-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}inotifytools-devel
+%else
+%endif
 
-Provides: %{name}-engine-xine = %{version}-%{release}
 
 %description
 Amarok is a multimedia player with:
@@ -115,38 +127,140 @@ Amarok is a multimedia player with:
  - plays all formats supported by the various engines
  - audio effects, like reverb and compressor
  - compatible with the .m3u and .pls formats for playlists
- - nice GUI, integrates into the KDE look, but with a unique touch
+ - nice GUI, integrates into the TDE look, but with a unique touch
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc COPYING AUTHORS ChangeLog README
+%{tde_bindir}/amarok
+%{tde_bindir}/amarokapp
+%{tde_bindir}/amarokcollectionscanner
+%{tde_bindir}/amarok_proxy.rb
+%{tde_datadir}/apps/amarok/
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/applications/kde/*.desktop
+%{tde_datadir}/servicetypes/*.desktop
+%{tde_datadir}/apps/profiles/amarok.profile.xml
+%{tde_datadir}/config/amarokrc
+%{tde_datadir}/config.kcfg/*.kcfg
+%{tde_datadir}/services/amarokitpc.protocol
+%{tde_datadir}/services/amaroklastfm.protocol
+%{tde_datadir}/services/amarokpcast.protocol
+# -libs ?  -- Rex
+%{tde_libdir}/libamarok.*
+# DAAP
+%{tde_bindir}/amarok_daapserver.rb
+%{tde_tdelibdir}/libamarok_daap-mediadevice.*
+%{tde_datadir}/services/amarok_daap-mediadevice.desktop
+# Mass-storage
+%{tde_datadir}/services/amarok_massstorage-device.desktop
+%{tde_tdelibdir}/libamarok_massstorage-device.*
+# NFS
+%{tde_datadir}/services/amarok_nfs-device.desktop
+%{tde_tdelibdir}/libamarok_nfs-device.*
+# SMB
+%{tde_datadir}/services/amarok_smb-device.desktop
+%{tde_tdelibdir}/libamarok_smb-device.*
+# IPod
+%{tde_datadir}/services/amarok_ipod-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_ipod-mediadevice.*
+# VFAT
+%{tde_datadir}/services/amarok_generic-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_generic-mediadevice.*
+# iRiver
+%{tde_datadir}/services/amarok_ifp-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_ifp-mediadevice.*
+# Creative Zen
+%{tde_datadir}/services/amarok_njb-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_njb-mediadevice.*
+# MTP players
+%{tde_datadir}/services/amarok_mtp-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_mtp-mediadevice.*
+# Rio Karma
+%{tde_datadir}/services/amarok_riokarma-mediadevice.desktop
+%{tde_tdelibdir}/libamarok_riokarma-mediadevice.*
+# Void engine (noop)
+%{tde_datadir}/services/amarok_void-engine_plugin.desktop
+%{tde_tdelibdir}/libamarok_void-engine_plugin.*
+# Xine engine
+%{tde_datadir}/services/amarok_xine-engine.desktop
+%{tde_tdelibdir}/libamarok_xine-engine.*
+## Gstreamer engine
+#%{tde_datadir}/services/amarok_gst10engine_plugin.desktop
+#%{tde_tdelibdir}/libamarok_gst10engine_plugin.*
+# YAUAP
+%{tde_datadir}/services/amarok_yauap-engine_plugin.desktop
+%{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
+# AKODE
+%{tde_datadir}/services/amarok_aKode-engine.desktop
+%{tde_tdelibdir}/libamarok_aKode-engine.*
+
+%post
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
 
+%postun
+/sbin/ldconfig
+xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+xdg-desktop-menu forceupdate 2> /dev/null || :
+
+
+##########
 
 %package ruby
 Summary:	%{name} Ruby support
-Group: 	    Applications/Multimedia
-BuildRequires:  ruby-devel ruby
+Group:		Applications/Multimedia
 Requires: %{name} = %{version}-%{release}
 # For dir ownership and some default plugins (lyrics)
 Requires:  ruby
+
 %description ruby
 %{summary}.
 
+%files ruby
+%defattr(-,root,root,-)
+%{tde_libdir}/ruby_lib/*
+
+##########
 
 %package konqueror
-Summary: Amarok konqueror (service menus, sidebar) support
-Group:   Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Summary:	Amarok konqueror (service menus, sidebar) support
+Group:		Applications/Multimedia
+
+Requires:	%{name} = %{version}-%{release}
+Requires:	trinity-konqueror
+
 %description konqueror
 %{summary}.
 
+%files konqueror
+%defattr(-,root,root,-)
+%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%{tde_tdelibdir}/konqsidebar_universalamarok.*
+%{tde_datadir}/apps/konqsidebartng/*/amarok.desktop
+
+
+##########
+
 %package visualisation
 Summary:    Visualisation plugins for Amarok
 Group:      Applications/Multimedia
 Requires:   %{name} = %{version}-%{release}
 # No plugins by default, we need libvisual-plugins
 #Requires:   libvisual-plugins
+
 %description visualisation
 Amarok can use visualisation plugins from different origins.
 Right now, only xmms is supported, which means that you can
 use any of xmms' visualisation plugins with Amarok.
 
+%files visualisation
+%defattr(-,root,root,-)
+%{tde_bindir}/amarok_libvisual
+
+##########
+
 
 %prep
 %setup -q -n applications/amarok
@@ -162,14 +276,24 @@ use any of xmms' visualisation plugins with Amarok.
 
 
 %build
-unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt:%{tde_tdeincludedir}"
 
+%if 0%{?rhel} || 0%{?fedora}
 %__mkdir_p build
 cd build
+%endif
+
 %cmake \
+	-DBIN_INSTALL_DIR=%{tde_bindir} \
+	-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+	-DLIB_INSTALL_DIR=%{tde_libdir} \
+	-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+	-DCMAKE_SKIP_RPATH="OFF" \
+	-DQT_LIBRARY_DIRS="${QTLIB}" \
 	-DWITH_LIBVISUAL=ON \
 	-DWITH_KONQSIDEBAR=ON \
 	-DWITH_XINE=ON \
@@ -182,7 +306,6 @@ cd build
 	-DWITH_RIOKARMA=ON \
 	-DWITH_DAAP=ON \
 	-DBUILD_ALL=ON \
-	-DQT_LIBRARY_DIRS="${QTLIB}" \
 	..
 
 %__make %{?_smp_mflags}
@@ -191,129 +314,36 @@ cd build
 %__rm -fr $RPM_BUILD_ROOT
 %__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
-# desktop files
-desktop-file-install  --vendor "" \
-        --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
-        --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarok.desktop
 
 # unpackaged files
-%__rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+%__rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
 
 
 # HTML
-for lang_dir in $RPM_BUILD_ROOT%{tde_docdir}/HTML/* ; do
+for lang_dir in $RPM_BUILD_ROOT%{tde_tdedocdir}/HTML/* ; do
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     [ "$lang" == "en" ] && d=en/amarok || d=$lang
-    echo "%lang($lang) %doc %{tde_docdir}/HTML/$d" >> %{name}.lang
+    echo "%lang($lang) %doc %{tde_tdedocdir}/HTML/$d" >> %{name}.lang
   fi
 done
 
 # Locales
-for locale in $RPM_BUILD_ROOT%{_datadir}/locale/* ; do
+for locale in $RPM_BUILD_ROOT%{tde_datadir}/locale/* ; do
   if [ -r $locale/LC_MESSAGES/amarok.mo ]; then
     lang=$(basename $locale)
-    echo "%lang($lang) %{_datadir}/locale/$lang/LC_MESSAGES/amarok.mo" >> %{name}.lang
+    echo "%lang($lang) %{tde_datadir}/locale/$lang/LC_MESSAGES/amarok.mo" >> %{name}.lang
   fi
 done
 
 
-%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
 
 %clean
 %__rm -fr $RPM_BUILD_ROOT
 
 
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS ChangeLog README
-%{_bindir}/amarok
-%{_bindir}/amarokapp
-%{_bindir}/amarokcollectionscanner
-%{_bindir}/amarok_proxy.rb
-%{_datadir}/apps/amarok/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/kde/*.desktop
-%{_datadir}/servicetypes/*.desktop
-%{_datadir}/apps/profiles/amarok.profile.xml
-%{_datadir}/config/amarokrc
-%{_datadir}/config.kcfg/*.kcfg
-%{_datadir}/services/amarokitpc.protocol
-%{_datadir}/services/amaroklastfm.protocol
-%{_datadir}/services/amarokpcast.protocol
-# -libs ?  -- Rex
-%{_libdir}/libamarok.*
-# DAAP
-%{_bindir}/amarok_daapserver.rb
-%{tde_libdir}/libamarok_daap-mediadevice.*
-%{_datadir}/services/amarok_daap-mediadevice.desktop
-# Mass-storage
-%{_datadir}/services/amarok_massstorage-device.desktop
-%{tde_libdir}/libamarok_massstorage-device.*
-# NFS
-%{_datadir}/services/amarok_nfs-device.desktop
-%{tde_libdir}/libamarok_nfs-device.*
-# SMB
-%{_datadir}/services/amarok_smb-device.desktop
-%{tde_libdir}/libamarok_smb-device.*
-# IPod
-%{_datadir}/services/amarok_ipod-mediadevice.desktop
-%{tde_libdir}/libamarok_ipod-mediadevice.*
-# VFAT
-%{_datadir}/services/amarok_generic-mediadevice.desktop
-%{tde_libdir}/libamarok_generic-mediadevice.*
-# iRiver
-%{_datadir}/services/amarok_ifp-mediadevice.desktop
-%{tde_libdir}/libamarok_ifp-mediadevice.*
-# Creative Zen
-%{_datadir}/services/amarok_njb-mediadevice.desktop
-%{tde_libdir}/libamarok_njb-mediadevice.*
-# MTP players
-%{_datadir}/services/amarok_mtp-mediadevice.desktop
-%{tde_libdir}/libamarok_mtp-mediadevice.*
-# Rio Karma
-%{_datadir}/services/amarok_riokarma-mediadevice.desktop
-%{tde_libdir}/libamarok_riokarma-mediadevice.*
-# Void engine (noop)
-%{_datadir}/services/amarok_void-engine_plugin.desktop
-%{tde_libdir}/libamarok_void-engine_plugin.*
-# Xine engine
-%{_datadir}/services/amarok_xine-engine.desktop
-%{tde_libdir}/libamarok_xine-engine.*
-## Gstreamer engine
-#%{_datadir}/services/amarok_gst10engine_plugin.desktop
-#%{tde_libdir}/libamarok_gst10engine_plugin.*
-# YAUAP
-%{_datadir}/services/amarok_yauap-engine_plugin.desktop
-%{tde_libdir}/libamarok_yauap-engine_plugin.*
-# AKODE
-%{_datadir}/services/amarok_aKode-engine.desktop
-%{tde_libdir}/libamarok_aKode-engine.*
-
-%files ruby
-%defattr(-,root,root,-)
-%{_libdir}/ruby_lib/*
-
 
-%files konqueror
-%defattr(-,root,root,-)
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{tde_libdir}/konqsidebar_universalamarok.*
-%{_datadir}/apps/konqsidebartng/*/amarok.desktop
 
-%files visualisation
-%defattr(-,root,root,-)
-%{_bindir}/amarok_libvisual
 
 
 %changelog