Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

redhat/build/Makefile.r14

@@ -24,7 +24,7 @@ i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 
 
 # Dependencies
-arts:	tqtinterface
+arts:	tqtinterface esound
 	$(call buildpkg,dependencies/arts)
 
 avahi-tqt:	tqtinterface
@@ -122,6 +122,12 @@ tdewebdev:	tdebase tdesdk
 	$(call buildpkg,tdewebdev)
 
 # 3rd party libraries and tools
+esound:
+# Build on Mageia only
+ifneq ($(wildcard /etc/mageia-release),)
+	$(call buildpkg,3rdparty/esound)
+endif
+
 htdig:
 	$(call buildpkg,3rdparty/htdig)
 

redhat/build/get_installed_package_version.sh

@@ -12,6 +12,7 @@ case ${PKGNAME} in
   "trinity-"*) PKGNAME="${PKGNAME#trinity-}";;
   "qt3") [ -r /etc/mandriva-release ] && PKGNAME="qt3-common";;
   "curl") PKGNAME="trinity-libcurl";;
+  "esound") PKGNAME="$(rpm -E %_lib)esound";;
 esac
 
 VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" trinity-${PKGNAME} 2>/dev/null)

redhat/tdebase/tdebase-14.0.0.spec

@@ -222,6 +222,17 @@ Requires:	indexhtml
 %define tde_aboutpage /usr/share/mga/about/index.html
 %endif
 
+# Mageia 4 Theme
+%if 0%{?mgaversion} == 4
+Requires:	mageia-theme-Default
+%define tde_bg /usr/share/mga/backgrounds/default.jpg
+%define tde_starticon %{tde_datadir}/oxygen/scalable/mgabutton.svg
+
+Requires:	indexhtml
+%define tde_aboutlabel Mageia 4
+%define tde_aboutpage /usr/share/mga/about/index.html
+%endif
+
 # Mandriva 2011 Theme: "rosa"
 %if "%{distribution}" == "Mandriva Linux" && "%{?mdkversion}" == "201100"
 Requires:	mandriva-theme