RHEL/Fedora: add support for MGA2/MDV2011 in many applications

1 files changed, 56 insertions, 40 deletions

diff --git a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
index 17fd66486..ed156aba8 100644
--- a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
+++ b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
@@ -2,19 +2,27 @@
 %define kdecomp kde-systemsettings
 
 # 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
-
 # Currently, menu files under /etc/xdg conflict with KDE4
-%define _sysconfdir %{_prefix}/etc
+%define tde_sysconfdir %{tde_prefix}/etc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%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_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
 
 
 Name:		trinity-systemsettings
@@ -29,7 +37,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:		%{_prefix}
+Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -56,8 +64,8 @@ Control Centre with an improved user interface.
 # 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"
+  -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"
@@ -66,57 +74,65 @@ Control Centre with an improved user interface.
 
 %build
 unset QTDIR; . /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt \
-    --enable-closure
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --sysconfdir=%{tde_sysconfdir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt \
+  --enable-closure
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-%__install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/desktop-directories/
+%__install -D -m 644 %{SOURCE1} %{buildroot}%{tde_datadir}/desktop-directories/
+
+# Unwanted files
+%__rm -f %{buildroot}%{tde_datadir}/applications/kde/kcmfontinst.desktop
+%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-power.directory
+%__rm -f %{buildroot}%{tde_datadir}/desktop-directories/kde-settings-system.directory
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+xdg-user-dirs-update
 
 %postun
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+xdg-user-dirs-update
 
 %files
 %defattr(-,root,root,-)
 %doc README TODO
-%{_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
-%{_sysconfdir}/xdg/menus/system-settings.menu
-%{_bindir}/systemsettings
-%{_datadir}/applications/kde/audioencoding.desktop
-%{_datadir}/applications/kde/defaultapplication.desktop
-%{_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop
-%{_datadir}/applications/kde/laptoppowermanagement.desktop
-%{_datadir}/applications/kde/medianotifications.desktop
-%{_datadir}/applications/kde/systemsettings.desktop
-%{_datadir}/apps/systemsettings/systemsettingsui.rc
-%{_datadir}/config/systemsettingsrc
-%{_datadir}/desktop-directories/*.directory
-%{_datadir}/icons/crystalsvg/*/apps/systemsettings.png
-
-%exclude %{_datadir}/applications/kde/kcmfontinst.desktop
-%exclude %{_datadir}/desktop-directories/kde-settings-power.directory
-%exclude %{_datadir}/desktop-directories/kde-settings-system.directory
+%{tde_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
+%{tde_sysconfdir}/xdg/menus/system-settings.menu
+%{tde_bindir}/systemsettings
+%{tde_datadir}/applications/kde/audioencoding.desktop
+%{tde_datadir}/applications/kde/defaultapplication.desktop
+%{tde_datadir}/applications/kde/kcm_knetworkconfmodule_ss.desktop
+%{tde_datadir}/applications/kde/laptoppowermanagement.desktop
+%{tde_datadir}/applications/kde/medianotifications.desktop
+%{tde_datadir}/applications/kde/systemsettings.desktop
+%{tde_datadir}/apps/systemsettings/systemsettingsui.rc
+%{tde_datadir}/config/systemsettingsrc
+%{tde_datadir}/desktop-directories/*.directory
+%{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
+
 
 
 %Changelog