1 files changed, 60 insertions, 44 deletions
diff --git a/redhat/applications/ksquirrel/trinity-ksquirrel.spec b/redhat/applications/ksquirrel/trinity-ksquirrel.spec
index 945628cfb..90abc45cd 100644
--- a/redhat/applications/ksquirrel/trinity-ksquirrel.spec
+++ b/redhat/applications/ksquirrel/trinity-ksquirrel.spec
@@ -1,26 +1,32 @@
 # Default version for this component
 %define kdecomp ksquirrel
-%define version 0.8.0
-%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 %{_datadir}/doc
-%define _mandir %{_datadir}/man
 %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:	Powerful Trinity image viewer
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.8.0
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Amusements/Games
@@ -29,14 +35,14 @@ 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
 
 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
 
@@ -59,8 +65,8 @@ OpenGL and dynamic format support.
 # 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 "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -68,18 +74,26 @@ OpenGL and dynamic format support.
 
 
 %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} \
+  --includedir=%{tde_tdeincludedir} \
+  --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}
 
@@ -90,36 +104,38 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 
 %files -f %{kdecomp}
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING LICENSE LICENSE.GFDL LICENSE.LGPL README TODO
-%{_bindir}/ksquirrel
-%{_bindir}/ksquirrel-libs-configurator
-%{_bindir}/ksquirrel-libs-configurator-real
-%{tde_libdir}/libksquirrelpart.la
-%{tde_libdir}/libksquirrelpart.so
-%{_datadir}/applications/kde/ksquirrel.desktop
-%{_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop
-%{_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
-%{_datadir}/apps/ksquirrel/
-%{_datadir}/apps/ksquirrelpart/ksquirrelpart.rc
-%{_datadir}/config/magic/x-ras.magic
-%{_datadir}/config/magic/x-sun.magic
-%{_datadir}/config/magic/x-utah.magic
-%{tde_docdir}/HTML/*/ksquirrel
-%{_datadir}/icons/hicolor/*/apps/ksquirrel.png
-%{_datadir}/mimelnk/image/*.desktop
-%{_datadir}/services/ksquirrelpart.desktop
-%{_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo
-%{_mandir}/man1/ksquirrel.1
+%{tde_bindir}/ksquirrel
+%{tde_bindir}/ksquirrel-libs-configurator
+%{tde_bindir}/ksquirrel-libs-configurator-real
+%{tde_tdelibdir}/libksquirrelpart.la
+%{tde_tdelibdir}/libksquirrelpart.so
+%{tde_tdeappdir}/ksquirrel.desktop
+%{tde_datadir}/apps/dolphin/servicemenus/dolphksquirrel-dir.desktop
+%{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
+%{tde_datadir}/apps/ksquirrel/
+%{tde_datadir}/apps/ksquirrelpart/ksquirrelpart.rc
+%{tde_datadir}/config/magic/x-ras.magic
+%{tde_datadir}/config/magic/x-sun.magic
+%{tde_datadir}/config/magic/x-utah.magic
+%{tde_tdedocdir}/HTML/*/ksquirrel
+%{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
+%{tde_datadir}/mimelnk/image/*.desktop
+%{tde_datadir}/services/ksquirrelpart.desktop
+%{tde_datadir}/locale/*/LC_MESSAGES/ksquirrel.mo
+%{tde_mandir}/man1/ksquirrel.1
 
 %Changelog
 * Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1-2