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

4 files changed, 108 insertions, 103 deletions

diff --git a/redhat/applications/kvirc/kvirc-3.5.13-directories.patch b/redhat/applications/kvirc/kvirc-3.5.13-directories.patch
index 021671fee..ab633568b 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13-directories.patch
+++ b/redhat/applications/kvirc/kvirc-3.5.13-directories.patch
@@ -13,3 +13,14 @@
  	AC_SUBST(modulelibdir)
  
  	defscriptdir="\${globalkvircdir}/defscript"
+--- kvirc/configure.in.ORI	2012-08-06 13:48:54.586710376 +0200
++++ kvirc/configure.in	2012-08-06 13:50:31.344841522 +0200
+@@ -100,7 +100,7 @@
+ 
+ AC_SS_HEADER([Checking KDE])
+ 
+-SS_KDE_GENERAL_FILE_TO_SEARCH="include/kwin.h"
++SS_KDE_GENERAL_FILE_TO_SEARCH="include/kwin.h include/kde/kwin.h"
+ SS_KDE_INCLUDE_FILE_TO_SEARCH="kwin.h"
+ 
+ AC_SS_FIND_KDE
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch b/redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch
index b06570d73..d838ce911 100644
--- a/redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch
+++ b/redhat/applications/kvirc/kvirc-3.5.13-fix_acinclude_m4.patch
@@ -1,6 +1,5 @@
-diff -u a/acinclude.m4 b/acinclude.m4
---- a/acinclude.m4
-+++ b/acinclude.m4
+--- kvirc/admin/acinclude.m4.in.ORI	2012-08-06 12:20:40.350261853 +0200
++++ kvirc/admin/acinclude.m4.in	2012-08-06 12:21:34.061121107 +0200
 @@ -2149,7 +2149,7 @@
  	if test -n "$KDEDIR"; then
  		ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
@@ -19,48 +18,3 @@ diff -u a/acinclude.m4 b/acinclude.m4
  		SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS"
  	fi
  
-diff -u a/admin/acinclude.m4.in b/admin/acinclude.m4.in
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -2149,7 +2149,7 @@
- 	if test -n "$KDEDIR"; then
- 		ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
- 	fi
--	ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
-+	ss_kde_general_test_path_suffix="trinity kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
- 
- 	AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR)
- 
-@@ -2524,7 +2524,7 @@
- 
- 	if test -n "$SS_OTHER_LIBDIRS"; then
- 		SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS"
--		$SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
-+		SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
- 		SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS"
- 	fi
- 
-diff -u a/src/modules/mediaplayer/Makefile.am b/src/modules/mediaplayer/Makefile.am
---- a/src/modules/mediaplayer/Makefile.am
-+++ b/src/modules/mediaplayer/Makefile.am
-@@ -10,7 +10,7 @@
- #%.moc: %.h
- #	$(SS_QT_MOC) $< -o $@
- 
--libkvimediaplayer_la_LDFLAGS = -avoid-version -module
-+libkvimediaplayer_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS)
- 
- libkvimediaplayer_la_SOURCES = libkvimediaplayer.cpp \
- 		mp_amarokinterface.cpp \
-diff -u a/src/modules/torrent/Makefile.am b/src/modules/torrent/Makefile.am
---- a/src/modules/torrent/Makefile.am
-+++ b/src/modules/torrent/Makefile.am
-@@ -10,7 +10,7 @@
- #%.moc: %.h
- #	$(SS_QT_MOC) $< -o $@
- 
--libkvitorrent_la_LDFLAGS = -avoid-version -module
-+libkvitorrent_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS)
- 
- libkvitorrent_la_SOURCES = libkvitorrent.cpp \
- 		tc_interface.cpp \
diff --git a/redhat/applications/kvirc/kvirc-3.5.13-missing_ldflags.patch b/redhat/applications/kvirc/kvirc-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..55f2be2e7
--- /dev/null
+++ b/redhat/applications/kvirc/kvirc-3.5.13-missing_ldflags.patch
@@ -0,0 +1,22 @@
+--- kvirc/src/kvilib/build/Makefile.am.ORI	2012-08-06 12:13:32.982315876 +0200
++++ kvirc/src/kvilib/build/Makefile.am	2012-08-06 12:13:44.438073791 +0200
+@@ -9,7 +9,7 @@
+ 
+ lib_LTLIBRARIES      = libkvilib.la
+ libkvilib_la_LDFLAGS = $(SS_LDFLAGS) -version-info 3:0:0 $(SS_LIBDIRS)
+-libkvilib_la_LIBADD  = $(SS_LIBLINK)
++libkvilib_la_LIBADD  = $(SS_LIBLINK) -lkio -lDCOP
+ 
+ #
+ # Command useful to find out all the sources
+--- kvirc/src/kvirc/build/Makefile.am.ORI	2011-11-26 22:37:04.065565368 +0100
++++ kvirc/src/kvirc/build/Makefile.am	2011-11-26 22:37:17.139565032 +0100
+@@ -8,7 +8,7 @@
+ AM_CPPFLAGS = -I$(SS_TOPSRCDIR)/src/kvilib/include/ -I$(SS_TOPSRCDIR)/src/kvirc/include/ \
+ $(SS_INCDIRS) $(SS_CPPFLAGS) -DGLOBAL_KVIRC_DIR=\"$(globalkvircdir)\"
+ 
+-kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH)
++kvirc_LDFLAGS = -export-dynamic $(SS_LDFLAGS) $(SS_LIBDIRS) $(SS_RPATH) -lDCOP -lkdefx -lkio
+ kvirc_LDADD = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la
+ 
+ bin_PROGRAMS = kvirc
diff --git a/redhat/applications/kvirc/trinity-kvirc.spec b/redhat/applications/kvirc/trinity-kvirc-3.5.13.spec
index 4da540dee..b41ead906 100644
--- a/redhat/applications/kvirc/trinity-kvirc.spec
+++ b/redhat/applications/kvirc/trinity-kvirc-3.5.13.spec
@@ -1,26 +1,32 @@
 # Default version for this component
 %define kdecomp kvirc
-%define version 3.4.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:	Trinity based next generation IRC client with module support
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	3.4.0
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -29,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <[email protected]>
 URL:		http://kvirc.net/
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -56,10 +62,10 @@ Patch8:		bp006-51bbe9e5.diff
 Patch9:		bp007-a24a8595.diff
 # [kvirc] Fix "acinclude.m4" file [Bug #980]
 Patch10:	kvirc-3.5.13-fix_acinclude_m4.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:	gettext
 
@@ -121,14 +127,14 @@ with the K Desktop Environment version 3.
 # 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"
 
 # Hardcoded absolute PATH to KDEDIR in source code ! That sucks !
 %__sed -i "src/kvirc/kernel/kvi_app_fs.cpp" \
-  -e "s|/opt/kde3/lib|%{_prefix}/%{_lib}|g"
+  -e "s|/opt/kde3/lib|%{tde_prefix}/%{_lib}|g"
 %__sed -i "src/kvirc/kernel/kvi_app_setup.cpp" \
-  -e "s|/opt/kde3|%{_prefix}|g"
+  -e "s|/opt/kde3|%{tde_prefix}|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"
@@ -136,20 +142,32 @@ with the K Desktop Environment version 3.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-export KDEDIR=%{_prefix}
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export KDEDIR=%{tde_prefix}
+
+#export CXXFLAGS="${CXXFLAGS} -I%{tde_includedir} -lqt-mt"
 
 %configure \
-	--disable-rpath \
-	--with-fno-rtti --with-aa-fonts --with-big-channels \
-	--enable-perl --with-pic --enable-wall \
-	--with-ix86-asm \
-	--with-qt-moc=%{_bindir}/tmoc \
-	--with-extra-includes=%{_includedir}/tqt \
-	--with-kde-services-dir=%{_datadir}/services \
-	--with-kde-library-dir=%{_libdir} \
-	--with-kde-include-dir=%{_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-fno-rtti --with-aa-fonts --with-big-channels \
+  --enable-perl --with-pic --enable-wall \
+  --with-ix86-asm \
+  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir} \
+  --with-kde-services-dir=%{tde_datadir}/services \
+  --with-kde-library-dir=%{tde_libdir} \
+  --with-kde-include-dir=%{tde_tdeincludedir} \
+  --with-qt-library-dir=${QTLIB} \
+  --with-qt-include-dir=${QTINC} \
+  --with-qt-moc=${QTDIR}/bin/moc
 
 # Symbolic links must exist prior to parallel building
 %__make symlinks -C src/kvilib/build
@@ -159,14 +177,14 @@ export KDEDIR=%{_prefix}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
 # Debian maintainer has renamed 'COPYING' file to 'EULA', so we do the same ...
 %__mv \
-  %{?buildroot}%{_datadir}/kvirc/3.4/license/COPYING \
-  %{?buildroot}%{_datadir}/kvirc/3.4/license/EULA
+  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/COPYING \
+  %{?buildroot}%{tde_datadir}/kvirc/3.4/license/EULA
 
 %clean
 %__rm -rf %{buildroot}
@@ -174,41 +192,41 @@ export PATH="%{_bindir}:${PATH}"
 
 %post
 /sbin/ldconfig
-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 || :
 
 %postun
 /sbin/ldconfig
-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 || :
 
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog FAQ README TODO
-%{_bindir}/kvirc
-%{_libdir}/*.so.*
-%{_libdir}/kvirc/*/modules/*.so
+%{tde_bindir}/kvirc
+%{tde_libdir}/*.so.*
+%{tde_libdir}/kvirc/*/modules/*.so
 
 %files data
 %defattr(-,root,root,-)
-%{_bindir}/kvi_run_netscape
-%{_bindir}/kvi_search_help
-%{_libdir}/kvirc/*/modules/caps/
-%{_datadir}/applnk/Internet/kvirc.desktop
-%{_datadir}/icons/hicolor/*
-%{_datadir}/kvirc
-%{_datadir}/mimelnk/text/*.desktop
-%{_datadir}/services/*.protocol
-%{_mandir}/man1/kvirc.1
+%{tde_bindir}/kvi_run_netscape
+%{tde_bindir}/kvi_search_help
+%{tde_libdir}/kvirc/*/modules/caps/
+%{tde_datadir}/applnk/Internet/kvirc.desktop
+%{tde_datadir}/icons/hicolor/*
+%{tde_datadir}/kvirc
+%{tde_datadir}/mimelnk/text/*.desktop
+%{tde_datadir}/services/*.protocol
+%{tde_mandir}/man1/kvirc.1
 
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/kvirc-config
-%{_includedir}/kvirc/
-%{_libdir}/*.la
-%{_libdir}/*.so
-%{_libdir}/kvirc/*/modules/*.la
+%{tde_bindir}/kvirc-config
+%{tde_includedir}/kvirc/
+%{tde_libdir}/*.la
+%{tde_libdir}/*.so
+%{tde_libdir}/kvirc/*/modules/*.la
 
 
 %Changelog