rpms/kadu/F-8 import.log, NONE, 1.1 kadu-0.6.5-voice-external-libgsm.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 kadu.spec, 1.27, 1.28 sources, 1.16, 1.17 kadu-0.6.0-xmmsfix.patch, 1.1, NONE

Sat Dec 6 21:59:57 UTC 2008

Author: ecik

Update of /cvs/extras/rpms/kadu/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10765/F-8

Modified Files:
	.cvsignore kadu.spec sources 
Added Files:
	import.log kadu-0.6.5-voice-external-libgsm.patch 
Removed Files:
	kadu-0.6.0-xmmsfix.patch 
Log Message:
* Wed Dec 03 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.5-1
- 0.6.5
- Lots of changes:
-    some modules are now considered default,
-    some others are disabled,
-    some no longer exists,
-    some changed name,
- Parameter "--with=opt" given to rpmbuild makes kadu build to
  /opt instead of /usr (useful feature in testing)
- Kadu now uses qt4
- Lots of Obsoletes/Provides to prevent breaking updates
- Etc.

--- NEW FILE import.log ---
kadu-0_6_5-1_fc10:F-8:kadu-0.6.5-1.fc10.src.rpm:1228600263

kadu-0.6.5-voice-external-libgsm.patch:

--- NEW FILE kadu-0.6.5-voice-external-libgsm.patch ---
diff -u /home/ecik/download/kadu/modules/voice/CMakeLists.txt ./modules/voice/CMakeLists.txt
--- ./modules/voice/CMakeLists.txt	2008-11-11 21:53:43.000000000 +0100
+++ ./modules/voice/CMakeLists.txt	2008-11-14 22:57:47.000000000 +0100
@@ -37,8 +37,6 @@
 # XXX
 link_directories (${SNDFILE_LIBRARY_DIRS})
 
-add_subdirectory (libgsm)
-
 add_library (voice ${voice} ${SOURCES} ${MOC_FILES})
 add_custom_target (voice-translations DEPENDS ${TRANSLATION_FILES})
 add_dependencies (voice voice-translations)
WspÃ³lne podkatalogi: /home/ecik/download/kadu/modules/voice/translations i ./modules/voice/translations
diff -u /home/ecik/download/kadu/modules/voice/voice.h ./modules/voice/voice.h
--- ./modules/voice/voice.h	2008-11-11 21:53:43.000000000 +0100
+++ ./modules/voice/voice.h	2008-11-14 22:56:20.000000000 +0100
@@ -8,7 +8,7 @@
 #include <QtCore/QList>
 
 extern "C" {
-	#include "libgsm/inc/gsm.h"
+	#include <gsm/gsm.h>
 };
 
 #include "../dcc/dcc.h"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/F-8/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	19 May 2008 16:21:56 -0000	1.14
+++ .cvsignore	6 Dec 2008 21:59:27 -0000	1.15
@@ -1,37 +1,12 @@
-agent-0.4.4.tar.gz
-amarok_mediaplayer-20071220.tar.bz2
-anonymous_check-0.2.tar.bz2
-ao_sound-20060424.tar.bz2
-audacious_mediaplayer-20080423.tar.bz2
-dcopexport-0.11.3-20071129-0.6.0.tar.bz2
-falf_mediaplayer-20071225.tar.bz2
-filedesc-20080104.tar.bz2
-filtering-20080224.tar.bz2
-globalhotkeys-0.6.0-beta3.tar.gz
-kadu-0.6.0.1.tar.bz2
-kadu-antistring-0.2.tar.bz2
-kadu-auto_hide-0.2.1.tar.bz2
-kadu-autostatus-0.1.tar.bz2
-kadu-cenzor-0.2.tar.bz2
-kadu-firewall-0.7.5.1.tar.bz2
-kadu-last_seen-0.1.1.tar.bz2
-kadu-osdhints_notify-0.4.2.tar.bz2
-kadu-parser_extender-0.1.1.tar.bz2
-kadu-pcspeaker-0.6.0.3.tar.bz2
-kadu-powerkadu-2.0.4.tar.bz2
-kadu-profiles-0.3.1.tar.bz2
-kadu-split_messages-0.2.tar.bz2
-kadu-tabs-1.1.6.tar.bz2
-kadu-word_fix-0.3.tar.bz2
-led_notify-0.18.tar.bz2
-mail-0.3.3.tar.bz2
-mediaplayer-20080224.tar.bz2
-miastoplusa_sms-0.6-1.3.9.tar.gz
-mime_tex-1.4.1.1.tar.bz2
-mx610_notify-0.3.1.tar.bz2
-panelkadu-0.6.0-1.tar.gz
-screenshot-20080104.tar.bz2
-spellchecker-20071230.tar.bz2
-water_notify-0.1.1-try2.tar.bz2
-weather-3.13.tar.bz2
-xmms_mediaplayer-20080116.tar.bz2
+anonymous_check-0.6.5.1.tar.bz2
+globalhotkeys-0.6.5-7.tar.gz
+kadu-0.6.5.tar.bz2
+kadu-powerkadu-2.1.1.tar.bz2
+kadu-split_messages-0.3.tar.bz2
+kadu-tabs-1.2.1.tar.bz2
+led_notify-0.21.tar.bz2
+mail-current.tar.bz2
+mime_tex-0.6.5.1.tar.bz2
+panelkadu-0.6.5-2.tar.gz
+plus_pl_sms-0.6.5.1.tar.bz2
+senthistory-0.6.5-3.tar.gz


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/F-8/kadu.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- kadu.spec	19 May 2008 16:21:56 -0000	1.27
+++ kadu.spec	6 Dec 2008 21:59:27 -0000	1.28
@@ -1,3 +1,9 @@
+%bcond_with opt
+%if %{with opt}
+%define _prefix /opt
+%define __cmake cmake
+%endif
+
 # unpack_module_source():
 # we check if we should build a given package
 # if so, we unpack sources and add entry to config
@@ -11,6 +17,16 @@
 %endif\
 %nil
 
+# enable_module():
+# enable these internal modules which are not
+# enabled by default
+
+%define enable_module() \
+%if %{expand:%%{?with_%1:1}%%{?!with_%1:0}}\
+sed "s#^module_%1=.#module_%1=m#" -i ./.config\
+%endif\
+%nil
+
 # module_files():
 # both internal and external modules have at least their .so, .ui,
 # .desc and .qm files. In order to simplify things, this macro 
@@ -26,7 +42,7 @@
 # a module owns.
 
 %define module_files(d,c,t) \
-%{_libdir}/kadu/modules/%1.so\
+%{_libdir}/kadu/modules/lib%{1}.so\
 %{_datadir}/kadu/modules/%1.desc\
 %if "%{-c}" \
 %{_datadir}/kadu/modules/configuration/%1.ui\
@@ -42,32 +58,27 @@
 # kadu.spec
 # table to make it possible to find out quickly which
 # subpackage has which source's number
-# LAST NUMBER: 136
-# 116 agent
+# LAST NUMBER: 120
+# 109 agent
 # 101 amarok_mediaplayer
-# 102 ao_sound
-# 103 audacious_mediaplayer
-# 104 dcopexport
-# 117 falf_mediaplayer
-# 105 filedesc
-# 121 filtering
-# 122 firewall
-# 106 led_notify
-# 118 mail
-# 107 mediaplayer
-# 108 miastoplusa_sms
-# 119 mime_tex
-# 120 mx610_notify
-# 124 osdhints_notify
-# 123 panelkadu
-# 109 pcspeaker
-# 110 profiles
-# 111 screenshot
-# 112 spellchecker
-# 113 tabs
-# 125 water_notify
-# 114 weather
-# 115 xmms_mediaplayer
+# 117 anonymous_check
+# 119 audacious_mediaplayer
+# 102 globalhotkeys
+# 110 falf_mediaplayer
+# 104 led_notify
+# 111 mail
+# 112 mime_tex
+# 113 mx610_notify
+# 115 osd_hints
+# 114 panelkadu
+# 105 plus_pl_sms
+# 118 powerkadu
+# 103 senthistory
+# 120 split_messages
+# 106 tabs
+# 116 water_notify
+# 107 weather
+# 108 xmms_mediaplayer
 # the modules above aren't all external modules
 # so here's the full list
 # agent
@@ -76,12 +87,10 @@
 # anonymous_check
 # antistring
 # ao_sound
-# arts_sound
 # audacious_mediaplayer
 # auto_hide
 # autostatus
 # cenzor
-# dcopexport
 # esd_sound
 # filedesc
 # filtering
@@ -90,13 +99,14 @@
 # last_seen
 # led_notify
 # mediaplayer
-# miastoplusa_sms
-# osdhints_notify
+# plus_pl_sms
+# osd_hints
 # panelkadu
 # parser_extender
 # pcspeaker
 # powerkadu
 # profiles
+# senthistory
 # screenshot
 # spellchecker
 # split_messages
@@ -107,50 +117,55 @@
 # xmms_mediaplayer
 
 # whether we want to build certain subpackages or not
-# by default, we want them all
-%bcond_without agent
+# some of them are disabled by default due to
+# not being adjusted to kadu-0.6.5
+%bcond_with agent
 %bcond_without alsa_sound
-%bcond_without amarok_mediaplayer
+%bcond_with amarok_mediaplayer
 %bcond_without anonymous_check
-%bcond_without antistring
-%bcond_without ao_sound
-%bcond_without arts_sound
-%bcond_without audacious_mediaplayer
+#%bcond_without antistring
+#%bcond_without ao_sound
+%bcond_with audacious_mediaplayer
 %bcond_without auto_hide
-%bcond_without autostatus
-%bcond_without cenzor
-%bcond_without dcopexport
-%bcond_without esd_sound
-%bcond_without falf_mediaplayer
-%bcond_without filedesc
-%bcond_without filtering
-%bcond_without firewall
+#%bcond_without autostatus
+#%bcond_without cenzor
+#%bcond_with dcopexport
+%bcond_with falf_mediaplayer
+#%bcond_without filedesc
+#%bcond_without filtering
+#%bcond_without firewall
 %bcond_without globalhotkeys
-%bcond_without last_seen
+#%bcond_without last_seen
 %bcond_without led_notify
 %bcond_without mail
-%bcond_without mediaplayer
+#%bcond_without mediaplayer
 %bcond_without mime_tex
-%bcond_without miastoplusa_sms
-%bcond_without mx610_notify
-%bcond_without osdhints_notify
+%bcond_with mx610_notify
+%bcond_with osd_hints # formerly osd_hints
 %bcond_without panelkadu
-%bcond_without parser_extender
-%bcond_without pcspeaker
+#%bcond_without parser_extender
+#%bcond_without pcspeaker
+%bcond_without plus_pl_sms # formerly miastoplusa_sms
 %bcond_without powerkadu
-%bcond_without profiles
-%bcond_without screenshot
-%bcond_without spellchecker
+#%bcond_without profiles
+#%bcond_without screenshot
+%bcond_without senthistory
+#%bcond_without spellchecker
 %bcond_without split_messages
 %bcond_without tabs
-%bcond_without water_notify
-%bcond_without weather
-%bcond_without word_fix
-%bcond_without xmms_mediaplayer
-%bcond_without existing_libgadu 
+%bcond_with water_notify
+%bcond_with weather
+#%bcond_without word_fix
+%bcond_with xmms_mediaplayer
+#%bcond_without qt4_docking
+#%bcond_without qt4_sound
 
+%if ! %{with opt}
 Name:		kadu
-Version:	0.6.0.1
+%else
+Name:		kadu_opt
+%endif
+Version:	0.6.5
 Release:	1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Summary(pl):	Klient Gadu-Gadu
@@ -162,132 +177,111 @@
 
 # external modules:
 %if %{with agent}
-Source116:	http://misiek.jah.pl/assets/2008/2/8/agent-0.4.4.tar.gz
+Source109:	http://misiek.jah.pl/assets/2008/2/8/kadu-agent-0.5.tar.bz2
 %endif
 %if %{with amarok_mediaplayer}
 Source101:	http://www.kadu.net/download/modules_extra/amarok_mediaplayer/amarok_mediaplayer-20071220.tar.bz2
 %endif
 %if %{with anonymous_check}
-Source126:	http://kadu.net/~patryk/anonymous_check/anonymous_check-0.2.tar.bz2
-%endif
-%if %{with antistring}
-Source127:	http://www.kadu.net/~dorr/moduly/kadu-antistring-0.2.tar.bz2
-%endif
-%if %{with ao_sound}
-Source102:	http://www.kadu.net/download/modules_extra/ao_sound/ao_sound-20060424.tar.bz2
+Source117:	http://kadu.net/~patryk/anonymous_check/anonymous_check-0.6.5.1.tar.bz2
 %endif
 %if %{with audacious_mediaplayer}
-Source103:	http://www.kadu.net/download/modules_extra/audacious_mediaplayer/audacious_mediaplayer-20080423.tar.bz2
-%endif
-%if %{with auto_hide}
-Source128:	http://www.kadu.net/~dorr/moduly/kadu-auto_hide-0.2.1.tar.bz2
-%endif
-%if %{with autostatus}
-Source134:	http://www.kadu.net/~dorr/moduly/kadu-autostatus-0.1.tar.bz2
-%endif
-%if %{with cenzor}
-Source129:	http://www.kadu.net/~dorr/moduly/kadu-cenzor-0.2.tar.bz2
-%endif
-%if %{with dcopexport}
-Source104:	http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.3-20071129-0.6.0.tar.bz2
+Source119:	http://www.kadu.net/download/modules_extra/audacious_mediaplayer/audacious_mediaplayer-20080423.tar.bz2
 %endif
 %if %{with falf_mediaplayer}
-Source117:      http://www.kadu.net/download/modules_extra/falf_mediaplayer/falf_mediaplayer-20071225.tar.bz2
-%endif
-%if %{with filedesc}
-Source105:	http://www.kadu.net/download/modules_extra/filedesc/filedesc-20080104.tar.bz2
-%endif
-%if %{with filtering}
-Source121:	http://www.kadu.net/download/modules_extra/filtering/filtering-20080224.tar.bz2
-%endif
-%if %{with firewall}
-Source122:	http://www.kadu.net/~dorr/moduly/kadu-firewall-0.7.5.1.tar.bz2
+Source110:      http://www.kadu.net/download/modules_extra/falf_mediaplayer/falf_mediaplayer-20071225.tar.bz2
 %endif
 %if %{with globalhotkeys}
-Source136:	http://www.ultr.pl/kadu/globalhotkeys-0.6.0-beta3.tar.gz
-%endif
-%if %{with last_seen}
-Source135:	http://www.kadu.net/~dorr/moduly/kadu-last_seen-0.1.1.tar.bz2
+Source102:	http://www.ultr.pl/kadu/globalhotkeys-0.6.5-7.tar.gz
 %endif
 %if %{with led_notify}
-Source106:	http://kadu.net/~blysk/led_notify-0.18.tar.bz2
+Source104:	http://kadu.net/~blysk/led_notify-0.21.tar.bz2
 %endif
 %if %{with mail}
-Source118:      http://www.kadu.net/~weagle/mail/mail-0.3.3.tar.bz2
-%endif
-%if %{with mediaplayer}
-Source107:	http://www.kadu.net/download/modules_extra/mediaplayer/mediaplayer-20080224.tar.bz2
+Source111:      http://kadu.net/~michal/mail/mail-current.tar.bz2
 %endif
-%if %{with miastoplusa_sms}
-Source108:	http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.6-1.3.9.tar.gz
+%if %{with plus_pl_sms}
+Source105:	http://kadu.net/~patryk/plus_pl_sms/plus_pl_sms-0.6.5.1.tar.bz2
 %endif
 %if %{with mime_tex}
-Source119:      http://kadu.net/~patryk/mime_tex/mime_tex-1.4.1.1.tar.bz2
+Source112:      http://kadu.net/~patryk/mime_tex/mime_tex-0.6.5.1.tar.bz2
 %endif
 %if %{with mx610_notify}
-Source120:      http://kadu.jarzebski.pl/mx610_notify-0.3.1.tar.bz2
+Source113:      http://kadu.jarzebski.pl/mx610_notify-0.3.1.tar.bz2
 %endif
-%if %{with osdhints_notify}
-Source124:	http://www.kadu.net/~dorr/moduly/kadu-osdhints_notify-0.4.2.tar.bz2
+%if %{with osd_hints}
+Source115:	http://www.kadu.net/~dorr/moduly/kadu-osd_hints-0.1.2.tar.bz2
 %endif
 %if %{with panelkadu}
-Source123:	http://www.ultr.pl/kadu/panelkadu-0.6.0-1.tar.gz
-%endif
-%if %{with parser_extender}
-Source130:	http://www.kadu.net/~dorr/moduly/kadu-parser_extender-0.1.1.tar.bz2
-%endif
-%if %{with pcspeaker}
-Source109:	http://kadu.net/~dorr/moduly/kadu-pcspeaker-0.6.0.3.tar.bz2
+Source114:	http://www.ultr.pl/kadu/panelkadu-0.6.5-2.tar.gz
 %endif
 %if %{with powerkadu}
-Source131:	http://www.kadu.net/~dorr/moduly/kadu-powerkadu-2.0.4.tar.bz2
+Source118:	http://www.kadu.net/~dorr/moduly/kadu-powerkadu-2.1.1.tar.bz2
 %endif
-%if %{with profiles}
-Source110:	http://www.kadu.net/~dorr/moduly/kadu-profiles-0.3.1.tar.bz2
-%endif
-%if %{with screenshot}
-Source111:	http://www.kadu.net/download/modules_extra/screenshot/screenshot-20080104.tar.bz2
-%endif
-%if %{with spellchecker}
-Source112:	http://www.kadu.net/download/modules_extra/spellchecker/spellchecker-20071230.tar.bz2
+%if %{with senthistory}
+Source103:	http://www.ultr.pl/kadu/senthistory-0.6.5-3.tar.gz
 %endif
 %if %{with split_messages}
-Source132:	http://www.kadu.net/~dorr/moduly/kadu-split_messages-0.2.tar.bz2
+Source120:	http://www.kadu.net/~dorr/moduly/kadu-split_messages-0.3.tar.bz2
 %endif
 %if %{with tabs}
-Source113:	http://www.kadu.net/~arvenil/tabs/download/0.6.0.1/kadu-tabs-1.1.6.tar.bz2
+Source106:	http://www.kadu.net/~arvenil/tabs/download/0.6.5/kadu-tabs-1.2.1.tar.bz2
 %endif
 %if %{with water_notify}
-Source125:	http://kadu.jarzebski.pl/water_notify-0.1.1-try2.tar.bz2
+Source116:	http://kadu.jarzebski.pl/water_notify-0.1.1-try2.tar.bz2
 %endif
 %if %{with weather}
-Source114:	http://kadu.net/~blysk/weather-3.13.tar.bz2
-%endif
-%if %{with word_fix}
-Source133:	http://www.kadu.net/~dorr/moduly/kadu-word_fix-0.3.tar.bz2
+Source107:	http://kadu.net/~blysk/weather-3.13.tar.bz2
 %endif
 %if %{with xmms_mediaplayer}
-Source115:	http://www.kadu.net/download/modules_extra/xmms_mediaplayer/xmms_mediaplayer-20080116.tar.bz2
+Source108:	http://www.kadu.net/download/modules_extra/xmms_mediaplayer/xmms_mediaplayer-20080116.tar.bz2
 %endif
 
 #Patch0:		kadu-0.6.0-xmmsfix.patch
+Patch0:		kadu-0.6.5-voice-external-libgsm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  cmake
 BuildRequires:	libpng-devel libsndfile-devel openssl-devel
-%if 0%{?fedora} < 9
 BuildRequires:	qt-devel
-%else
-BuildRequires:	qt3-devel
-%endif
-%if %{with existing_libgadu}
-BuildRequires:	libgadu-devel
-%endif
-Obsoletes:	kadu-ext_info < 0.6.0-0.1.alpha1
-Obsoletes:	kadu-iwait4u < 0.6.0-0.1.alpha1
-Obsoletes:	kadu-wmaker_docking < 0.6.0-0.1.alpha1
-Obsoletes:	kadu-advanced_userlist < 0.6.0-0.1.alpha1
-Provides:	kadu-advanced_userlist = %{version}-%{release}
-Obsoletes:	kadu-exec_notify < 0.6.0-0.1.alpha1
-Provides:	kadu-exec_notify = %{version}-%{release}
+BuildRequires:	libgadu-devel > 1.8.0
+BuildRequires:	gsm-devel
+BuildRequires:  desktop-file-utils
+Obsoletes:	%{name}-ext_info < 0.6.0-0.1.alpha1
+Obsoletes:	%{name}-iwait4u < 0.6.0-0.1.alpha1
+Obsoletes:	%{name}-wmaker_docking < 0.6.0-0.1.alpha1
+Obsoletes:	%{name}-arts_sound < 0.6.5-0.1.rc2 
+#support for arts has been dropped, we've got qt4_sound now
+Obsoletes:	%{name}-dcopexport < 0.6.5-0.1.rc2 
+#dropped, there is no more DCOP in QT4
+Obsoletes:	%{name}-advanced_userlist < 0.6.0-0.1.alpha1
+Provides:	%{name}-advanced_userlist = %{version}-%{release}
+Obsoletes:	%{name}-exec_notify < 0.6.0-0.1.alpha1
+Provides:	%{name}-exec_notify = %{version}-%{release}
+Obsoletes:	%{name}-devel < 0.6.5-0.1.rc2
+Obsoletes:	%{name}-ao_sound < 0.6.5-0.1.rc2
+Provides:	%{name}-ao_sound = %{version}-%{release}
+Obsoletes:	%{name}-autostatus < 0.6.5-0.1.rc2
+Provides:	%{name}-autostatus = %{version}-%{release}
+Obsoletes:	%{name}-auto_hide < 0.6.5-0.1.rc2
+Provides:	%{name}-auto_hide = %{version}-%{release}
+Obsoletes:	%{name}-filedesc < 0.6.5-0.1.rc2
+Provides:	%{name}-filedesc = %{version}-%{release}
+Obsoletes:	%{name}-filtering < 0.6.5-0.1.rc2
+Provides:	%{name}-filtering = %{version}-%{release}
+Obsoletes:	%{name}-firewall < 0.6.5-0.1.rc2
+Provides:	%{name}-firewall = %{version}-%{release}
+Obsoletes:	%{name}-last_seen < 0.6.5-0.1.rc2
+Provides:	%{name}-last_seen = %{version}-%{release}
+Obsoletes:	%{name}-mediaplayer < 0.6.5-0.1.rc2
+Obsoletes:	%{name}-parser_extender < 0.6.5-0.1.rc2
+Provides:	%{name}-parser_extender = %{version}-%{release}
+Obsoletes:	%{name}-pcspeaker < 0.6.5-0.1.rc2
+Provides:	%{name}-pcspeaker = %{version}-%{release}
+Obsoletes:	%{name}-profiles < 0.6.5-0.1.rc2
+Provides:	%{name}-profiles = %{version}-%{release}
+Obsoletes:	%{name}-word_fix < 0.6.5-0.1.rc2
+Provides:	%{name}-word_fix = %{version}-%{release}
+
 
 %description
 Kadu is a dynamically evolving instant messenger compatible with the Gadu-Gadu
@@ -297,26 +291,6 @@
 Kadu to dynamicznie rozwijajÄ…cy siÄ™ komunikator internetowy kompatybilny z
 protokoÅ‚em Gadu-Gadu.
 
-%package devel
-Summary:	Development headers for Kadu
-Summary(pl):	Pliki nagÅ‚Ã³wkowe dla Kadu
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-%if 0%{?fedora} < 9
-Requires:       qt-devel
-%else
-Requires:       qt3-devel
-%endif
-Requires:	pkgconfig
-%description devel
-Kadu is a dynamically evolving instant messenger compatible with the Gadu-Gadu
-protocol.
-This package contains develpoment headers for Kadu.
-%description devel -l pl
-Kadu to dynamicznie rozwijajÄ…cy siÄ™ komunikator internetowy kompatybilny z
-protokoÅ‚em Gadu-Gadu.
-Ten pakiet zawiera pliki nagÅ‚Ã³wkowe dla Kadu.
-
 %if %{with agent}
 %package agent
 Summary:	Who has me on userlist
@@ -353,10 +327,10 @@
 Summary(pl):	Wsparcie dla Amaroka w module mediaplayer
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
-Requires:	kadu-mediaplayer = %{version}-%{release}
-Obsoletes:	kadu-amarok < 0.6.0-0.1.alpha1
-Provides:	kadu-amarok = %{version}-%{release}
-BuildRequires:	kdelibs3-devel
+Requires:	%{name}-mediaplayer = %{version}-%{release}
+Obsoletes:	%{name}-amarok < 0.6.0-0.1.alpha1
+Provides:	%{name}-amarok = %{version}-%{release}
+
 %description amarok_mediaplayer
 Amarok_mediaplayer is a module to put title of current song from Amarok in
 your status.
@@ -384,20 +358,20 @@
 
 %endif
 
-%if %{with antistring}
-%package antistring
-Summary:        Protection against chain letters
-Summary(pl):    Ochrona przed Å‚aÅ„cuszkami
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+#%if %{with antistring}
+#%package antistring
+#Summary:        Protection against chain letters
+#Summary(pl):    Ochrona przed Å‚aÅ„cuszkami
+#Group:          Applications/Internet
+#Requires:       %{name} = %{version}-%{release}
 
-%description antistring
-Antistring is a module to protect an user against chain letters.
+#%description antistring
+#Antistring is a module to protect an user against chain letters.
 
-%description antistring -l pl
-Antistring to moduÅ‚ sÅ‚uÅ¼Ä…cy do ochrony przed Å‚aÅ„cuszkami.
+#%description antistring -l pl
+#Antistring to moduÅ‚ sÅ‚uÅ¼Ä…cy do ochrony przed Å‚aÅ„cuszkami.
 
-%endif
+#%endif
 
 %if %{with ao_sound}
 %package ao_sound
@@ -414,22 +388,6 @@
 
 %endif
 
-%if %{with arts_sound}
-%package arts_sound
-Summary:	ARts sound support
-Summary(pl):	ObsÅ‚uga dÅºwiÄ™ku przez aRts
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-BuildRequires:	arts-devel
-
-%description arts_sound
-Alsa_sound is a module to support sound with aRts.
-
-%description arts_sound -l pl
-Alsa_sound to moduÅ‚ umoÅ¼liwiajÄ…cy obsÅ‚ugÄ™ dÅºwiÄ™ku przez aRts.
-
-%endif
-
 %if %{with audacious_mediaplayer}
 %package audacious_mediaplayer
 Summary:	Audacious support in mediaplayer module
@@ -437,7 +395,7 @@
 Group:		Applications/Internet
 BuildRequires:	audacious-devel dbus-glib-devel
 Requires:	%{name} = %{version}-%{release}
-Requires:	kadu-mediaplayer = %{version}-%{release}
+Requires:	%{name}-mediaplayer = %{version}-%{release}
 
 %description audacious_mediaplayer
 Audacious_mediaplayer is a module to put title of current song from 
@@ -449,20 +407,20 @@
 
 %endif
 
-%if %{with auto_hide}
-%package auto_hide
-Summary:        Auto hide Kadu window
-Summary(pl):    Automatyczne ukrywanie okna Kadu
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+#%if %{with auto_hide}
+#%package auto_hide
+#Summary:        Auto hide Kadu window
+#Summary(pl):    Automatyczne ukrywanie okna Kadu
+#Group:          Applications/Internet
+#Requires:       %{name} = %{version}-%{release}
 
-%description auto_hide
-Auto hide Kadu window.
+#%description auto_hide
+#Auto hide Kadu window.
 
-%description auto_hide -l pl
-Automatyczne ukrywanie okna kadu.
+#%description auto_hide -l pl
+#Automatyczne ukrywanie okna kadu.
 
-%endif
+#%endif
 
 %if %{with autostatus}
 %package autostatus
@@ -479,52 +437,20 @@
 
 %endif
 
-%if %{with cenzor}
-%package cenzor
-Summary:        Censor
-Summary(pl):    Cenzor
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
-
-%description cenzor
-Censor.
+#%if %{with cenzor}
+#%package cenzor
+#Summary:        Censor
+#Summary(pl):    Cenzor
+#Group:          Applications/Internet
+#Requires:       %{name} = %{version}-%{release}
+#
+#%description cenzor
+#Censor.
 
-%description cenzor -l pl
-Cenzor.
+#%description cenzor -l pl
+#Cenzor.
 
-%endif
-
-%if %{with dcopexport}
-%package dcopexport
-Summary:	Export some functions via DCOP
-Summary(pl):	Eksport kilku funkcji poprzez DCOP
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-BuildRequires:	kdelibs3-devel
-%description dcopexport
-Dcopexport is a module to export some Kadu functions using DCOP, e.g.
-it allows you to use gg://xxx links.
-
-%description dcopexport -l pl
-Dcopexport to moduÅ‚ eksportujÄ…cy czÄ™Å›Ä‡ funkcji Kadu poprzez DCOP, m. in.
-umoÅ¼liwia obsÅ‚ugÄ™ linkÃ³w typu gg://xxx.
-
-%endif
-
-%if %{with esd_sound}
-%package esd_sound
-Summary:	ESD sound support
-Summary(pl):	ObsÅ‚uga dÅºwiÄ™ku przez ESD
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-BuildRequires:	esound-devel
-%description esd_sound
-Alsa_sound is a module to support sound with ESD.
-
-%description esd_sound -l pl
-Alsa_sound to moduÅ‚ umoÅ¼liwiajÄ…cy obsÅ‚ugÄ™ dÅºwiÄ™ku przez ESD.
-
-%endif
+#%endif
 
 %if %{with falf_mediaplayer}
 %package falf_mediaplayer
@@ -604,22 +530,22 @@
 
 %endif
 
-%if %{with last_seen}
-%package last_seen
-Summary:        Last status info
-Summary(pl):    Informacje o ostatnich statusach kontaktÃ³w
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
-
-%description last_seen
-Last_seen is a module to check information of last statuses
-of a given contact.
-
-%description last_seen -l pl
-Last_seen to moduÅ‚ umoÅ¼liwiajÄ…cy sprawdzanie jakie statusy
-miaÅ‚ ostatnio dany kontakt.
+#%if %{with last_seen}
+#%package last_seen
+#Summary:        Last status info
+#Summary(pl):    Informacje o ostatnich statusach kontaktÃ³w
+#Group:          Applications/Internet
+#Requires:       %{name} = %{version}-%{release}
+
+#%description last_seen
+#Last_seen is a module to check information of last statuses
+#of a given contact.
+
+#%description last_seen -l pl
+#Last_seen to moduÅ‚ umoÅ¼liwiajÄ…cy sprawdzanie jakie statusy
+#miaÅ‚ ostatnio dany kontakt.
 
-%endif
+#%endif
 
 %if %{with led_notify}
 %package led_notify
@@ -652,34 +578,35 @@
 
 %endif
 
-%if %{with mediaplayer}
-%package mediaplayer
-Summary:	Put a current song name in status
-Summary(pl):	Wstawianie tytuÅ‚u sÅ‚uchanej piosenki w opisie
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%description mediaplayer
-Mediaplayer is a module to put title of current song in status.
-
-%description mediaplayer -l pl
-Mediaplayer to moduÅ‚ umoÅ¼liwiajÄ…cy umieszczenie tytuÅ‚u obecnie sÅ‚uchanej
-piosenki w opisie.
+#%if %{with mediaplayer}
+#%package mediaplayer
+#Summary:	Put a current song name in status
+#Summary(pl):	Wstawianie tytuÅ‚u sÅ‚uchanej piosenki w opisie
+#Group:		Applications/Internet
+#Requires:	%{name} = %{version}-%{release}
+#%description mediaplayer
+#Mediaplayer is a module to put title of current song in status.
+
+#%description mediaplayer -l pl
+#Mediaplayer to moduÅ‚ umoÅ¼liwiajÄ…cy umieszczenie tytuÅ‚u obecnie sÅ‚uchanej
+#piosenki w opisie.
 
-%endif
+#%endif
 
-%if %{with miastoplusa_sms}
-%package miastoplusa_sms
+%if %{with plus_pl_sms}
+%package plus_pl_sms
 Summary:	Miasto Plusa SMS gateway support
 Summary(pl):	ObsÅ‚uga bramki SMS Miasto Plusa
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	%{name}-miastoplusa_sms < 0.6.5-0.1.rc2
+Provides:	%{name}-miastoplusa_sms = %{version}-%{release}
 BuildRequires:	curl-devel
-%description miastoplusa_sms
-Miastoplusa_sms is a module to support Miasto Plusa SMS Gateway.
+%description plus_pl_sms
+Plus_pl_sms is a module to support Plus.pl SMS Gateway.
 
-%description miastoplusa_sms -l pl
-Miastoplusa_sms to moduÅ‚ umoÅ¼liwiajÄ…cy obsÅ‚ugÄ™ bramki SMS-owej "Miasto
-Plusa".
+%description plus_pl_sms -l pl
+Plus_pl_sms to moduÅ‚ umoÅ¼liwiajÄ…cy obsÅ‚ugÄ™ bramki SMS-owej "Plus.pl".
 
 %endif
 
@@ -714,23 +641,24 @@
 
 %endif
 
-%if %{with osdhints_notify}
-%package osdhints_notify
+%if %{with osd_hints}
+%package osd_hints
 Summary:	Notification by OSD-like hints
 Summary(pl):	Powiadamanie o zdarzeniach przy pomocy dymkÃ³w typu OSD
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-%description osdhints_notify
-Osdhints_notify is a module to notify users about some events
+Obsoletes:	%{name}-osdhints-notify < 0.6.5-1
+Provides:	%{name}-osd_hints = %{version}-%{release}
+%description osd_hints
+Osd_hints is a module to notify users about some events
 with OSD-like hints.
 
-%description osdhints_notify -l pl
-Osdhints_notify to moduÅ‚ umoÅ¼liwiajÄ…cy powiadamianie uÅ¼ytkownika
+%description osd_hints -l pl
+Osd_hints to moduÅ‚ umoÅ¼liwiajÄ…cy powiadamianie uÅ¼ytkownika
 o pewnych zdarzeniach przy pomocy dymkÃ³w typu OSD.
 
 %endif
 
-
 %if %{with panelkadu}
 %package panelkadu
 Summary:	Makes a panel from Kadu main window
@@ -746,21 +674,20 @@
 
 %endif
 
+#%if %{with parser_extender}
+#%package parser_extender
+#Summary:        Extends Kadu Parser
+#Summary(pl):    Rozszerza moÅ¼liwoÅ›ci parsera Kadu
+#Group:          Applications/Internet
+#Requires:       %{name} = %{version}-%{release}
 
-%if %{with parser_extender}
-%package parser_extender
-Summary:        Extends Kadu Parser
-Summary(pl):    Rozszerza moÅ¼liwoÅ›ci parsera Kadu
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
-
-%description parser_extender
-Extends Kadu Parser.
+#%description parser_extender
+#Extends Kadu Parser.
 
-%description parser_extender -l pl
-Rozszerza moÅ¼liwoÅ›Ä‡ parsera Kadu.
+#%description parser_extender -l pl
+#Rozszerza moÅ¼liwoÅ›Ä‡ parsera Kadu.
 
-%endif
+#%endif
 
 %if %{with pcspeaker}
 %package pcspeaker
@@ -784,14 +711,17 @@
 Summary(pl):    PowerKadu
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Requires:	kadu-anonymous_check = %{version}-%{release}
-Requires:	kadu-antistring = %{version}-%{release}
-Requires:	kadu-auto_hide = %{version}-%{release}
-Requires:	kadu-cenzor = %{version}-%{release}
-Requires:	kadu-parser_extender = %{version}-%{release}
-Requires:	kadu-split_messages = %{version}-%{release}
-Requires:	kadu-word_fix = %{version}-%{release}
-
+Requires:	%{name}-anonymous_check = %{version}-%{release}
+#Requires:	kadu-antistring = %{version}-%{release}
+#Requires:	kadu-auto_hide = %{version}-%{release}
+#Requires:	kadu-cenzor = %{version}-%{release}
+#Requires:	kadu-parser_extender = %{version}-%{release}
+Requires:	%{name}-split_messages = %{version}-%{release}
+#Requires:	kadu-word_fix = %{version}-%{release}
+
+#All submodules except anonymous-check and split_messages are now merged into kadu core, 
+#so powerkadu shouldn't require them.
+ 
 %description powerkadu
 PowerKadu is a metapackage which contains modules known from the "old"
 powerkadu.
@@ -834,6 +764,22 @@
 
 %endif
 
+%if %{with senthistory}
+%package senthistory
+Summary:	History of sent messages in chat windows
+Summary(pl):	Historia wysÅ‚anych wiadomoÅ›ci w oknie rozmowy
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description senthistory
+Senthistory is a module which adds history of sent messages to
+chat windows.
+
+%description senthistory -l pl
+Senthistory to moduÅ‚, ktÃ³ry dodaje historiÄ™ wysÅ‚anych wiadomoÅ›ci
+do okien rozmowy.
+
+%endif
+
 %if %{with spellchecker}
 %package spellchecker
 Summary:	Spellchecking in chat window
@@ -920,20 +866,20 @@
 
 %endif
 
-%if %{with word_fix}
-%package word_fix
-Summary:        Automatic word replacement
-Summary(pl):    Automatyczna zamiana sÅ‚Ã³w
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
+#%if %{with word_fix}
+#%package word_fix
+#Summary:        Automatic word replacement
+#Summary(pl):    Automatyczna zamiana sÅ‚Ã³w
+#Group:          Applications/Internet
+#Requires:       %{name} = %{version}-%{release}
 
-%description word_fix
-Automatic word replacement
+#%description word_fix
+#Automatic word replacement
 
-%description word_fix -l pl
-Automatyczna zamiana sÅ‚Ã³w
+#%description word_fix -l pl
+#Automatyczna zamiana sÅ‚Ã³w
 
-%endif
+#%endif
 
 %if %{with xmms_mediaplayer}
 %package xmms_mediaplayer
@@ -942,9 +888,9 @@
 Group:		Applications/Internet
 BuildRequires:	xmms-devel
 Requires:	%{name} = %{version}-%{release}
-Requires:	kadu-mediaplayer = %{version}-%{release}
-Obsoletes:	kadu-xmms < 0.6.0-0.1.alpha1
-Provides:	kadu-xmms = %{version}-%{release}
+Requires:	%{name}-mediaplayer = %{version}-%{release}
+Obsoletes:	%{name}-xmms < 0.6.0-0.1.alpha1
+Provides:	%{name}-xmms = %{version}-%{release}
 %description xmms_mediaplayer
 Xmms_mediaplayer is a module to put title of current song from xmms in
 your status.
@@ -958,54 +904,55 @@
 
 %prep
 %setup -q -n kadu
-#%setup -q -D -T -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -n kadu/modules
+%unpack_module_source 109 agent
 %unpack_module_source 101 amarok_mediaplayer
-%unpack_module_source 102 ao_sound
-%unpack_module_source 103 audacious_mediaplayer
-%unpack_module_source 104 dcopexport
-%unpack_module_source 105 filedesc
-%unpack_module_source 106 led_notify
-%unpack_module_source 107 mediaplayer
-%unpack_module_source 108 miastoplusa_sms
-%unpack_module_source 109 pcspeaker
-%unpack_module_source 110 profiles
-%unpack_module_source 111 screenshot
-%unpack_module_source 112 spellchecker
-%unpack_module_source 113 tabs
-%unpack_module_source 114 weather
-%unpack_module_source 115 xmms_mediaplayer
-%unpack_module_source 116 agent
-%unpack_module_source 117 falf_mediaplayer
-%unpack_module_source 118 mail
-%unpack_module_source 119 mime_tex
-%unpack_module_source 120 mx610_notify
-%unpack_module_source 121 filtering
-%unpack_module_source 122 firewall
-%unpack_module_source 123 panelkadu
-%unpack_module_source 124 osdhints_notify
-%unpack_module_source 125 water_notify
-%unpack_module_source 126 anonymous_check
-%unpack_module_source 127 antistring
-%unpack_module_source 128 auto_hide
-%unpack_module_source 129 cenzor
-%unpack_module_source 130 parser_extender
-%unpack_module_source 131 powerkadu
-%unpack_module_source 132 split_messages
-%unpack_module_source 133 word_fix
-%unpack_module_source 134 autostatus
-%unpack_module_source 135 last_seen
-%unpack_module_source 136 globalhotkeys
+%unpack_module_source 117 anonymous_check
+%unpack_module_source 119 audacious_mediaplayer
+%unpack_module_source 102 globalhotkeys
+%unpack_module_source 110 falf_mediaplayer
+%unpack_module_source 104 led_notify
+%unpack_module_source 111 mail
+%unpack_module_source 112 mime_tex
+%unpack_module_source 113 mx610_notify
+%unpack_module_source 115 osd_hints
+%unpack_module_source 114 panelkadu
+%unpack_module_source 105 plus_pl_sms
+%unpack_module_source 118 powerkadu
+%unpack_module_source 103 senthistory
+%unpack_module_source 120 split_messages
+%unpack_module_source 106 tabs
+%unpack_module_source 116 water_notify
+%unpack_module_source 107 weather
+%unpack_module_source 108 xmms_mediaplayer
 %setup -q -D -T -n kadu
 
-%if %{with alsa_sound}
-sed "s#^module_alsa_sound=.#module_alsa_sound=m#" -i .config
-%endif
-%if %{with arts_sound}
-sed "s#^module_arts_sound=.#module_arts_sound=m#" -i .config
-%endif
-%if %{with esd_sound}
-sed "s#^module_esd_sound=.#module_esd_sound=m#" -i .config
-%endif 
+%enable_module alsa_sound
+%enable_module antistring
+%enable_module ao_sound
+%enable_module auto_hide
+%enable_module autostatus
+%enable_module cenzor
+%enable_module filedesc
+%enable_module filtering
+%enable_module firewall
+%enable_module last_seen
+#enable_module mediaplayer
+%enable_module qt4_docking
+%enable_module qt4_sound
+%enable_module parser_extender
+%enable_module pcspeaker
+%enable_module profiles
+%enable_module screenshot
+%enable_module spellchecker
+%enable_module word_fix
+
+# exec_notify and ext_sound have always been standard modules
+# so let's keep it this way
+sed "s#^module_exec_notify=.#module_exec_notify=m#" -i .config
+sed "s#^module_ext_sound=.#module_ext_sound=m#" -i .config
+
+sed "s#^icons_glass16=.#icons_glass16=n#" -i .config
+sed "s#^icons_glass22=.#icons_glass22=n#" -i .config
 
 %if %{with audacious_mediaplayer}
 pushd modules/audacious_mediaplayer
@@ -1021,28 +968,33 @@
 sed "/CheckUpdates/s#true#false#" -i kadu.cpp
 popd
 
+# force the right lib path and set DETAILED_VERSION
+sed 's#set (LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)#set (LIBDIR %{_libdir})#' -i CMakeLists.txt
+sed 's@#define DETAILED.*@#define DETAILED_VERSION "%{name}-%{version}-%{release}"@' -i kadu-config.h.cmake
+
+# fix mediaplayer plugin bug
+#echo 'install (FILES "data/mediaplayer.png" DESTINATION "share/kadu/modules/data/mediaplayer")' >> modules/mediaplayer/CMakeLists.txt
+
+%patch0
+
 %build
-%if %{with existing_libgadu}
-%define _with_existing_libgadu 1
-%endif
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure --enable-debug \
-	%{?_with_existing_libgadu:--with-existing-libgadu}
-make %{?_smp_mflags}
+%{cmake} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_USE_PTHREADS:BOOL=ON -DBUILD_DESCRIPTION="Fedora" .
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Internet/kadu.desktop
-##==change permissions of .so files:
-for binary in `find $RPM_BUILD_ROOT -type f -name *.so`; do
-chmod a+x $binary
-done
-#+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications/kadu.desktop
 desktop-file-install --vendor fedora				\
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
 	%{SOURCE3}
+
+if [ "x%{_lib}" != "xlib" ]; then
+	mv $RPM_BUILD_ROOT%{_prefix}/lib $RPM_BUILD_ROOT%{_libdir}
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1051,11 +1003,9 @@
 
 %doc COPYING
 %{_bindir}/kadu
-%{_bindir}/kadu-mozilla
 %{_datadir}/applications/fedora-kadu.desktop
 %dir %{_libdir}/kadu
 %dir %{_libdir}/kadu/modules
-%dir %{_libdir}/kadu/modules/bin
 %dir %{_datadir}/kadu
 %{_datadir}/kadu/syntax
 %{_datadir}/kadu/AUTHORS
@@ -1074,28 +1024,25 @@
 %{_datadir}/kadu/themes/emoticons/penguins
 %dir %{_datadir}/kadu/themes/icons
 %{_datadir}/kadu/themes/icons/default
-%dir %{_datadir}/kadu/themes/sounds
-%{_datadir}/kadu/themes/sounds/default
+%dir %{_datadir}/kadu/themes/sound
+%{_datadir}/kadu/themes/sound/default
 %{_datadir}/kadu/translations
 %{_datadir}/pixmaps/kadu*.png
 %{_datadir}/kadu/modules/docking.desc
 %{_datadir}/kadu/modules/configuration/docking.ui
 %{_datadir}/kadu/modules/translations/docking_*.qm
-%{_datadir}/kadu/modules/notify.desc
-%{_datadir}/kadu/modules/configuration/notify.ui
-%{_datadir}/kadu/modules/translations/notify_*.qm
-%{_datadir}/kadu/modules/sound.desc
-%{_datadir}/kadu/modules/configuration/sound.ui
-%{_datadir}/kadu/modules/translations/sound_*.qm
-%if ! %{with existing_libgadu}
-%exclude %{_libdir}/libgadu*a
-%endif
 
 # internal modules:
 %module_files account_management -t
 %module_files advanced_userlist -ct
+%module_files alsa_sound -ct
+%module_files antistring -cdt
+%module_files ao_sound
+%module_files auto_hide -ct
 %module_files autoaway -ct
 %module_files autoresponder -ct
+%module_files autostatus -ct
+%module_files cenzor -cdt
 %module_files config_wizard -td
 %module_files dcc -ct
 %module_files default_sms -ct
@@ -1103,23 +1050,27 @@
 %module_files encryption -ct
 %module_files exec_notify -t
 %module_files ext_sound -ct
+%module_files filedesc -ct
+%module_files filtering -cdt
+%module_files firewall -ct
 %module_files hints -ct
 %module_files history -ct
-%module_files migration -t
+%module_files last_seen -t
+#module_files mediaplayer -cdt
+%module_files notify -ct
+%module_files qt4_docking
+%module_files qt4_sound
+%module_files parser_extender -ct
+%module_files pcspeaker -ct
+%module_files profiles -t
+%module_files screenshot -ct
 %module_files sms -ct
+%module_files sound -ct
+%module_files spellchecker -ct
 %module_files voice -ct
 %module_files window_notify -t
-%module_files x11_docking -t
+%module_files word_fix -cdt
 
-%files devel
-%defattr(-,root,root,-)
-%{_bindir}/kadu-config
-%{_includedir}/kadu
-%if ! %{with existing_libgadu}
-%exclude %{_includedir}/libgadu.h
-%exclude %{_libdir}/pkgconfig/libgadu.pc
-%exclude %{_libdir}/libgadu*
-%endif
 # external modules:
 
 %if %{with agent}
@@ -1134,30 +1085,12 @@
 %module_files amarok_mediaplayer
 %endif
 
-%if %{with alsa_sound}
-%files alsa_sound
-%defattr(-, root, root, -)
-%module_files alsa_sound -ct
-%endif
-
 %if %{with anonymous_check}
 %files anonymous_check
 %defattr(-, root, root, -)
 %module_files anonymous_check -ct
 %endif
 
-%if %{with antistring}
-%files antistring
-%defattr(-, root, root, -)
-%module_files antistring -cdt
-%endif
-
-%if %{with ao_sound}
-%files ao_sound
-%defattr(-, root, root, -)
-%module_files ao_sound
-%endif
-
 %if %{with arts_sound}
 %files arts_sound
 %defattr(-, root, root, -)
@@ -1171,35 +1104,18 @@
 %module_files audacious_mediaplayer
 %endif
 
-%if %{with auto_hide}
-%files auto_hide
-%defattr(-, root, root, -)
-%module_files auto_hide -ct
-%endif
-%if %{with autostatus}
-%files autostatus
-%defattr(-, root, root, -)
-%module_files autostatus -ct
-%endif
-
-%if %{with cenzor}
-%files cenzor
-%defattr(-, root, root, -)
-%module_files cenzor -cdt
-%endif
-
-%if %{with dcopexport}
-%files dcopexport
-%defattr(-, root, root, -)
-%module_files dcopexport -dt
-%{_libdir}/kadu/modules/bin/dcopexport
-%endif
-
-%if %{with esd_sound}
-%files esd_sound
-%defattr(-, root, root, -)
-%module_files esd_sound
-%endif
+#%if %{with cenzor}
+#%files cenzor
+#%defattr(-, root, root, -)
+#%module_files cenzor -cdt
+#%endif
+
+#if %{with dcopexport}
+#files dcopexport
+#defattr(-, root, root, -)
+#module_files dcopexport -dt
+#{_libdir}/kadu/modules/bin/dcopexport
+#endif
 
 %if %{with falf_mediaplayer}
 %files falf_mediaplayer
@@ -1207,36 +1123,12 @@
 %module_files falf_mediaplayer
 %endif
 
-%if %{with filedesc}
-%files filedesc
-%defattr(-, root, root, -)
-%module_files filedesc -cdt
-%endif
-
-%if %{with filtering}
-%files filtering
-%defattr(-, root, root, -)
-%module_files filtering -cdt
-%endif
-
-%if %{with firewall}
-%files firewall
-%defattr(-, root, root, -)
-%module_files firewall -ct
-%endif
-
 %if %{with globalhotkeys}
 %files globalhotkeys
 %defattr(-, root, root, -)
 %module_files globalhotkeys -ct
 %endif
 
-%if %{with last_seen}
-%files last_seen
-%defattr(-, root, root, -)
-%module_files last_seen -t
-%endif
-
 %if %{with led_notify}
 %files led_notify
 %defattr(-, root, root, -)
@@ -1249,16 +1141,10 @@
 %module_files mail -ct
 %endif
 
-%if %{with mediaplayer}
-%files mediaplayer
-%defattr(-, root, root, -)
-%module_files mediaplayer -cdt
-%endif
-
-%if %{with miastoplusa_sms}
-%files miastoplusa_sms
+%if %{with plus_pl_sms}
+%files plus_pl_sms
 %defattr(-, root, root, -)
-%module_files miastoplusa_sms -cdt
+%module_files plus_pl_sms -cdt
 %endif
 
 %if %{with mime_tex}
@@ -1274,10 +1160,10 @@
 %module_files mx610_notify -ct
 %endif
 
-%if %{with osdhints_notify}
-%files osdhints_notify
+%if %{with osd_hints}
+%files osd_hints
 %defattr(-, root, root, -)
-%module_files osdhints_notify -cdt
+%module_files osd_hints -cdt
 %endif
 
 %if %{with panelkadu}
@@ -1286,40 +1172,16 @@
 %module_files panelkadu -ct
 %endif
 
-%if %{with parser_extender}
-%files parser_extender
-%defattr(-, root, root, -)
-%module_files parser_extender -ct
-%endif
-
-%if %{with pcspeaker}
-%files pcspeaker
-%defattr(-, root, root, -)
-%module_files pcspeaker -ct
-%endif
-
 %if %{with powerkadu}
 %files powerkadu
 %defattr(-, root, root, -)
 %module_files powerkadu -dt
 %endif
 
-%if %{with profiles}
-%files profiles
+%if %{with senthistory}
+%files senthistory
 %defattr(-, root, root, -)
-%module_files profiles -t
-%endif
-
-%if %{with screenshot}
-%files screenshot
-%defattr(-, root, root, -)
-%module_files screenshot -cdt
-%endif
-
-%if %{with spellchecker}
-%files spellchecker
-%defattr(-, root, root, -)
-%module_files spellchecker -cdt
+%module_files senthistory -ct
 %endif
 
 %if %{with split_messages}
@@ -1328,6 +1190,7 @@
 %module_files split_messages -ct
 %endif
 
+
 %if %{with tabs}
 %files tabs
 %defattr(-, root, root, -)
@@ -1347,12 +1210,6 @@
 %module_files weather -cdt
 %endif
 
-%if %{with word_fix}
-%files word_fix
-%defattr(-, root, root, -)
-%module_files word_fix -cdt
-%endif
-
 %if %{with xmms_mediaplayer}
 %files xmms_mediaplayer
 %defattr(-, root, root, -)
@@ -1361,9 +1218,22 @@
 
 
 %changelog
+* Wed Dec 03 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.5-1
+- 0.6.5
+- Lots of changes:
+-    some modules are now considered default,
+-    some others are disabled,
+-    some no longer exists,
+-    some changed name,
+- Parameter "--with=opt" given to rpmbuild makes kadu build to
+  /opt instead of /usr (useful feature in testing)
+- Kadu now uses qt4
+- Lots of Obsoletes/Provides to prevent breaking updates
+- Etc.
+
 * Mon May 19 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.0.1-1
 - 0.6.0.1
-- New version of mime_tex, tabs, firewall, osdhints_notify, powerkadu,
+- New version of mime_tex, tabs, firewall, osd_hints, powerkadu,
 audacious_mediaplayer
 - New url of ao_sound
 - New modules: autostatus, last_seen, globalhotkeys
@@ -1374,19 +1244,19 @@
 
 * Wed Mar 12 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.0-2
 - Fix bugs 436574 (f8) and 436575 (f7)
-- New versions of tabs and osdhints_notify
+- New versions of tabs and osd_hints
 - New modules: anonymous_check antistring auto_hide cenzor parser_extender 
 powerkadu split_messages word_fix
 
 
 * Thu Feb 28 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.0-1
 - Stable
-- New versions of osdhints_notify, audacious_mediaplayer, filtering,
+- New versions of osd_hints, audacious_mediaplayer, filtering,
 mediaplayer and panelkadu
 
 * Mon Feb 18 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.12.rc4
 - rc4
-- Add modules: water_notify, osdhints_notify, panelkadu
+- Add modules: water_notify, osd_hints, panelkadu
 
 * Wed Feb 13 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.11.rc3
 - rc3
@@ -1439,7 +1309,7 @@
 
 * Sat Dec 01 2007 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.1.alpha1
 - 0.6.0-alpha1
-- remove xmms, amarok, mail, extinfo, iwait4u, powerkadu, advanced_userlist, osdhints_notify, screenshot, firewall, filedesc
+- remove xmms, amarok, mail, extinfo, iwait4u, powerkadu, advanced_userlist, osd_hints, screenshot, firewall, filedesc
 - update spellchecker, weather, dcopexport, miastopolusa_sms, tabs, led_notify, filtering
 - get rid of tabs patch
 - add filedesc, spellchecker and firewall patches
@@ -1462,7 +1332,7 @@
 - Bump to RC2
 
 * Mon Nov 14 2006 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.20.rc1
-- Add advanced_userlist, osdhints_notify and screenshot modules
+- Add advanced_userlist, osd_hints and screenshot modules
 
 * Wed Nov 08 2006 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.5.0-0.19.rc1
 - Update kadu to RC1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/F-8/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	19 May 2008 16:21:56 -0000	1.16
+++ sources	6 Dec 2008 21:59:27 -0000	1.17
@@ -1,37 +1,12 @@
-4401e0e3c509af347cb14a89236301ea  agent-0.4.4.tar.gz
-51d304e335e814f3d8c0f1654007a7d7  amarok_mediaplayer-20071220.tar.bz2
-84abb6515abc9a5aaa5d1f6b1f2b12e0  anonymous_check-0.2.tar.bz2
-95809d330e48e61f58ec961ddbf0b529  ao_sound-20060424.tar.bz2
-76611a2d47203465224b329bfa1eea7e  audacious_mediaplayer-20080423.tar.bz2
-b36fcfcf4756285f30cbb6c2b6c2a2da  dcopexport-0.11.3-20071129-0.6.0.tar.bz2
-927db40f7136ff86b3e83307b5cec2d9  falf_mediaplayer-20071225.tar.bz2
-8d11979fa8a3795f7ab20fbb1fb8bdbb  filedesc-20080104.tar.bz2
-a672d4ef9ce113196e4689b9141b4aef  filtering-20080224.tar.bz2
-be9676bc007fa42ab21c130daae5f706  globalhotkeys-0.6.0-beta3.tar.gz
-e879ac2fedbd659099376133a83dce44  kadu-0.6.0.1.tar.bz2
-4e09f977471ec504ad4acdb52fdb76ec  kadu-antistring-0.2.tar.bz2
-42dd07b9745aabd1c52bf088ae3b79e9  kadu-auto_hide-0.2.1.tar.bz2
-bd508a350cb26f2925d055a40cd92e89  kadu-autostatus-0.1.tar.bz2
-ff759d913d2cc3f160502fbf23993c87  kadu-cenzor-0.2.tar.bz2
-f0d4e6f3ec989d71eb3d07759dd9b92a  kadu-firewall-0.7.5.1.tar.bz2
-b0b36bef5d8ff28b5fb6de0d1e1e8cc7  kadu-last_seen-0.1.1.tar.bz2
-4a5e8653114c8f147eade56faa4c40eb  kadu-osdhints_notify-0.4.2.tar.bz2
-06378537ce5dace67ce623bcb05b0ea1  kadu-parser_extender-0.1.1.tar.bz2
-4b8abfe0c57efabb49ba8c6c71a316f2  kadu-pcspeaker-0.6.0.3.tar.bz2
-6336dbee2fad52bf634f7d92f8c4a6eb  kadu-powerkadu-2.0.4.tar.bz2
-d7ec7f808d15308d10ed76d1e3743f37  kadu-profiles-0.3.1.tar.bz2
-450cbb8047aa15f4d040da361b660c5d  kadu-split_messages-0.2.tar.bz2
-f9a335a99785432499c733f0956f4c1c  kadu-tabs-1.1.6.tar.bz2
-691484a500c75079508b240449cb9c90  kadu-word_fix-0.3.tar.bz2
-786a0ee40a3aef03b51e2d89a2bceda5  led_notify-0.18.tar.bz2
-898561b215ac10a99be62fa4e3a50a55  mail-0.3.3.tar.bz2
-8a27d4873e6896d63f7c8193029b24ca  mediaplayer-20080224.tar.bz2
-e5c4d5cd94cef40730e281b9a6c9ed37  miastoplusa_sms-0.6-1.3.9.tar.gz
-7c407d03d64e2aaa62ae33187650d047  mime_tex-1.4.1.1.tar.bz2
-08bba105d9307bbf1a8e8482529441a4  mx610_notify-0.3.1.tar.bz2
-f520f9e7a295c8ab2ea0dd93d92c0318  panelkadu-0.6.0-1.tar.gz
-47d3d5564b272a186667c1507e19844f  screenshot-20080104.tar.bz2
-a46eab2f3d9c31cee13ccf3a441bceec  spellchecker-20071230.tar.bz2
-10320f9b96366422bbcd7ec76d4e85a1  water_notify-0.1.1-try2.tar.bz2
-41a6edd1356a36e4606e432d0bc856f6  weather-3.13.tar.bz2
-97dd4c9cd19b69b9ab6d38a20cd37a2e  xmms_mediaplayer-20080116.tar.bz2
+c44b443ce63945acb3f13540d8564060  anonymous_check-0.6.5.1.tar.bz2
+013c8ef4966f1fb89960db451882feb0  globalhotkeys-0.6.5-7.tar.gz
+2049a1bae2eb4713615ad9a2f976e764  kadu-0.6.5.tar.bz2
+770ae1ad5a36c62e3cfc168d7ac38706  kadu-powerkadu-2.1.1.tar.bz2
+604dd507df7faaa7a332c4f6d9d797f2  kadu-split_messages-0.3.tar.bz2
+902b7c10f28f897aeb551dfdb24477dc  kadu-tabs-1.2.1.tar.bz2
+e857f0fb213700eb366915eca9c1e454  led_notify-0.21.tar.bz2
+8509cb081936e487d884ea4622991b9d  mail-current.tar.bz2
+0197d1da8143629933677c5ac56356de  mime_tex-0.6.5.1.tar.bz2
+eeb5626177d38918d2611fd23f82c478  panelkadu-0.6.5-2.tar.gz
+e8757b4a45766e251a5200af21366b73  plus_pl_sms-0.6.5.1.tar.bz2
+6a339ec43dd914d9b0912130077c3638  senthistory-0.6.5-3.tar.gz


--- kadu-0.6.0-xmmsfix.patch DELETED ---


