MGA2/MDV2012: add some applications ...

1 files changed, 51 insertions, 35 deletions

diff --git a/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec
index 40b78393b..667efc4f7 100644
--- a/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec
+++ b/redhat/applications/dolphin/trinity-dolphin-3.5.13.spec
@@ -2,16 +2,24 @@
 %define kdecomp dolphin
 
 # 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_tdeappdir %{tde_datadir}/applications/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}
@@ -32,8 +40,8 @@ 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
 
@@ -49,9 +57,9 @@ interface for the task of file management.
 
 # 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"
+%__sed -i "admin/acinclude.m4.in" \
+  -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,29 +67,36 @@ interface for the task of file management.
 
 
 %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} \
+  --docdir=%{tde_tdedocdir} \
+  --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}
 
 # TDE 3.5.12: dirty hack to prevent duplicate line in file 'd3lphin.desktop'
-sed -i "%{buildroot}%{_datadir}/applications/kde/d3lphin.desktop" \
+sed -i "%{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop" \
 	-e "/^Name\[pa\].*/d"
 
 desktop-file-install --vendor ""                \
     --delete-original                           \
-    --dir %{buildroot}%{_datadir}/applications/ \
-    %{buildroot}%{_datadir}/applications/kde/d3lphin.desktop
+    --dir %{buildroot}%{tde_datadir}/applications/ \
+    %{buildroot}%{tde_datadir}/applications/kde/d3lphin.desktop
 
 
 ## File lists
@@ -103,42 +118,43 @@ done
 fi
 
 # Makes 'media_safelyremove.desktop' an alternative
-%__mv -f %{buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
-%__ln_s /etc/alternatives/media_safelyremove.desktop_d3lphin %{buildroot}%{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop
+%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
+%__ln_s /etc/alternatives/media_safelyremove.desktop_d3lphin %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop
+
+%find_lang d3lphin
 
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 alternatives --install \
-  %{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \
+  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop \
   media_safelyremove.desktop_d3lphin \
-  %{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \
+  %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin \
   10
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 if [ $1 -eq 0 ]; then
   alternatives --remove \
     media_safelyremove.desktop_d3lphin \
-    %{_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
+    %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
 fi
 
 
-%files
+%files -f d3lphin.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING TODO
-%{_bindir}/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/apps/*/
-%doc %lang(en) %{tde_docdir}/HTML/en/*/
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/locale/*/*/d3lphin.mo
+%{tde_bindir}/d3lphin
+%{tde_datadir}/applications/d3lphin.desktop
+%{tde_datadir}/apps/d3lphin/
+%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png
+%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/
 
 
 %Changelog