This commit was manufactured by cvs2git to create tag 'STABLE'.STABLE

Sprout from master 2001-05-09 01:24:47 UTC kloczek <kloczek@pld-linux.org> '- merge Conectiva segv patch (avoid SIGSEGV on exit process).'
Cherrypick from master 2002-08-30 11:41:01 UTC kloczek <kloczek@pld-linux.org> '- added missing %defines.':
    licq-DESTDIR.patch -> 1.10
    licq-c++.patch -> 1.1
    licq-qt-gui.desktop -> 1.4
    licq.spec -> 1.72

4 files changed, 223 insertions, 118 deletions

diff --git a/licq-DESTDIR.patch b/licq-DESTDIR.patch
index 025bb97..96a4565 100644
--- a/licq-DESTDIR.patch
+++ b/licq-DESTDIR.patch
@@ -1,12 +1,12 @@
-diff -urN licq-1.0.3.org/plugins/qt-gui-1.0.3/share/Makefile.am licq-1.0.3/plugins/qt-gui-1.0.3/share/Makefile.am
---- licq-1.0.3.org/plugins/qt-gui-1.0.3/share/Makefile.am	Thu Mar  8 09:25:40 2001
-+++ licq-1.0.3/plugins/qt-gui-1.0.3/share/Makefile.am	Thu Mar  8 09:26:27 2001
-@@ -17,7 +17,7 @@
- 	     $(INSTALL_DATA) licq.desktop $(HOME)/.kde/share/applnk/Internet; \
- 	   fi  \
- 	fi
--	$(mkinstalldirs) $(sharedir)
-+	$(mkinstalldirs) $(DESTDIR)$(sharedir)
- 	@chmod 0777 $(DESTDIR)$(sharedir)
- 	$(mkinstalldirs) $(sharedir)/qt-gui/locale
- 	@chmod 0777 $(DESTDIR)$(sharedir)/qt-gui/locale
+diff -urN licq-20011027.org/plugins/qt-gui/share/Makefile.am licq-20011027/plugins/qt-gui/share/Makefile.am
+--- licq-20011027.org/plugins/qt-gui/share/Makefile.am	Sat Oct 27 12:27:27 2001
++++ licq-20011027/plugins/qt-gui/share/Makefile.am	Sat Oct 27 13:31:48 2001
+@@ -30,7 +30,7 @@
+ 	done
+ 	@for j in qt-gui/dock.*; do \
+ 	  echo "Installing dock theme $$j"; \
+-	  $(mkinstalldirs) $(DESTOIR)$(sharedir)/$$j; \
++	  $(mkinstalldirs) $(DESTDIR)$(sharedir)/$$j; \
+ 	  for i in $$j/*; do \
+ 			if test -f $$i; then \
+ 	      $(INSTALL_DATA) $$i $(DESTDIR)$(sharedir)/$$j; \
diff --git a/licq-c++.patch b/licq-c++.patch
new file mode 100644
index 0000000..250e610
--- /dev/null
+++ b/licq-c++.patch
@@ -0,0 +1,40 @@
+--- licq-20011027/plugins/console/src/console.h~	Thu Aug 24 00:49:33 2000
++++ licq-20011027/plugins/console/src/console.h	Fri Nov 30 23:18:03 2001
+@@ -1,6 +1,11 @@
+ #ifndef LICQCON_H
+ #define LICQCON_H
+ 
++#include <list>
++#include <vector>
++using std::list;
++using std::vector;
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+--- licq-20011027/plugins/jons-gtk-gui/src/licq_gtk.h~	Fri Jun 15 07:27:17 2001
++++ licq-20011027/plugins/jons-gtk-gui/src/licq_gtk.h	Fri Nov 30 23:36:56 2001
+@@ -21,6 +21,11 @@
+ #ifndef __LICQ_GTK_H
+ #define __LICQ_GTK_H
+ 
++#include <list>
++#include <iosfwd>
++using std::list;
++using std::ios;
++
+ #include "licq_icqd.h"
+ #include "licq_events.h"
+ #include "licq_filetransfer.h"
+--- licq-20011027/plugins/rms/src/rms.h~	Mon Feb 26 21:06:47 2001
++++ licq-20011027/plugins/rms/src/rms.h	Sat Dec  1 00:28:22 2001
+@@ -1,6 +1,9 @@
+ #ifndef LICQRMS_H
+ #define LICQRMS_H
+ 
++#include <list>
++using std::list;
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
diff --git a/licq-qt-gui.desktop b/licq-qt-gui.desktop
new file mode 100644
index 0000000..37f3d50
--- /dev/null
+++ b/licq-qt-gui.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Licq (QT)
+Comment=Unix/Qt ICQ clone
+Comment[pl]=Klon ICQ pod Uniksa/Qt
+Comment[pt]=Cliente Gráfico de ICQ
+Comment[pt_BR]=Cliente Gráfico de ICQ
+Exec=licq -p qt-gui
+Icon=licq.png
+Terminal=0
+Type=Application
+# vi: encoding=utf-8
diff --git a/licq.spec b/licq.spec
index 8f05fa4..264d591 100644
--- a/licq.spec
+++ b/licq.spec
@@ -1,35 +1,33 @@
 Summary:	An ICQ client for online messaging
+Summary(es):	licq es un clone del ICQ(tm) escrito
 Summary(pl):	Klient ICQ do przesy³ania wiadomo¶ci po sieci
+Summary(pt_BR):	O licq é um clone do ICQ(tm) escrito
+Summary(ru):	ëÌÏÎ ICQ ÄÌÑ ÏÎÌÁÊÎÏ×ÇÏ ÏÂÍÅÎÁ ÓÏÏÂÝÅÎÉÑÍÉ
+Summary(uk):	ëÌÏÎ ICQ ÄÌÑ ÏÎÌÁÊÎÏ×ÇÏ ÏÂͦÎÕ ÐÏצÄÏÍÌÅÎÎÑÍÉ
 Name:		licq
-Version:	1.0.3
-Release:	3
+Version:	1.2.0a
+Release:	4
 License:	GPL
 Group:		Applications/Communications
-Group(de):	Applikationen/Kommunikation
-Group(pl):	Aplikacje/Komunikacja
+Source0:	ftp://ftp2.sourceforge.net/pub/sourceforge/licq/%{name}-%{version}.tar.bz2
+Source1:	%{name}-qt-gui.desktop
+Patch0:		%{name}-c++.patch
 URL:		http://www.licq.org/
-Source0:	http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Source1:	%{name}.desktop
-Patch0:		%{name}-console.patch
-Patch1:		%{name}-qt_gui-translations_not_in_home_dir.patch
-Patch2:		%{name}-gethostname_is_in_libc_aka_no_libnsl.patch
-Patch3:		%{name}-DESTDIR.patch
-Patch4:		%{name}-color.patch
-BuildRequires:	qt-devel >= 2.1.1
-BuildRequires:	ncurses-devel >= 5.0
-BuildRequires:	libstdc++-devel
-BuildRequires:	openssl-devel
 BuildRequires:	XFree86-devel
 BuildRequires:	automake
 BuildRequires:	autoconf
-Requires:	ncurses >= 5.0
+BuildRequires:	gtk+-devel >= 1.2.0
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool
+BuildRequires:	ncurses-devel >= 5.0
+BuildRequires:	openssl-devel >= 0.9.6a
+BuildRequires:	qt-devel >= 3.0.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         autoreply       auto-reply-1.0.1
-%define         console         console-1.0.2
-%define         forwarder       forwarder-1.0.1
-%define         qt_gui          qt-gui-%{version}
-%define		rms		rms-0.22
+%define		console_ver		1.2.0
+%define		qt_gui_ver		1.2.0
+%define		rms_ver			0.30
+%define		jons_gtk_gui_ver	0.20
 
 %description
 Licq is an ICQ online messaging system clone, written in C++. Licq
@@ -37,6 +35,11 @@ supports all of the major features of ICQ, including messaging, URLs,
 chat, file transfer, and white pages information. Additionally, Licq
 is very configurable and supports skins and different icon packs.
 
+%description -l es
+licq es un clone del ICQ(tm) escrito en c++ usando biblioteca Qt. Es
+un intento de dar a los usuarios de Linux una opción no-java para el
+protocolo ICQ.
+
 %description -l pl
 Licq jest klonem systemu przesy³ania wiadomo¶ci ICQ, napisanym w
 jêzyku C++. Licq ma wszystkie wa¿ne cechy oryginalnego klienta ICQ,
@@ -45,13 +48,33 @@ przesy³aniem plików oraz dostêpem do informacji z "bia³ych stron" ICQ.
 Dodatkowo, Licq jest bardzo dobrze konfigurowalny, pozwalaj±c na
 u¿ywanie "skórek" oraz ró¿nych zestawów ikon.
 
+%description -l pt_BR
+O licq é um clone do ICQ(tm) escrito em c++ usando biblioteca Qt. É
+uma tentativa de dar aos usuários do Linux uma opção não-java para o
+protocolo ICQ.
+
+%description -l ru
+Licq - ÜÔÏ ËÌÏÎ ÓÉÓÔÅÍÙ ÏÎÌÁÊÎÏ×ÏÇÏ ÏÂÍÅÎÁ ÓÏÏÂÝÅÎÑÍÉ ICQ, ÎÁÐÉÓÁÎÎÙÊ
+ÎÁ C++ Ó ÉÓÐÏÌØÚÏ×ÁÎÉÅÍ ÎÁÂÏÒÁ ×ÉÄÖÅÔÏ× Qt. Licq ÐÏÄÄÅÒÖÉ×ÁÅÔ ×ÓÅ
+ÏÓÎÏ×ÎÙÅ ×ÏÚÍÏÖÎÏÓÔÉ ICQ, ×ËÌÀÞÁÑ ÏÂÍÅÎ ÓÏÏÂÝÅÎÉÑÍÉ, URLÙ, ÞÁÔ,
+ÐÅÒÅÓÙÌËÕ ÆÁÊÌÏ× É ÉÎÆÏÒÍÁÃÉÀ Ï ÕÞÁÓÔÎÉËÁÈ. äÏÐÏÌÎÉÔÅÌØÎÏ Ë ÜÔÏÍÕ,
+Licq ÉÍÅÅÔ ÂÏÇÁÔÙÅ ×ÏÚÍÏÖÎÏÓÔÉ ËÏÎÆÉÇÕÒÉÒÏ×ÁÎÉÑ É ÐÏÄÄÅÒÖÉ×ÁÅÔ "ÓËÉÎÙ"
+(ÓÍÅÎÎÙÅ ÉÚÏÂÒÁÖÅÎÉÑ ÄÌÑ ÒÁÚÎÙÈ ÞÁÓÔÅÊ ÉÎÔÅÒÆÅÊÓÁ ÄÌÑ ÓÍÅÎÙ ×ÎÅÛÎÅÇÏ
+×ÉÄÁ) É ÒÁÚÎÙÅ ÎÁÂÏÒÙ ÉËÏÎÏË.
+
+%description -l uk
+Licq - ÃÅ ËÌÏÎ ÓÉÓÔÅÍÉ ÏÎÌÁÊÎÏ×ÏÇÏ ÏÂͦÎÕ ÐÏצÄÏÍÌÅÎÎÑÍÉ ICQ,
+ÎÁÐÉÓÁÎÉÊ ÎÁ C++ Ú ×ÉËÏÒÉÓÔÁÎÎÑÍ ÎÁÂÏÒÕ ×¦ÄÖÅÔ¦× Qt. Licq ЦÄÔÒÉÍÕ¤
+×Ó¦ ÎÁÊÇÏÌÏ×Φۦ ÍÏÖÌÉ×ÏÓÔ¦ ICQ, ×ËÌÀÞÁÀÞÉ ÏÂͦΠÐÏצÄÏÍÌÅÎÎÑÍÉ, URLÉ,
+ÞÁÔ, ÐÅÒÅÓÉÌËÕ ÆÁÊÌ¦× ÔÁ ¦ÎÆÏÒÍÁæÀ ÐÒÏ ÕÞÁÓÎÉ˦×. äÏÄÁÔËÏ×Ï ÄÏ ÃØÏÇÏ,
+Licq ÍÁ¤ ÂÁÇÁÔ¦ ÍÏÖÌÉ×ÏÓÔ¦ ËÏÎƦÇÕÒÕ×ÁÎÎÑ ¦ ЦÄÔÒÉÍÕ¤ "Ó˦ÎÉ" (ÚͦÎΦ
+ÚÏÂÒÁÖÅÎÎÑ ÄÌÑ Ò¦ÚÎÉÈ ÞÁÓÔÉÎ ¦ÎÔÅÒÆÅÊÓÕ ÄÌÑ ÚͦÎÉ ÚÏ×ΦÛÎØÏÇÏ ×ÉÇÌÑÄÕ)
+ÔÁ Ò¦ÚΦ ÎÁÂÏÒÉ ¦ËÏÎÏË.
+
 %package devel
 Summary:	Header files requied to develop licq plugins
 Summary(pl):	Pliki nag³ówkowe niezbêdne przy pisaniu wtyczek dla licq
 Group:		Development/Libraries
-Group(de):	Entwicklung/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
 Requires:	%{name} = %{version}
 
 %description devel
@@ -60,12 +83,17 @@ Header files required to develop licq plugins.
 %description devel -l pl
 Pliki nag³ówkowe niezbêdne przy pisaniu wtyczek dla licq.
 
+%description devel -l pt_BR
+Ferramentas para desenvolvimento de plug-ins para o licq.
+
 %package qt-gui
 Summary:	Qt GUI for Licq
+Summary(es):	QT user interface for licq
 Summary(pl):	Graficzne ¶rodowisko u¿ytkownika dla Licq, wykorzystuj±ce Qt
+Summary(pt_BR):	Interface QT para o licq
+Summary(ru):	Qt ÉÎÔÅÒÆÅÊÓ Ë licq
+Summary(uk):	Qt ¦ÎÔÅÒÆÅÊÓ ÄÏ licq
 Group:		Applications/Communications
-Group(de):	Applikationen/Kommunikation
-Group(pl):	Aplikacje/Komunikacja
 Requires:	%{name} = %{version}
 Requires:	qt >= 2.1
 
@@ -76,47 +104,58 @@ This package contains graphical interface for Licq, using Qt wigets.
 Ten pakiet zawiera graficzny interfejs dla Licq, u¿ywaj±cy widgetów
 Qt.
 
-%package console
-Summary:	Console user interface for Licq
-Summary(pl):	Konsolowy interfejs u¿ytkownika dla Licq
+%description qt-gui -l uk
+Licq - ÃÅ ËÌÏÎ ÓÉÓÔÅÍÉ ÏÎÌÁÊÎÏ×ÏÇÏ ÏÂͦÎÕ ÐÏצÄÏÍÌÅÎÎÑÍÉ ICQ.
+%{name}-qt - ÃÅ ÇÒÁƦÞÎÉÊ ¦ÎÔÅÒÆÅÊÓ ÄÏ licq ÎÁÐÉÓÁÎÉÊ ÎÁ Qt.
+
+%description qt-gui -l ru
+Licq - ÜÔÏ ËÌÏÎ ÓÉÓÔÅÍÙ ÏÎÌÁÊÎÏ×ÏÇÏ ÏÂÍÅÎÁ ÓÏÏÂÝÅÎÑÍÉ ICQ. %{name}-qt
+- ÜÔÏ ÇÒÁÆÉÞÅÓËÉÊ ÉÎÔÅÒÆÅÊÓ Ë licq ÎÁÐÉÓÁÎÎÙÊ ÎÁ Qt.
+
+%package text
+Summary:	Text terminal user interface for Licq
+Summary(pl):	Interfejs u¿ytkownika dla Licq pod terminal tekstowy
+Summary(pt_BR):	Interface de usuário de console para o licq
 Group:		Applications/Communications
-Group(de):	Applikationen/Kommunikation
-Group(pl):	Aplikacje/Komunikacja
 Requires:	%{name} = %{version}
 Requires:	ncurses >= 5.0
+Obsoletes:	licq-console
 
-%description console
-This package contains console user interface for Licq, using ncurses
-library.
+%description text
+This package contains text terminal user interface for Licq, using
+ncurses library.
 
-%description console -l pl
-Ten pakiet zawiera konsolowy interfejs dla Licq, u¿ywaj±cy biblioteki
-ncurses.
+%description text -l pl
+Ten pakiet zawiera interfejs dla Licq pod terminal tekstowy u¿ywaj±cy
+biblioteki ncurses.
 
-%package forwarder
-Summary:	Licq forwarding utility
-Summary(pl):	Narzêdzie do przekazywania dalej otrzymanych w Licq wiadomo¶ci
+%description text -l pt_BR
+Inclui interface de usuário de console para o licq.
+
+%description text -l ru
+Licq - ÜÔÏ ËÌÏÎ ÓÉÓÔÅÍÙ ÏÎÌÁÊÎÏ×ÏÇÏ ÏÂÍÅÎÁ ÓÏÏÂÝÅÎÑÍÉ ICQ. %{name}-qt
+- ÜÔÏ ÔÅËÓÔÏ×ÙÊ ÉÎÔÅÒÆÅÊÓ Ë licq.
+
+%description text -l uk
+Licq - ÃÅ ËÌÏÎ ÓÉÓÔÅÍÉ ÏÎÌÁÊÎÏ×ÏÇÏ ÏÂͦÎÕ ÐÏצÄÏÍÌÅÎÎÑÍÉ ICQ.
+%{name}-qt - ÃÅ ÔÅËÓÔÏ×ÉÊ ¦ÎÔÅÒÆÅÊÓ ÄÏ licq.
+
+%package jons-gtk-gui
+Summary:	Jons GTK GUI for Licq
+Summary(pl):	Graficzne ¶rodowisko u¿ytkownika dla Licq, wykorzystuj±ce GTK
 Group:		Applications/Communications
-Group(de):	Applikationen/Kommunikation
-Group(pl):	Aplikacje/Komunikacja
 Requires:	%{name} = %{version}
 
-%description forwarder
-This package contains Licq module, that allows to forward any received
-ICQ message, either as mail (using SMTP), or as ICQ messages directed
-to some other recipients.
+%description jons-gtk-gui
+Jons GTK GUI for Licq.
 
-%description forwarder -l pl
-Ten pakiet zawiera modu³ dla Licq umo¿liwiaj±cy przekazywanie dalej
-wiadomo¶ci otrzymanych przez ICQ, w postaci maili (przez SMTP) lub
-jako wiadomo¶ci ICQ skierowanych do innych adresatów.
+%description jons-gtk-gui -l pl
+Graficzne ¶rodowisko u¿ytkownika dla Licq, wykorzystuj±ce GTK.
 
 %package rms
 Summary:	Licq remote management server
 Summary(pl):	Serwer do zdalnego zarz±dzania Licq
 Group:		Applications/Communications
-Group(de):	Applikationen/Kommunikation
-Group(pl):	Aplikacje/Komunikacja
 Requires:	%{name} = %{version}
 
 %description rms
@@ -128,9 +167,8 @@ Ten pakiet zawiera serwer do zdalnego zarz±dzania dla Licq.
 %package autoreply
 Summary:	Licq autoreply utility
 Summary(pl):	Narzêdzie do automatycznego odpowiadania dla Licq
+Version:	%{version}_%{autoreply_ver}
 Group:		Applications/Communications
-Group(de):	Applikationen/Kommunikation
-Group(pl):	Aplikacje/Komunikacja
 Requires:	%{name} = %{version}
 
 %description autoreply
@@ -141,30 +179,44 @@ messages.
 Ten pakiet zawiera narzêdzie dla Licq które automatycznie zajmuje siê
 przychodz±cymi wiadomo¶ciami.
 
+%package forwarder
+Summary:	Licq email forwarder utility
+Summary(pl):	Narzêdzie do przesy³ania wiadomo¶ci icq na email
+Version:	%{version}_%{forwarder_ver}
+Group:		Applications/Communications
+Requires:	%{name} = %{version}
+
+%description forwarder
+Licq email forwarder utility.
+
+%description forwarder -l pl
+Narzêdzie do przesy³ania wiadomo¶ci icq na email.
+
 %prep
 %setup -q
-%patch3 -p1
-%patch2 -p1
-%patch4 -p1
-cd plugins/console-*/src
-%patch0 -p4
-cd ../../qt-gui-*/src
-%patch1 -p4
+#cd plugins/qt-gui/src
+#-## KDE m4 macros sucks as hell
+#-#for header in *.h; do
+#-#	rheader=$(echo ${header} | sed -e 's#\.h##')
+#-#	/usr/X11R6/bin/moc -o ${rheader}.moc ${header} || :
+#-#done
+#cd ../../..
+#%patch0 -p1
 
 %build
-BASE=`pwd`
-for module in . \
-	      plugins/%{qt_gui} \
-	      plugins/%{console} \
-	      plugins/%{forwarder} \
-              plugins/%{rms} \
-	      plugins/%{autoreply}; do
+BASE=$(pwd)
+for module in \
+	. \
+	plugins/console-%{console_ver} \
+	plugins/qt-gui-%{qt_gui_ver} \
+	plugins/rms-%{rms_ver} \
+	plugins/jons-gtk-gui-%{jons_gtk_gui_ver} \
+	; do
   cd $module
-  aclocal
-  automake -a -c --no-force
-  autoconf
+  %{__autoconf}
   %configure \
   	--with-openssl-inc=%{_includedir}/openssl
+
 #	--without-kde
 # specifing --with-kde=no or without-kde causes always
 # to enable KDE support so just don't put it here.
@@ -176,33 +228,32 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
-%{__make} -C plugins/%{qt_gui}		DESTDIR=$RPM_BUILD_ROOT install
-%{__make} -C plugins/%{console}		DESTDIR=$RPM_BUILD_ROOT install
-%{__make} -C plugins/%{forwarder}	DESTDIR=$RPM_BUILD_ROOT install
-%{__make} -C plugins/%{rms}		DESTDIR=$RPM_BUILD_ROOT install
-%{__make} -C plugins/%{autoreply}	DESTDIR=$RPM_BUILD_ROOT install
+%{__make} -C plugins/console-%{console_ver}		DESTDIR=$RPM_BUILD_ROOT install
+%{__make} -C plugins/jons-gtk-gui-%{jons_gtk_gui_ver}	DESTDIR=$RPM_BUILD_ROOT install
+%{__make} -C plugins/qt-gui-%{qt_gui_ver}		DESTDIR=$RPM_BUILD_ROOT install
+%{__make} -C plugins/rms-%{rms_ver}			DESTDIR=$RPM_BUILD_ROOT install
+#%{__make} -C plugins/auto-reply			DESTDIR=$RPM_BUILD_ROOT install
+#%{__make} -C plugins/email				DESTDIR=$RPM_BUILD_ROOT install
 
 install -d $RPM_BUILD_ROOT%{_applnkdir}/Network/Communications
-mv -f plugins/%{console}/README doc/README.CONSOLE
-mv -f plugins/%{forwarder}/README doc/README.FORWARDER
-mv -f plugins/%{autoreply}/README doc/README.AUTOREPLY
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Communications/licq.desktop
+install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Communications/licq-qt_gui.desktop
 
-gzip -9nf doc/{BUGS,CHANGELOG,CREDITS,HINTS,*.HOWTO,README*,TODO} \
-	plugins/%{qt_gui}/doc/{CHANGELOG,README,*.HOWTO,HINTS} \
-	upgrade/UPGRADE README*
+#mv -f plugins/email/README		doc/README.FORWARDER
+cp -f plugins/rms-%{rms_ver}/README			doc/README.RMS
+cp -f plugins/console-%{console_ver}/README		doc/README.CONSOLE
+cp -f plugins/jons-gtk-gui-%{jons_gtk_gui_ver}/TODO	doc/README.TODO.JONS-GTK
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/BUGS.gz doc/CHANGELOG.gz doc/CREDITS.gz doc/HINTS.gz
-%doc doc/*.HOWTO.gz README-*.gz doc/TODO.gz doc/README.gz
-%doc doc/README.SOCKS.gz 
-%doc upgrade/*
+%doc doc/{BUGS,CHANGELOG,CREDITS,HINTS,*.HOWTO,README*,TODO} README*
+%doc upgrade/* plugins/qt-gui-%{qt_gui_ver}/doc/{CHANGELOG,README,*.HOWTO,HINTS}
 %attr(755,root,root) %{_bindir}/licq
 %attr(755,root,root) %{_bindir}/viewurl-*
+%dir %{_libdir}/licq
+%dir %{_datadir}/licq
 %{_datadir}/licq/sounds
 %{_datadir}/licq/translations
 %{_datadir}/licq/utilities
@@ -213,41 +264,44 @@ rm -rf $RPM_BUILD_ROOT
 
 %files qt-gui
 %defattr(644,root,root,755)
-%doc plugins/%{qt_gui}/doc/*.gz
+%doc plugins/qt-gui-%{qt_gui_ver}/doc/*
 %attr(755,root,root) %{_libdir}/licq/licq_qt-gui*
-%{_applnkdir}/Network/Communications/licq.desktop
-%{_datadir}/licq/qt-gui/dock.*
-%{_datadir}/licq/qt-gui/icons.*
-%{_datadir}/licq/qt-gui/skin.*
+%{_applnkdir}/Network/Communications/licq-qt_gui.desktop
+%dir %{_datadir}/licq/qt-gui
+%{_datadir}/licq/qt-gui/*.*
 %dir %{_datadir}/licq/qt-gui/locale
-%lang(cs) %{_datadir}/licq/qt-gui/locale/cs.qm
-%lang(cs) %{_datadir}/licq/qt-gui/locale/cs_CZ.qm
+%lang(cs) %{_datadir}/licq/qt-gui/locale/cs*.qm
 %lang(de) %{_datadir}/licq/qt-gui/locale/de.qm
 %lang(es) %{_datadir}/licq/qt-gui/locale/es.qm
+%lang(fr) %{_datadir}/licq/qt-gui/locale/fr.qm
 %lang(it) %{_datadir}/licq/qt-gui/locale/it.qm
-%lang(ja_JP.eucJP) %{_datadir}/licq/qt-gui/locale/ja_JP.eucJP.qm
+%lang(ja) %{_datadir}/licq/qt-gui/locale/ja_JP.eucJP.qm
 %lang(pl) %{_datadir}/licq/qt-gui/locale/pl.qm
 %lang(pt) %{_datadir}/licq/qt-gui/locale/pt.qm
-%lang(ru) %{_datadir}/licq/qt-gui/locale/ru.qm
-%lang(ru) %{_datadir}/licq/qt-gui/locale/ru_RU.KOI8-R.qm
+%lang(ru) %{_datadir}/licq/qt-gui/locale/ru*.qm
 %lang(sv) %{_datadir}/licq/qt-gui/locale/sv.qm
 %lang(tr) %{_datadir}/licq/qt-gui/locale/tr.qm
 
-%files console
+%files text
 %defattr(644,root,root,755)
-%doc doc/README.CONSOLE.gz
+%doc doc/README.CONSOLE
 %attr(755,root,root) %{_libdir}/licq/licq_console*
 
-%files forwarder
-%defattr(644,root,root,755)
-%doc doc/README.FORWARDER.gz
-%attr(755,root,root) %{_libdir}/licq/licq_forwarder*
+#%files forwarder
+#%defattr(644,root,root,755)
+#%doc doc/README.FORWARDER
+#%attr(755,root,root) %{_libdir}/licq/licq_forwarder*
 
 %files rms
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/licq/licq_rms*
 
-%files autoreply
+#%files autoreply
+#%defattr(644,root,root,755)
+#%doc doc/README.AUTOREPLY
+#%attr(755,root,root) %{_libdir}/licq/licq_autoreply*
+
+%files jons-gtk-gui
 %defattr(644,root,root,755)
-%doc doc/README.AUTOREPLY.gz
-%attr(755,root,root) %{_libdir}/licq/licq_autoreply*
+%doc doc/README.TODO.JONS-GTK
+%attr(755,root,root) %{_libdir}/licq/licq_jons-gtk-gui*