RHEL/Fedora/MGA/MDV/Suse: update applications for TDE 3.5.13.1

3 files changed, 65 insertions, 26 deletions

diff --git a/redhat/applications/kvirc/kvirc-3.5.13.1-directories.patch b/redhat/applications/kvirc/kvirc-3.5.13.1-directories.patch
new file mode 100644
index 000000000..7f547d820
--- /dev/null
+++ b/redhat/applications/kvirc/kvirc-3.5.13.1-directories.patch
@@ -0,0 +1,26 @@
+--- kvirc/admin/acinclude.m4.in.ORI	2011-11-25 19:57:17.296988361 +0100
++++ kvirc/admin/acinclude.m4.in	2011-11-25 19:57:47.365665354 +0100
+@@ -2603,10 +2603,10 @@
+ 	helpdir="\${globalkvircdir}/help/en"
+ 	AC_SUBST(helpdir)
+ 
+-	pluglibdir="\${globalkvircdir}/modules"
++	pluglibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
+ 	AC_SUBST(pluglibdir)
+ 
+-	modulelibdir="\${globalkvircdir}/modules"
++	modulelibdir="\${libdir}/kvirc/$SS_DIRTAG/modules"
+ 	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/tde/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.1-fix_arts_detection.patch b/redhat/applications/kvirc/kvirc-3.5.13.1-fix_arts_detection.patch
new file mode 100644
index 000000000..d48d0a0d4
--- /dev/null
+++ b/redhat/applications/kvirc/kvirc-3.5.13.1-fix_arts_detection.patch
@@ -0,0 +1,11 @@
+--- kvirc-3.5.13.1/admin/acinclude.m4.in.ORI	2012-10-06 19:19:30.073415124 +0200
++++ kvirc-3.5.13.1/admin/acinclude.m4.in	2012-10-06 19:19:42.785136998 +0200
+@@ -1105,7 +1105,7 @@
+ 			ss_save_LIBS="$LIBS"
+ 			CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT3_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS"
+ 			CXXFLAGS="-O2 -Wall $CXXFLAGS"
+-			LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
++			LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT3_LIBDIR $LIBS -lsoundserver_idl -lkdecore -lmcop -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR"
+ 			if test "$SS_LINK_TO_LIBDL" = "yes"; then
+ 				LIBS="$LIBS -ldl";
+ 			fi
diff --git a/redhat/applications/kvirc/trinity-kvirc-3.5.13-sru.spec b/redhat/applications/kvirc/trinity-kvirc-3.5.13.1.spec
index d60f09b4b..d0f293d64 100644
--- a/redhat/applications/kvirc/trinity-kvirc-3.5.13-sru.spec
+++ b/redhat/applications/kvirc/trinity-kvirc-3.5.13.1.spec
@@ -16,8 +16,8 @@
 %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_tdedocdir %{tde_docdir}/tde
+%define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
 %define _docdir %{tde_docdir}
@@ -26,7 +26,7 @@
 Name:		trinity-%{kdecomp}
 Summary:	Trinity based next generation IRC client with module support
 Version:	3.4.0
-Release:	2%{?dist}%{?_variant}
+Release:	3%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -38,20 +38,18 @@ URL:		http://kvirc.net/
 Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:	%{kdecomp}-3.5.13.tar.gz
+Source0:	%{kdecomp}-3.5.13.1.tar.gz
 
-# [kvirc] Release 3.5.13-sru
-Patch0:		kvirc-3.5.13-sru-20120806.patch
 # [kvirc] Modules do not install in correct folder [RHEL/Fedora]
-Patch1:		kvirc-3.5.13-directories.patch
+Patch0:		kvirc-3.5.13.1-directories.patch
 # [kvirc] FTBFS because of missing link libraries [Bug #991]
-Patch2:		kvirc-3.5.13-missing_ldflags.patch
+Patch1:		kvirc-3.5.13-ftbfs.patch
+# [kvirc] Fix arts detection
+Patch2:		kvirc-3.5.13.1-fix_arts_detection.patch
 
-
-
-BuildRequires:	tqtinterface-devel
-BuildRequires:	trinity-tdelibs-devel
-BuildRequires:	trinity-tdebase-devel
+BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
+BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
+BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -96,12 +94,16 @@ KVIrc is a graphical IRC client based on the KDE widget set which integrates
 with the K Desktop Environment version 3.
 
 
+%if 0%{?suse_version}
+%debug_package
+%endif
+
+
 %prep
-%setup -q -n applications/%{kdecomp}
+%setup -q -n %{kdecomp}-3.5.13.1
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1 -b .ldflags
-
+%patch2 -p1 -b .arts
 
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -121,16 +123,11 @@ with the K Desktop Environment version 3.
 
 
 %build
-unset QTDIR; . /etc/profile.d/qt.sh
+unset QTDIR; . /etc/profile.d/qt3.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"
-
-# Workaround until the mess of TDE includedir is solved
-export CXXFLAGS="${CXXFLAGS} -I%{tde_includedir}"
-
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
@@ -147,8 +144,8 @@ export CXXFLAGS="${CXXFLAGS} -I%{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-library-dir=${QTLIB:-${QTDIR}/%{_lib}} \
+  --with-qt-include-dir=${QTINC:-${QTDIR}/include} \
   --with-qt-moc=${QTDIR}/bin/moc
 
 # Symbolic links must exist prior to parallel building
@@ -196,7 +193,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_bindir}/kvi_search_help
 %{tde_libdir}/kvirc/*/modules/caps/
 %{tde_datadir}/applnk/Internet/kvirc.desktop
-%{tde_datadir}/icons/hicolor/*
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/icons/hicolor/*/*/*.svgz
+%{tde_datadir}/icons/hicolor/*/*/*.xpm
 %{tde_datadir}/kvirc
 %{tde_datadir}/mimelnk/text/*.desktop
 %{tde_datadir}/services/*.protocol
@@ -211,7 +210,10 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_libdir}/kvirc/*/modules/*.la
 
 
-%Changelog
+%changelog
+* Wed Oct 03 2012 Francois Andriot <[email protected]> - 3.4.0-3
+- Initial build for TDE 3.5.13.1
+
 * Sat May 05 2012 Francois Andriot <[email protected]> - 3.4.0-2
 - Rebuilt for Fedora 17
 - Fix HTML directory location