rpms/kadu/F-7 .cvsignore, 1.10, 1.11 kadu.spec, 1.21, 1.22 sources, 1.12, 1.13

Michał Bentkowski (ecik) fedora-extras-commits at redhat.com
Wed Mar 5 18:06:15 UTC 2008


Author: ecik

Update of /cvs/extras/rpms/kadu/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4206

Modified Files:
	.cvsignore kadu.spec sources 
Log Message:
* Thu Feb 28 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-1
- Stable
- New versions of osdhints_notify, audacious_mediaplayer, filtering,
mediaplayer and panelkadu



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/F-7/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	2 Jan 2007 20:33:34 -0000	1.10
+++ .cvsignore	5 Mar 2008 18:05:32 -0000	1.11
@@ -1,6 +1,26 @@
-kadu-20061029.tar.bz2
-advanced_userlist-20061010.tar.bz2
-kadu-osdhints_notify-0.3.2.1.tar.gz
-screenshot-0.4.4.tar.gz
-kadu-0.5.0-rc2.tar.bz2
-kadu-0.5.0.tar.bz2
+agent-0.4.4.tar.gz
+amarok_mediaplayer-20071220.tar.bz2
+ao_sound-20060424.tar.bz2
+audacious_mediaplayer-20080224.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
+kadu-0.6.0.tar.bz2
+kadu-firewall-0.7.5.tar.bz2
+kadu-osdhints_notify-0.4.0.9.tar.bz2
+kadu-pcspeaker-0.6.0.3.tar.bz2
+kadu-profiles-0.3.1.tar.bz2
+kadu-tabs-1.1.4.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.tar.bz2
+mx610_notify-0.3.1.tar.bz2
+panelkadu-0.6-beta3.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


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/F-7/kadu.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kadu.spec	5 Apr 2007 09:42:12 -0000	1.21
+++ kadu.spec	5 Mar 2008 18:05:32 -0000	1.22
@@ -1,312 +1,778 @@
+# unpack_module_source():
+# we check if we should build a given package
+# if so, we unpack sources and add entry to config
+# %1 - source number
+# %2 - subpackage name
+
+%define unpack_module_source() \
+%if %{with %2}\
+%setup -q -D -T -a %1 -n kadu/modules\
+sed "s#^module_%2=.#module_%2=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 
+# creates a simple %files section
+# %1 - module/subpackage name
+# if parameter -d is specified, module owns its data dir
+# 
+# all modules have very similar directory and files structure, so
+# this macro is created to make it possible to simplify %files
+# sections. All modules have .desc and .so files, a lot of them
+# has configurations and translations or data dirs. We use 
+# respectively -c, -t and -d parameters to know which files
+# a module owns.
+
+%define module_files(d,c,t) \
+%{_libdir}/kadu/modules/%1.so\
+%{_datadir}/kadu/modules/%1.desc\
+%if "%{-c}" \
+%{_datadir}/kadu/modules/configuration/%1.ui\
+%endif\
+%if "%{-t}" \
+%{_datadir}/kadu/modules/translations/%{1}_*.qm\
+%endif\
+%if "%{-d}" \
+%{_datadir}/kadu/modules/data/%1\
+%endif\
+%nil
+
+# kadu.spec
+# table to make it possible to find out quickly which
+# subpackage has which source's number
+# LAST NUMBER: 125
+# 116 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
+# the modules above aren't all external modules
+# so here's the full list
+# agent
+# alsa_sound
+# amarok_mediaplayer
+# ao_sound
+# arts_sound
+# audacious_mediaplayer
+# dcopexport
+# esd_sound
+# filedesc
+# filtering
+# firewall
+# led_notify
+# mediaplayer
+# miastoplusa_sms
+# osdhints_notify
+# panelkadu
+# pcspeaker
+# profiles
+# screenshot
+# spellchecker
+# tabs
+# water_notify
+# weather
+# xmms_mediaplayer
+
+# whether we want to build certain subpackages or not
+# by default, we want them all
+%bcond_without agent
+%bcond_without alsa_sound
+%bcond_without amarok_mediaplayer
+%bcond_without ao_sound
+%bcond_without arts_sound
+%bcond_without audacious_mediaplayer
+%bcond_without dcopexport
+%bcond_without esd_sound
+%bcond_without falf_mediaplayer
+%bcond_without filedesc
+%bcond_without filtering
+%bcond_without firewall
+%bcond_without led_notify
+%bcond_without mail
+%bcond_without mediaplayer
+%bcond_without mime_tex
+%bcond_without miastoplusa_sms
+%bcond_without mx610_notify
+%bcond_without osdhints_notify
+%bcond_without panelkadu
+%bcond_without pcspeaker
+%bcond_without profiles
+%bcond_without screenshot
+%bcond_without spellchecker
+%bcond_without tabs
+%bcond_without water_notify
+%bcond_without weather
+%bcond_without xmms_mediaplayer # doesn't build right now
+%bcond_without existing_libgadu # current release of libgadu is too old
+	# to work properly. Until there's no new release, we must use
+	# internal libgadu of kadu.
+
+
 Name:		kadu
-Version:	0.5.0
-Release:	2%{?dist}
+Version:	0.6.0
+Release:	1%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
+Summary(pl):	Klient Gadu-Gadu
 Group:		Applications/Internet
-License:	GPL
+License:	GPLv2
 URL:		http://www.kadu.net
-Source0:	http://www.kadu.net/download/stable/kadu-0.5.0.tar.bz2
+Source0:	http://www.kadu.net/download/stable/kadu-%{version}.tar.bz2
 Source3:	kadu.desktop
-# Sources 100-149 are external modules
-Source100:	http://scripts.one.pl/xmms/devel/0.5.0/xmms-1.32.tar.gz
-Source101:	http://scripts.one.pl/amarok/devel/0.5.0/amarok-1.19.tar.gz
-Source102:	http://scripts.one.pl/filedesc/devel/0.5.0/filedesc-1.12.tar.gz
-Source103:	http://www.kadu.net/download/modules_mirror/mail-current.tar.gz
-Source104:	http://scripts.one.pl/spellchecker/devel/0.5.0/spellchecker-0.18.tar.gz
-Source105:	http://kadu.net/~blysk/weather-3.03.tar.bz2
-Source106:	http://www.kadu.net/~dzwiedziu/pub/ext_info-2.0beta9.tar.bz2
-Source107:	http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
-Source108:	http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.5-1.3.5.tar.gz
-Source109:	http://www.kadu.net/download/modules_mirror/tabs-current.tar.gz
-Source110:	http://kadu.net/~blysk/led_notify-0.9.tar.bz2
-Source111:	http://www.kadu.net/~pan_wojtas/iwait4u/download/kadu-iwait4u-1.3.tar.gz
-Source112:	http://www.kadu.net/~joi/exec_notify/packages/exec_notify-20060424.tar.bz2
-Source113:	http://www.kadu.net/~patryk/powerkadu/powerkadu-20061026.tar.gz
-Source114:	http://www.kadu.net/~dorr/kadu-profiles-0.1.tar.gz
-Source115:	http://alan.umcs.lublin.pl/~pinkworm/filtering/filtering-0.3.2-20060727-0.5.0.tar.bz2
-Source116:	http://www.kadu.net/~pan_wojtas/firewall/download/kadu-firewall-0.6.3.tar.gz
-Source117:	http://www.kadu.net/~joi/advanced_userlist/packages/advanced_userlist-20061010.tar.bz2
-Source118:	http://www.kadu.net/~pan_wojtas/osdhints_notify/download/kadu-osdhints_notify-0.3.2.1.tar.gz
-Source119:	http://scripts.one.pl/screenshot/devel/0.5.0/screenshot-0.4.4.tar.gz
-
-Patch0:		kadu-0.5.0-tabs_patch.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libpng-devel qt-devel libsndfile-devel openssl-devel libgadu-devel
-%define		_kadudir	%{_datadir}/kadu
-%define		_kadulib	%{_libdir}/kadu	
-%define		_modlib		%{_kadulib}/modules
-%define		_moddata	%{_kadudir}/modules
-%define		_modtrans	%{_moddata}/translations
-%define		_themesdir	%{_datadir}/%{name}/themes
-%define		_translationsdir	%{_kadudir}/translations
-
-
-%define		mod_files()	%files %1 \
-	%defattr(-,root,root,-) \
-	%{_moddata}/%1.desc \
-	%{_modlib}/%1.so \
-	%{_modtrans}/%{1}*.qm \
-
-
-#
-%define		mod_files2()	%files %1 \
-	%defattr(-,root,root,-) \
-	%{_moddata}/%1.desc \
-	%{_modlib}/%1.so \
-	%{_modtrans}/%{1}*.qm \
-	%{_moddata}/data/%1 \
 
+# external modules:
+%if %{with agent}
+Source116:	http://misiek.jah.pl/assets/2008/2/8/agent-0.4.4.tar.gz
+%endif
+%if %{with amarok_mediaplayer}
+Source101:	http://www.kadu.net/download/modules_extra/amarok_mediaplayer/amarok_mediaplayer-20071220.tar.bz2
+%endif
+%if %{with ao_sound}
+Source102:	http://www.kadu.net/~joi/ao_sound/packages/ao_sound-20060424.tar.bz2
+%endif
+%if %{with audacious_mediaplayer}
+Source103:	http://www.kadu.net/download/modules_extra/audacious_mediaplayer/audacious_mediaplayer-20080224.tar.bz2
+%endif
+%if %{with dcopexport}
+Source104:	http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.3-20071129-0.6.0.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.tar.bz2
+%endif
+%if %{with led_notify}
+Source106:	http://kadu.net/~blysk/led_notify-0.18.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
+%endif
+%if %{with miastoplusa_sms}
+Source108:	http://kadu.net/~patryk/miastoplusa_sms/miastoplusa_sms-0.6-1.3.9.tar.gz
+%endif
+%if %{with mime_tex}
+Source119:      http://kadu.net/~patryk/mime_tex/mime_tex-1.4.1.tar.bz2
+%endif
+%if %{with mx610_notify}
+Source120:      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.0.9.tar.bz2
+%endif
+%if %{with panelkadu}
+Source123:	http://www.ultr.pl/kadu/panelkadu-0.6-beta3.tar.gz
+%endif
+%if %{with pcspeaker}
+Source109:	http://kadu.net/~dorr/moduly/kadu-pcspeaker-0.6.0.3.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
+%endif
+%if %{with tabs}
+Source113:	http://www.kadu.net/~arvenil/tabs/download/0.6.0/kadu-tabs-1.1.4.tar.bz2
+%endif
+%if %{with water_notify}
+Source125:	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 xmms_mediaplayer}
+Source115:	http://www.kadu.net/download/modules_extra/xmms_mediaplayer/xmms_mediaplayer-20080116.tar.bz2
+%endif
 
-#above is two macros to make easier creating files section of modules
+#Patch0:		kadu-0.6.0-xmmsfix.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:	libpng-devel qt-devel libsndfile-devel openssl-devel
+%if %{with existing_libgadu}
+BuildRequires:	libgadu-devel
+%endif
+Obsoletes:	kadu-extinfo < 0.6.0-0.1.alpha1
+Obsoletes:	kadu-iwait4u < 0.6.0-0.1.alpha1
+Obsoletes:	kadu-powerkadu < 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}
 
 %description
-Kadu is client of Gadu-Gadu 6.1 protocol. It's an Internet Messager for Linux
-and UN*X or Mac OS X.
+Kadu is a dynamically evolving instant messenger compatible with the Gadu-Gadu
+protocol.
+
+%description -l pl
+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}
 Requires:	qt-devel
+Requires:	pkgconfig
 %description devel
-Develpoment headers for Kadu.
+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
+Summary(pl):	Kto ma mnie na liście użytkowników
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description agent
+Agent is a module to let an user find out who has him on userlist.
+
+%description agent -l pl
+Agent to moduł umożliwiający dowiedzenie się użytkownikowi kto go ma na
+swojej liście kontaktów.
 
-%package arts_sound
-Summary:	Arts module for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-BuildRequires:	arts-devel
-%description arts_sound
-aRts module for Kadu.
-
-%package esd_sound
-Summary:	ESD module for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-BuildRequires:	esound-devel
-%description esd_sound
-ESD module for Kadu.
+%endif
 
+%if %{with alsa_sound}
 %package alsa_sound
-Summary:	ALSA module for Kadu
+Summary:	ALSA sound support
+Summary(pl):	Obsługa dźwięku przez ALSA
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
 BuildRequires:	alsa-lib-devel
 %description alsa_sound
-ALSA module for Kadu.
+Alsa_sound is a module to support sound with ALSA.
 
-%package xmms
-Summary:	Xmms module for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-Requires:	xmms
-BuildRequires:	xmms-devel
-%description xmms
-xmms player support.
+%description alsa_sound -l pl
+Alsa_sound to moduł umożliwiający obsługę dźwięku przez ALSA.
 
-%package amarok
-Summary:	Amarok module for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-Requires:	kdelibs amarok
-BuildRequires:	kdelibs-devel
-%description amarok
-amaroK player support.
+%endif
 
-%package filedesc
-Summary:	Filedesc module for Kadu
+%if %{with amarok_mediaplayer}
+%package amarok_mediaplayer
+Summary:	Amarok support in mediaplayer module
+Summary(pl):	Wsparcie dla Amaroka w module mediaplayer
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
-%description filedesc
-Description from file module.
+Requires:	kadu-mediaplayer = %{version}-%{release}
+Obsoletes:	kadu-amarok < 0.6.0-0.1.alpha1
+Provides:	kadu-amarok = %{version}-%{release}
+BuildRequires:	kdelibs3-devel
+%description amarok_mediaplayer
+Amarok_mediaplayer is a module to put title of current song from Amarok in
+your status.
 
-%package weather
-Summary:	Weather module for Kadu
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%description weather
-Weather checking.
+%description amarok_mediaplayer -l pl
+Amarok_mediaplayer to moduł umożliwiający umieszczenie tytułu aktualnie
+słuchanej piosenki w Amaroku w opisie.
 
-%package mail
-Summary:	mail module for Kadu
+%endif
+
+%if %{with ao_sound}
+%package ao_sound
+Summary:	AO library sound module
+Summary(pl):	Moduł obsługujący dźwięk przy pomocy libao
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
-%description mail
-Mail checker module.
+BuildRequires:	libao-devel
+%description ao_sound
+Ao_sound is a module to support sound using libao.
 
-%package spellchecker
-Summary:	Spellchecker module for Kadu
+%description ao_sound -l pl
+Ao_sound to moduł umożliwiający obsługę dźwięku przy użyciu libao.
+
+%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}
-Requires:	aspell
-BuildRequires:	aspell-devel
-%description spellchecker
-Spellchecking in chat window.
+BuildRequires:	arts-devel
 
-%package ext_info
-Summary:	Ext_info module for Kadu
+%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
+Summary(pl):	Wsparcie dla Audacious w module mediaplayer
 Group:		Applications/Internet
+BuildRequires:	audacious-devel dbus-glib-devel
 Requires:	%{name} = %{version}-%{release}
-%description ext_info
-Additional contact info, birthday and name-day notifier.
+Requires:	kadu-mediaplayer = %{version}-%{release}
+
+%description audacious_mediaplayer
+Audacious_mediaplayer is a module to put title of current song from 
+Audacious in your status.
+
+%description audacious_mediaplayer -l pl
+Audacious_mediaplayer to moduł umożliwiający umieszczenie tytułu aktualnie
+słuchanej piosenki w Audacious w opisie.
 
+%endif
+
+%if %{with dcopexport}
 %package dcopexport
-Summary:	Dcopexport module for Kadu
+Summary:	Export some functions via DCOP
+Summary(pl):	Eksport kilku funkcji poprzez DCOP
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
-Requires:	kdelibs
-BuildRequires:	kdelibs-devel
+BuildRequires:	kdelibs3-devel
 %description dcopexport
-Export some functions via DCOP.
+Dcopexport is a module to export some Kadu functions using DCOP, e.g.
+it allows you to use gg://xxx links.
 
-%package miastoplusa_sms
-Summary:	Miastoplusa_sms module for Kadu
+%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}
-Requires:	curl openssl
-BuildRequires:	curl-devel openssl-devel
-%description miastoplusa_sms
-Miasto Plusa SMS Gateway support.
+BuildRequires:	esound-devel
+%description esd_sound
+Alsa_sound is a module to support sound with ESD.
 
-%package tabs
-Summary:	Tabs module for Kadu
+%description esd_sound -l pl
+Alsa_sound to moduł umożliwiający obsługę dźwięku przez ESD.
+
+%endif
+
+%if %{with falf_mediaplayer}
+%package falf_mediaplayer
+Summary:	FALF support in mediaplayer module
+Summary(pl):	Wsparcie dla FALF w module mediaplayer
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+%description falf_mediaplayer
+Falf_mediaplayer is a module to put title of current song from
+FALF in your status
+
+%description falf_mediaplayer -l pl
+Falf_mediaplayer to moduł umożliwiający umieszczenie tytułu aktualnie
+słuchanej piosenki w FALF w opisie.
+
+%endif
+
+%if %{with filedesc}
+%package filedesc
+Summary:	Get status from file
+Summary(pl):	Pobieranie opisów z pliku
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
-Requires:	curl openssl
-BuildRequires:	curl-devel
-%description tabs
-Tabbed chat dialog module.
+%description filedesc
+Filedesc is a module to get your status text from a given file.
+
+%description filedesc -l pl
+Filedesc to moduł umożliwiający pobieranie tekstu opisu z pliku.
+
+%endif
+
+%if %{with filtering}
+%package filtering
+Summary:	User list filtering
+Summary(pl):	Filtrowanie listy kontaktów
+Group:		Applications/Internet
+Requires:	%{name} = %{version}-%{release}
+%description filtering
+Filtering is a module to filter visible contacts in user list.
+
+%description filtering -l pl
+Filtering to moduł umożliwiający filtrowanie widocznych
+kontaktów na liście.
 
+%endif
+
+%if %{with firewall}
+%package firewall
+Summary:	Protection against unwanted chats
+Summary(pl):	Ochrona przed niechcianymi rozmowami
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+%description firewall
+Firewall is a module to ask a simple question to unknown
+interlocutor.
+
+%description firewall -l pl
+Firwall to moduł zadający proste, zdefiniowane pytanie
+nieznajomym rozmówcom.
+
+%endif
+
+%if %{with led_notify}
 %package led_notify
-Summary:	Led_notify module for Kadu
+Summary:	Notification by Scroll Lock LED
+Summary(pl):	Powiadamianie diodÄ… Scroll Lock
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
 %description led_notify
-Notification by Scroll Lock LED.
+Led_notify is a module to notify user of some events using Scroll Lock
+LED.
+
+
+%description led_notify -l pl
+Led_notify to moduł umożliwiający powiadamianie użytkownika o pewnych
+zdarzenia przy użyciu diody Scroll Lock.
+
+%endif
+
+%if %{with mail}
+%package mail
+Summary:	Mail checking module
+Summary(pl):	Moduł do sprawdzania poczty
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+%description mail
+Mail is a module to check whether there are new mails.
+
+%description mail -l pl
+Mail to moduł do sprawdzania czy są nowe maile.
+
+%endif
 
-%package iwait4u
-Summary:	Iwait4u module for Kadu
+%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 iwait4u
-Shows message, when user you're waiting for is online.
+%description mediaplayer
+Mediaplayer is a module to put title of current song in status.
 
-%package exec_notify
-Summary:	Exec_notify module for Kadu
+%description mediaplayer -l pl
+Mediaplayer to moduł umożliwiający umieszczenie tytułu obecnie słuchanej
+piosenki w opisie.
+
+%endif
+
+%if %{with miastoplusa_sms}
+%package miastoplusa_sms
+Summary:	Miasto Plusa SMS gateway support
+Summary(pl):	Obsługa bramki SMS Miasto Plusa
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
-%description exec_notify
-Notification by external commands module.
+BuildRequires:	curl-devel
+%description miastoplusa_sms
+Miastoplusa_sms is a module to support Miasto Plusa SMS Gateway.
+
+%description miastoplusa_sms -l pl
+Miastoplusa_sms to moduł umożliwiający obsługę bramki SMS-owej "Miasto
+Plusa".
+
+%endif
+
+%if %{with mime_tex}
+%package mime_tex
+Summary:	TeX formulas support
+Summary(pl):	Obsługa formuł matematycznych TeX
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+%description mime_tex
+Mime_tex is a module to edit TeX mathematic formulas in chat window.
 
-%package powerkadu
-Summary:	Powerkadu module for Kadu
+%description mime_tex -l pl
+Mime_tex to moduł umożliwiający edycję formuł matematycznych TeX
+w oknie rozmowy.
+
+%endif
+
+%if %{with mx610_notify}
+%package mx610_notify
+Summary:	Notify with LED on Logitech MX610 mouse
+Summary(pl):	Powiadamianie diodami LED w myszce Logitech MX610
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+%description mx610_notify
+Mx610_notify is a module to notify user of some events using LED
+on Logitech MX610 mouse.
+
+%description mx610_notify -l pl
+Mx610_notify to moduł umożliwiający powiadamianie użytkownika
+o pewnych zdarzeniach przy pomocy diod LED myszki Logitech MX610.
+
+%endif
+
+%if %{with osdhints_notify}
+%package osdhints_notify
+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
+with OSD-like hints.
+
+%description osdhints_notify -l pl
+Osdhints_notify 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
+Summary(pl):	Zamienia Kadu w panel na skraju ekranu
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+%description panelkadu
+Panelkadu is a module to make a panel from Kadu main window.
+
+%description panelkadu -l pl
+Panelkadu to moduł zamieniający kadu w panel na skraju ekranu.
+
+%endif
+
+
+%if %{with pcspeaker}
+%package pcspeaker
+Summary:	Notify by PC Speaker
+Summary(pl):	Powiadamianie przy pomocy PC Speakera
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
-%description powerkadu
-Improvement of Kadu capabilities.
+%description pcspeaker
+Pcspeaker is a module to notify user of some events using PC Speaker.
+
 
+%description pcspeaker -l pl
+Pcspeaker to moduł umożliwiający powiadamianie użytkownika o pewnych
+zdarzeniach przy pomocy PC Speakera.
+
+%endif
+
+%if %{with profiles}
 %package profiles
-Summary:	Profiles module for kadu
+Summary:	Profiles support
+Summary(pl):	Obsługa profili
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
 %description profiles
-Profiles support
+Profiles is a module to quick and comfortable support of multiple
+profiles.
 
-%package filtering
-Summary:	Filtering module for kadu
+%description profiles -l pl
+Profiles to moduł umożliwiający szybką i wygodnę obsługę wielu
+profili.
+
+%endif
+
+%if %{with screenshot}
+%package screenshot
+Summary:	Make a screenshot and send it
+Summary(pl):	Tworzenie zrzutu ekranu i wysłanie go
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
-%description filtering
-User list filtering
+%description screenshot
+Screenshot is a module to select a part of the screen and send an
+image with its content.
 
-%package firewall
-Summary:	Firewall module for Kadu
+%description screenshot -l pl
+Screenshot to moduł umożliwiający zaznaczenie części ekranu
+i wysłania obrazka z jego zawartością.
+
+%endif
+
+%if %{with spellchecker}
+%package spellchecker
+Summary:	Spellchecking in chat window
+Summary(pl):	Sprawdzanie pisowni w oknie rozmowy
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
-%description firewall
-Protection against unwanted chats
+BuildRequires:	aspell-devel
+%description spellchecker
+Spellchecker is a module to check spelling in chat window.
 
-%package wmaker_docking
-Summary:	Wmaker_docking module for Kadu
+%description spellchecker -l pl
+Spellchecker to moduł umożliwiający sprawdzanie pisowni w oknie
+rozmowy.
+
+%endif
+
+%if %{with tabs}
+%package tabs
+Summary:	Tabbed chat dialog
+Summary(pl):	Okno rozmowy z zakładkami
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
-%description wmaker_docking
-WindowMaker docking module
+%description tabs
+Tabs is a module to add a feature to use one window to talk with all
+people and use cards to switch them.
+
+%description tabs -l pl
+Tabs to moduł dodający możliwość prowadzenia rozmów w jednym oknie,
+w którym pomiędzy poszczególnymi rozmówcami przełącza się przy pomocy
+zakładek.
+
+%endif
+
+%if %{with water_notify}
+%package water_notify
+Summary:	Notifications by Water Compiz plugin
+Summary(pl):	Powiadomienia kroplami wody w Compiz
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+BuildRequires:	dbus-devel
+%description water_notify
+Water_notify is a module to notify user about some events with
+Water Compiz plugin.
+
+%description water_notify -l pl
+Water_notify to moduł umożliwiający powiadamianie użytkownika
+o pewnych zdarzeniach przy użyciu wtyczki Woda z Compiza.
+
+%endif
 
-%package advanced_userlist
-Summary:	Advanced_userlist module for Kadu
+
+%if %{with weather}
+%package weather
+Summary:	Weather checking
+Summary(pl):	Sprawdzanie pogody
 Group:		Applications/Internet
 Requires:	%{name} = %{version}-%{release}
-%description advanced_userlist
-User list: support for priorities (VIP/NIP) and
-changing order of sorting functions.
-
-%package osdhints_notify
-Summary:	Osdhints_notify module for Kadu
+%description weather
+Weather is a module to check weather forecast for a few nearest days.
+It also allows to check weather for people in contact list and any other
+city that is available.
+
+%description weather -l pl
+Moduł pobiera i wyświetla informacje pogodowe oraz prognozę na następne
+dni. Umożliwia wyświetlenie pogody dla wybranego kontaktu na liście
+kontaktów oraz dla dowolnego miasta, dla którego dostępna jest prognoza.
+
+%endif
+
+%if %{with xmms_mediaplayer}
+%package xmms_mediaplayer
+Summary:	Xmms support in mediaplayer module
+Summary(pl):	Wsparcie dla Xmms w module mediaplayer
 Group:		Applications/Internet
-Requires:       %{name} = %{version}-%{release}
-%description osdhints_notify
-Notification by OSD-like hints
+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}
+%description xmms_mediaplayer
+Xmms_mediaplayer is a module to put title of current song from xmms in
+your status.
+
+%description xmms_mediaplayer -l pl
+Xmms_mediaplayer to moduł umożliwiający umieszczenie tytułu aktualnie
+słuchanej piosenki w xmms w opisie.
+
+%endif
 
-%package screenshot
-Summary:        Screenshot module for Kadu
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
-%description screenshot
-Adds a possibility to select a screen's fragment
-and send image with its content.
 
 %prep
 %setup -q -n kadu
-%setup -q -D -T -a 100 -a 101 -a 102 -a 103 -a 104 -a 105 -a 106 -a 107 -a 108 -a 109 -a 110 -a 111 -a 112 -a 113 -a 114 -a 115 -a 116 -a 117 -a 118 -a 119 -n kadu/modules
+#%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 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
 %setup -q -D -T -n kadu
 
-%patch0 -p1 -b tabs_patch
-
-##==some changes in .config file
-#1. compile something as shared...
-#	module_mail \
-SHARED_CHANGES="module_alsa_sound \
-	module_arts_sound \
-	module_esd_sound \
-	module_xmms \
-	module_amarok \
-	module_filedesc \
-	module_spellchecker \
-	module_weather \
-	module_ext_info \
-	module_dcopexport \
-	module_miastoplusa_sms \
-	module_tabs\
-	module_led_notify \
-	module_iwait4u\
-	module_powerkadu \
-	module_filtering \
-	module_profiles \
-	module_mail \
-	module_exec_notify \
-	module_firewall \
-	module_advanced_userlist \
-	module_osdhints_notify \
-	module_screenshot \
-	module_wmaker_docking"
-for change in $SHARED_CHANGES; do
-sed s/^$change=.$/$change=m/ -i .config
-done
-
-##==add shellbang to beginning of file
-sed 1i\#\!/bin/sh -i modules/dcopexport/bin/install-konqueror-setAsKaduDesc.sh
-#+
+%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 
+
+%if %{with audacious_mediaplayer}
+pushd modules/audacious_mediaplayer
+sed 's#cflags`#cflags` -I/usr/include/dbus-1.0#' -i spec
+# above adds missing include path
+popd
+%endif
 
 %build
+%if %{with existing_libgadu}
+%define _with_existing_libgadu 1
+%endif
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-%configure --enable-debug --disable-dependency-tracking --with-existing-libgadu
+%configure --enable-debug \
+	%{?_with_existing_libgadu:--with-existing-libgadu}
 make %{?_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
@@ -314,10 +780,7 @@
 #+
 desktop-file-install --vendor fedora				\
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
-	--add-category X-Fedora					\
-	--add-category Application				\
 	%{SOURCE3}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -328,168 +791,325 @@
 %{_bindir}/kadu
 %{_bindir}/kadu-mozilla
 %{_datadir}/applications/fedora-kadu.desktop
-%dir %{_kadulib}
-%dir %{_modlib}
-%{_modlib}/account_management.so
-%{_modlib}/arts_sound.so
-%{_modlib}/autoaway.so
-%{_modlib}/autoresponder.so
-%{_modlib}/config_wizard.so
-%{_modlib}/dcc.so
-%{_modlib}/default_sms.so
-%{_modlib}/dsp_sound.so
-%{_modlib}/encryption.so
-%{_modlib}/ext_sound.so
-%{_modlib}/hints.so
-%{_modlib}/migration.so
-%{_modlib}/sms.so
-%{_modlib}/voice.so
-%{_modlib}/window_notify.so
-%{_modlib}/x11_docking.so
-%dir %{_modlib}/bin
-%ghost %{_datadir}/applnk/Internet/kadu.desktop
-%dir %{_kadudir}
-%{_kadudir}/AUTHORS
-%{_kadudir}/ChangeLog
-%{_kadudir}/COPYING
-%{_kadudir}/HISTORY
-%{_kadudir}/README
-%{_kadudir}/THANKS
-%dir %{_moddata}
-%{_moddata}/account_management.desc
-%{_moddata}/arts_sound.desc
-%{_moddata}/autoaway.desc
-%{_moddata}/autoresponder.desc
-%{_moddata}/config_wizard.desc
-%{_moddata}/dcc.desc
-%{_moddata}/default_sms.desc
-%{_moddata}/dsp_sound.desc
-%{_moddata}/encryption.desc
-%{_moddata}/ext_sound.desc
-%{_moddata}/hints.desc
-%{_moddata}/migration.desc
-%{_moddata}/sms.desc
-%{_moddata}/voice.desc
-%{_moddata}/window_notify.desc
-%{_moddata}/x11_docking.desc
-%{_moddata}/docking.desc
-%{_moddata}/notify.desc
-%{_moddata}/sound.desc
-%dir %{_moddata}/data
-%{_moddata}/data/config_wizard
-%dir %{_modtrans}
-%{_modtrans}/account_management_*.qm
-%{_modtrans}/autoaway_*.qm
-%{_modtrans}/autoresponder_*.qm
-%{_modtrans}/config_wizard_*.qm
-%{_modtrans}/dcc_*.qm
-%{_modtrans}/default_sms_*.qm
-%{_modtrans}/dsp_sound_*.qm
-%{_modtrans}/encryption_*.qm
-%{_modtrans}/ext_sound_*.qm
-%{_modtrans}/hints_*.qm
-%{_modtrans}/migration_*.qm
-%{_modtrans}/sms_*.qm
-%{_modtrans}/voice_*.qm
-%{_modtrans}/window_notify_*.qm
-%{_modtrans}/x11_docking_*.qm
-%{_modtrans}/docking_*.qm
-%{_modtrans}/notify_*.qm
-%{_modtrans}/sound_*.qm
-%dir %{_themesdir}
-%dir %{_themesdir}/emoticons
-%{_themesdir}/emoticons/penguins
-%dir %{_themesdir}/icons
-%{_themesdir}/icons/default
-%dir %{_themesdir}/sounds
-%{_themesdir}/sounds/default
-%{_translationsdir}
+%dir %{_libdir}/kadu
+%dir %{_libdir}/kadu/modules
+%dir %{_libdir}/kadu/modules/bin
+%dir %{_datadir}/kadu
+%{_datadir}/kadu/syntax
+%{_datadir}/kadu/AUTHORS
+%{_datadir}/kadu/ChangeLog
+%{_datadir}/kadu/COPYING
+%{_datadir}/kadu/HISTORY
+%{_datadir}/kadu/README
+%{_datadir}/kadu/THANKS
+%{_datadir}/kadu/configuration
+%dir %{_datadir}/kadu/modules
+%dir %{_datadir}/kadu/modules/configuration
+%dir %{_datadir}/kadu/modules/data
+%dir %{_datadir}/kadu/modules/translations
+%dir %{_datadir}/kadu/themes
+%dir %{_datadir}/kadu/themes/emoticons
+%{_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
+%{_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 autoaway -ct
+%module_files autoresponder -ct
+%module_files config_wizard -td
+%module_files dcc -ct
+%module_files default_sms -ct
+%module_files dsp_sound -ct
+%module_files encryption -ct
+%module_files exec_notify -t
+%module_files ext_sound -ct
+%module_files hints -ct
+%module_files history -ct
+%module_files migration -t
+%module_files sms -ct
+%module_files voice -ct
+%module_files window_notify -t
+%module_files x11_docking -t
 
 %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}
+%files agent
+%defattr(-, root, root, -)
+%module_files agent -t
+%endif
+
+%if %{with amarok_mediaplayer}
+%files amarok_mediaplayer
+%defattr(-, root, root, -)
+%module_files amarok_mediaplayer
+%endif
 
-%files arts_sound
-%defattr(-,root,root,-)
-%{_moddata}/arts_sound.desc
-%{_modlib}/arts_sound.so
-%{_modlib}/bin/arts_sound
-
-%files esd_sound
-%defattr(-,root,root,-)
-%{_moddata}/esd_sound.desc
-%{_modlib}/esd_sound.so
-
-%files wmaker_docking
-%defattr(-,root,root,-)
-%{_moddata}/wmaker_docking.desc
-%{_modlib}/wmaker_docking.so
-
+%if %{with alsa_sound}
 %files alsa_sound
-%defattr(-,root,root,-)
-%{_moddata}/alsa_sound.desc
-%{_modlib}/alsa_sound.so
-%{_modtrans}/alsa_sound_*.qm
-
-%mod_files2 xmms
-
-
-%mod_files2 amarok
+%defattr(-, root, root, -)
+%module_files alsa_sound -ct
+%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, -)
+%module_files arts_sound
+%{_libdir}/kadu/modules/bin/arts_sound
+%endif
+
+%if %{with audacious_mediaplayer}
+%files audacious_mediaplayer
+%defattr(-, root, root, -)
+%module_files audacious_mediaplayer
+%endif
+
+%if %{with dcopexport}
+%files dcopexport
+%defattr(-, root, root, -)
+%module_files dcopexport -dt
+%{_libdir}/kadu/modules/bin/dcopexport
+%endif
 
-%mod_files2 filedesc
-
-%mod_files2 spellchecker
-
-%mod_files2 ext_info
-
-%mod_files2 dcopexport
-
-%{_modlib}/bin/dcopexport
-
-%mod_files2 miastoplusa_sms
-
-%mod_files2 tabs
-
-%mod_files2 powerkadu
-
-%{_modlib}/bin/powerkadu
-
-%mod_files2 filtering
-
-%mod_files2 firewall
-
-
-%mod_files profiles
-
-%mod_files led_notify
-
-%mod_files iwait4u
-
-%mod_files exec_notify
-
-%mod_files mail
-
-%files advanced_userlist
-%defattr(-,root,root,-)
-%{_modlib}/advanced_userlist.so
-%{_moddata}/advanced_userlist.desc
-
-%mod_files2 osdhints_notify
+%if %{with esd_sound}
+%files esd_sound
+%defattr(-, root, root, -)
+%module_files esd_sound
+%endif
+
+%if %{with falf_mediaplayer}
+%files falf_mediaplayer
+%defattr(-, root, root, -)
+%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 led_notify}
+%files led_notify
+%defattr(-, root, root, -)
+%module_files led_notify -ct
+%endif
+
+%if %{with mail}
+%files mail
+%defattr(-, root, root, -)
+%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
+%defattr(-, root, root, -)
+%module_files miastoplusa_sms -cdt
+%endif
+
+%if %{with mime_tex}
+%files mime_tex
+%defattr(-, root, root, -)
+%module_files mime_tex -cdt
+%{_libdir}/kadu/modules/bin/mime_tex
+%endif
+
+%if %{with mx610_notify}
+%files mx610_notify
+%defattr(-, root, root, -)
+%module_files mx610_notify -ct
+%endif
+
+%if %{with osdhints_notify}
+%files osdhints_notify
+%defattr(-, root, root, -)
+%module_files osdhints_notify -cdt
+%endif
+
+%if %{with panelkadu}
+%files panelkadu
+%defattr(-, root, root, -)
+%module_files panelkadu -ct
+%endif
+
+
+%if %{with pcspeaker}
+%files pcspeaker
+%defattr(-, root, root, -)
+%module_files pcspeaker -ct
+%endif
+
+%if %{with profiles}
+%files profiles
+%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
+%endif
+
+%if %{with tabs}
+%files tabs
+%defattr(-, root, root, -)
+%module_files tabs -ct
+%endif
+
+%if %{with water_notify}
+%files water_notify
+%defattr(-, root, root, -)
+%module_files water_notify -ct
+%endif
 
-%mod_files2 screenshot
 
+%if %{with weather}
 %files weather
-%defattr(-,root,root,-)
-%{_modlib}/weather.so
-%{_moddata}/weather.desc
-%{_moddata}/data/weather
+%defattr(-, root, root, -)
+%module_files weather -cdt
+%endif
+
+%if %{with xmms_mediaplayer}
+%files xmms_mediaplayer
+%defattr(-, root, root, -)
+%module_files xmms_mediaplayer
+%endif
+
 
 %changelog
+* Thu Feb 28 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-1
+- Stable
+- New versions of osdhints_notify, 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
+
+* Wed Feb 13 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.11.rc3
+- rc3
+- New firewall module
+- New versions of some modules
+
+* Sun Feb 03 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.10.rc2.try2
+- rc2-try2
+
+* Sun Feb 03 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.9.rc2
+- rc2
+- New versions of led_notify, weather, pcspeaker, mime_tex, tabs,
+mediaplayer, xmms_mediaplayer and mail modules
+- Add filtering module
+- Get rid of xmmsfix patch
+- Fix mail module
+
+* Sun Jan 13 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.8.rc1
+- rc1
+- New mx610_notify, falf_mediaplayer, mail and mime_tex modules.
+- New versions of some modules
+
+* Sun Jan 06 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.7.beta2
+- Fix bug 427679 (add forgotten %% symbol in one place)
+
+* Sun Jan 06 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.6.beta2
+- Now forgot to include that one source changed its name
+
+* Sun Jan 06 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.5.beta2
+- Forgot to upload some sources...
+
+* Sat Jan 05 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.4.beta2
+- beta2
+- Add kadu-agent
+
+* Fri Dec 21 2007 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.3.beta1
+- 0.6.0-beta1
+- Changes of almost everything, spec file has been completely rewritten
+- Get rid of stupid macros including %%{_kadudir} and %%{_modtrans}
+- Make it possible to build any subpackages whoever wants, no need to build
+all
+- Add Polish descriptions to all subpackages and change English ones
+- There are too many changes to list all of them ;-)
+- Hope it's now much more readable and user-friendly
+
+* Wed Dec 19 2007 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.0-0.2.alpha2
+- 0.6.0-alpha2
+- New pcspeaker module
+- New version of miastoplusa_sms, profiles, dcopexport
+
+* 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
+- update spellchecker, weather, dcopexport, miastopolusa_sms, tabs, led_notify, filtering
+- get rid of tabs patch
+- add filedesc, spellchecker and firewall patches
+- exec_notify is now built-in
+
+* Fri Aug 24 2007 Michał Bentkowski <mr.ecik at gmail.com> - 0.5.0-4
+- Fix desktop file
+
+* Fri Aug 24 2007 Michał Bentkowski <mr.ecik at gmail.com> - 0.5.0-3
+- BuildID rebuild
+- Fix License tag
+
 * Thu Apr 05 2007 Michał Bentkowski <mr.ecik at gmail.com> - 0.5.0-2
-- Own %%{_moddata}/data (BZ: 233855)
+- Own %%{_datadir}/kadu/modules/data (BZ: 233855)
 
 * Tue Jan 02 2007 Michał Bentkowski <mr.ecik at gmail.com> - 0.5.0-1
 - Finally a stable release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/F-7/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	2 Jan 2007 20:33:34 -0000	1.12
+++ sources	5 Mar 2008 18:05:32 -0000	1.13
@@ -1,21 +1,26 @@
-62913be4ecb267b9bbf6d87dbb3e67e6  kadu-firewall-0.6.3.tar.gz
-9b0622b02a7190502519b2e3034ccec4  dcopexport-0.11.1-20060320-0.5.0-svn.tar.bz2
-15e6ba4e7ec1cacce3290525cd51e696  exec_notify-20060424.tar.bz2
-d5e5718f3a64f33874a869b235bbdff7  filedesc-1.12.tar.gz
-e9d8676608f8c731f665ffc5c5288ad0  filtering-0.3.2-20060727-0.5.0.tar.bz2
-6233a8ef21d901fc5fb91c0db40d0e32  kadu-iwait4u-1.3.tar.gz
-739e2c76fdae17f570d1f4934958cae6  kadu-profiles-0.1.tar.gz
-3f9e347fd775324f4077f2f6849a0de7  led_notify-0.9.tar.bz2
-fae1f6bd3d4aca845ef5a57403b5b58c  miastoplusa_sms-0.5-1.3.5.tar.gz
-6bf19f183eb4e5ea48e2a27d04da2ead  spellchecker-0.18.tar.gz
-ef56085ab7d8e60be15d86d2c5f4a424  tabs-current.tar.gz
-30833253a9f94eedc892767c1267536a  weather-3.03.tar.bz2
-270c19fc9fb3e96bcbce76c2077d3ec2  mail-current.tar.gz
-11436971c7c45bb4b70f3d6ed569f95c  powerkadu-20061026.tar.gz
-69424cd8731b08962073c232c0505cfb  ext_info-2.0beta9.tar.bz2
-e4ac1276f5326c5b17ef086ad2448e91  xmms-1.32.tar.gz
-139e50cbe9ff2014ca35e9b3b4be1f67  amarok-1.19.tar.gz
-403490d44e9650261809cdbca0de816a  advanced_userlist-20061010.tar.bz2
-4568a1cf1b242642a1fc6629969d05dd  kadu-osdhints_notify-0.3.2.1.tar.gz
-c6da85999cfebef413d228dca9c7d91f  screenshot-0.4.4.tar.gz
-895f7c88d36dbb188e8bc26664fbf430  kadu-0.5.0.tar.bz2
+4401e0e3c509af347cb14a89236301ea  agent-0.4.4.tar.gz
+51d304e335e814f3d8c0f1654007a7d7  amarok_mediaplayer-20071220.tar.bz2
+95809d330e48e61f58ec961ddbf0b529  ao_sound-20060424.tar.bz2
+aa427d5b87fcc48cdd799cf19fe92da1  audacious_mediaplayer-20080224.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
+8f1ee07558c82573d2c6e7ccd05f224f  kadu-0.6.0.tar.bz2
+9b0f04b4254b4ff08254b15e59a81be7  kadu-firewall-0.7.5.tar.bz2
+f515d2dd54d4a5948f691b05d13be70d  kadu-osdhints_notify-0.4.0.9.tar.bz2
+4b8abfe0c57efabb49ba8c6c71a316f2  kadu-pcspeaker-0.6.0.3.tar.bz2
+d7ec7f808d15308d10ed76d1e3743f37  kadu-profiles-0.3.1.tar.bz2
+57e4c970f496ba81495d59d7b96bcdf1  kadu-tabs-1.1.4.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
+d640b2ba650fb5aa0f3502ad7379b14b  mime_tex-1.4.1.tar.bz2
+08bba105d9307bbf1a8e8482529441a4  mx610_notify-0.3.1.tar.bz2
+0070c9bb4559ec29bb1195acdc5c5967  panelkadu-0.6-beta3.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




More information about the fedora-extras-commits mailing list