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

1 files changed, 41 insertions, 29 deletions

diff --git a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec
index 5883a3d92..8834e935a 100644
--- a/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec
+++ b/redhat/applications/kde-style-lipstik/trinity-kde-style-lipstik-3.5.13.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kde-style-lipstik
-%define version 2.2.3
-%define release 2
 
 # 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 %{_prefix}/share/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-style-lipstik
 Summary:	Lipstik style for TDE
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	2.2.3
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,16 +35,16 @@ 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
 
-Obsoletes:	trinity-kde-style-lipstik
+Obsoletes:		trinity-kde-style-lipstik
 
 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
 
@@ -55,8 +62,8 @@ Lipstik also provides Lipstik-color-schemes
 # 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"
@@ -64,18 +71,23 @@ Lipstik also provides Lipstik-color-schemes
 
 
 %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} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --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}
 
@@ -88,14 +100,14 @@ export PATH="%{_bindir}:${PATH}"
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{tde_libdir}/kstyle_lipstik_config.la
-%{tde_libdir}/kstyle_lipstik_config.so
-%{tde_libdir}/plugins/styles/lipstik.la
-%{tde_libdir}/plugins/styles/lipstik.so
-%{_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc
-%{_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
-%{_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc
-%{_datadir}/apps/kstyle/themes/lipstik.themerc
+%{tde_tdelibdir}/kstyle_lipstik_config.la
+%{tde_tdelibdir}/kstyle_lipstik_config.so
+%{tde_tdelibdir}/plugins/styles/lipstik.la
+%{tde_tdelibdir}/plugins/styles/lipstik.so
+%{tde_datadir}/apps/kdisplay/color-schemes/lipstiknoble.kcsrc
+%{tde_datadir}/apps/kdisplay/color-schemes/lipstikstandard.kcsrc
+%{tde_datadir}/apps/kdisplay/color-schemes/lipstikwhite.kcsrc
+%{tde_datadir}/apps/kstyle/themes/lipstik.themerc
 
 
 %Changelog