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

2 files changed, 43 insertions, 26 deletions

diff --git a/redhat/applications/kdmtheme/kdmtheme.lintian-overrides b/redhat/applications/kdmtheme/kdmtheme.lintian-overrides
deleted file mode 100644
index 4932c5f8a..000000000
--- a/redhat/applications/kdmtheme/kdmtheme.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-# provided by tdelibs
-kdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/kdmtheme.desktop kcmshell
-# kcontrol module
-kdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/kdmtheme.desktop
-kdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/kdmtheme.desktop
-
diff --git a/redhat/applications/kdmtheme/trinity-kdmtheme.spec b/redhat/applications/kdmtheme/trinity-kdmtheme.spec
index b7fb762dd..71d5dbdf0 100644
--- a/redhat/applications/kdmtheme/trinity-kdmtheme.spec
+++ b/redhat/applications/kdmtheme/trinity-kdmtheme.spec
@@ -2,16 +2,25 @@
 %define kdecomp kdmtheme
 
 # 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: 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-%{kdecomp}
@@ -26,14 +35,14 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://beta.smileaf.org/projects
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
 BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -50,8 +59,8 @@ that allows you to easily install, remove and change your KDM themes.
 # 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"
@@ -59,18 +68,25 @@ that allows you to easily install, remove and change your KDM themes.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -82,10 +98,17 @@ export PATH="%{_bindir}:${PATH}"
 
 %files
 %defattr(-,root,root,-)
-%{tde_libdir}/kcm_kdmtheme.la
-%{tde_libdir}/kcm_kdmtheme.so
-%{_datadir}/applications/kde/kdmtheme.desktop
-%{tde_docdir}/HTML/en/kdmtheme/
+%{tde_tdelibdir}/kcm_kdmtheme.la
+%{tde_tdelibdir}/kcm_kdmtheme.so
+%{tde_tdeappdir}/kdmtheme.desktop
+%{tde_tdedocdir}/HTML/en/kdmtheme/
+
+
+%post
+update-desktop-database %{tde_appdir} &> /dev/null
+
+%postun
+update-desktop-database %{tde_appdir} &> /dev/null
 
 
 %Changelog