From 193ac9dc51fbc8d12aa48fe1191c8512850cc4ff Mon Sep 17 00:00:00 2001
From: Francois Andriot <francois.andriot@free.fr>
Date: Thu, 9 Aug 2012 12:02:10 +0200
Subject: RHEL/Fedora: add support for MGA2/MDV2011 in many applications

---
 redhat/applications/kdirstat/trinity-kdirstat.spec | 76 +++++++++++++---------
 1 file changed, 45 insertions(+), 31 deletions(-)

(limited to 'redhat/applications/kdirstat')

diff --git a/redhat/applications/kdirstat/trinity-kdirstat.spec b/redhat/applications/kdirstat/trinity-kdirstat.spec
index 153c4b1a6..90691838f 100644
--- a/redhat/applications/kdirstat/trinity-kdirstat.spec
+++ b/redhat/applications/kdirstat/trinity-kdirstat.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp kdirstat
-%define version 2.4.4
-%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-%{kdecomp}
 Summary:	graphical disk usage display with cleanup facilities [Trinity]
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	2.4.4
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,7 +35,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
@@ -57,8 +64,8 @@ own cleanup actions.
 # 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,24 +73,31 @@ own cleanup actions.
 
 
 %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:%{tde_includedir}
+  --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:%{tde_includedir}
 
 # SMP safe !
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 
-%find_lang %{kdecomp} || touch %{kdecomp}.lang
+%find_lang %{kdecomp}
 
 
 
@@ -93,27 +107,27 @@ export PATH="%{_bindir}:${PATH}"
 
 %post
 for f in hicolor locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 %postun
 for f in hicolor locolor; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 
 %files -f %{kdecomp}.lang
 %defattr(-,root,root,-)
-%{_bindir}/kdirstat
-%{_datadir}/applnk/Utilities/kdirstat.desktop
-%{_datadir}/apps/kconf_update/fix_move_to_trash_bin.pl
-%{_datadir}/apps/kconf_update/kdirstat.upd
-%{_datadir}/apps/kdirstat
-%{tde_docdir}/HTML/en/kdirstat
-%{_datadir}/icons/hicolor/*/apps/kdirstat.png
-%{_datadir}/icons/locolor/*/apps/kdirstat.png
+%{tde_bindir}/kdirstat
+%{tde_datadir}/applnk/Utilities/kdirstat.desktop
+%{tde_datadir}/apps/kconf_update/fix_move_to_trash_bin.pl
+%{tde_datadir}/apps/kconf_update/kdirstat.upd
+%{tde_datadir}/apps/kdirstat/
+%{tde_tdedocdir}/HTML/en/kdirstat/
+%{tde_datadir}/icons/hicolor/*/apps/kdirstat.png
+%{tde_datadir}/icons/locolor/*/apps/kdirstat.png
 
 
 %Changelog
-- 
cgit v1.2.1