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

2 files changed, 69 insertions, 37 deletions

diff --git a/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch b/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch
new file mode 100644
index 000000000..754544dc3
--- /dev/null
+++ b/redhat/applications/krusader/krusader-3.5.13-fix_not_a_string_literal_error.patch
@@ -0,0 +1,11 @@
+--- krusader/krusader/main.cpp.ORI	2012-08-06 00:19:36.475622376 +0200
++++ krusader/krusader/main.cpp	2012-08-06 00:19:48.867387323 +0200
+@@ -199,7 +199,7 @@
+        exit( 0 );
+     TQCString regName = client->registerAs( KApplication::kApplication() ->name(), !singleInstanceMode );
+     if( singleInstanceMode && regName != KApplication::kApplication()->name() ) {
+-      fprintf( stderr, i18n( "Application already running!\n" ).ascii() );
++      fprintf( stderr, "%s", i18n( "Application already running!\n" ).ascii() );
+ 
+       DCOPClient::mainClient()->send( KApplication::kApplication() ->name(), "Krusader-Interface",
+                                     "moveToTop()", TQByteArray() );
diff --git a/redhat/applications/krusader/trinity-krusader.spec b/redhat/applications/krusader/trinity-krusader.spec
index 13beeab6b..d4e84f369 100644
--- a/redhat/applications/krusader/trinity-krusader.spec
+++ b/redhat/applications/krusader/trinity-krusader.spec
@@ -2,17 +2,25 @@
 %define kdecomp krusader
 
 # 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}
@@ -27,20 +35,22 @@ 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
 
 # [krusader] GCC 4.7 fixes. [Commit #fdf6d340]
 Patch1:		krusader-3.5.13-fix_gcc47_compilation.patch
+# [krusader] Fix "not a string literal" error
+Patch2:		krusader-3.5.13-fix_not_a_string_literal_error.patch
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
-BuildRequires:	trinity-kdebindings-devel
+BuildRequires:	trinity-tdebindings-devel
 
 %description
 Krusader is a simple, easy, powerful, twin-panel (commander-style) file
@@ -65,12 +75,13 @@ great on your desktop.
 %prep
 %setup -q -n applications/%{kdecomp}
 %patch1 -p1
+%patch2 -p1
 
 # 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"
@@ -78,18 +89,26 @@ great on your desktop.
 
 
 %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} \
+  --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}
 
@@ -100,36 +119,38 @@ export PATH="%{_bindir}:${PATH}"
 
 
 %post
+update-desktop-database %{tde_appdir} > /dev/null
 for f in crystalsvg 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
+update-desktop-database %{tde_appdir} > /dev/null
 for f in crystalsvg 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,-)
 %doc AUTHORS COPYING FAQ README TODO
-%{_bindir}/krusader
-%{tde_libdir}/kio_krarc.la
-%{tde_libdir}/kio_krarc.so
-%{tde_libdir}/kio_virt.la
-%{tde_libdir}/kio_virt.so
-%{_datadir}/applications/kde/krusader.desktop
-%{_datadir}/applications/kde/krusader_root-mode.desktop
-%{_datadir}/apps/krusader
-%{tde_docdir}/HTML/en/krusader/
-%lang(ru) %{tde_docdir}/HTML/ru/krusader/
-%{_datadir}/icons/crystalsvg/*/apps/*.png
-%{_datadir}/icons/locolor/*/apps/*.png
-%{_datadir}/services/krarc.protocol
-%{_datadir}/services/virt.protocol
-%{_mandir}/man1/krusader.1
+%{tde_bindir}/krusader
+%{tde_tdelibdir}/kio_krarc.la
+%{tde_tdelibdir}/kio_krarc.so
+%{tde_tdelibdir}/kio_virt.la
+%{tde_tdelibdir}/kio_virt.so
+%{tde_tdeappdir}/krusader.desktop
+%{tde_tdeappdir}/krusader_root-mode.desktop
+%{tde_datadir}/apps/krusader
+%{tde_tdedocdir}/HTML/en/krusader/
+%lang(ru) %{tde_tdedocdir}/HTML/ru/krusader/
+%{tde_datadir}/icons/crystalsvg/*/apps/*.png
+%{tde_datadir}/icons/locolor/*/apps/*.png
+%{tde_datadir}/services/krarc.protocol
+%{tde_datadir}/services/virt.protocol
+%{tde_mandir}/man1/krusader.1
 
 
 %Changelog