rpms/kadu/F-9 .cvsignore, 1.16, 1.17 kadu.spec, 1.37, 1.38 sources, 1.18, 1.19

Thu Dec 18 16:39:07 UTC 2008

Author: ecik

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

Modified Files:
	.cvsignore kadu.spec sources 
Log Message:
* Tue Dec 16 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.5-7
- Osd_hints tarball was missing in sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kadu/F-9/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17

--- .cvsignore	6 Dec 2008 21:48:32 -0000	1.16
+++ .cvsignore	18 Dec 2008 16:38:37 -0000	1.17
@@ -10,3 +10,4 @@
 panelkadu-0.6.5-2.tar.gz
 plus_pl_sms-0.6.5.1.tar.bz2
 senthistory-0.6.5-3.tar.gz
+kadu-osd_hints-0.1.2.tar.bz2


Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/F-9/kadu.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kadu.spec	9 Dec 2008 22:46:43 -0000	1.37
+++ kadu.spec	18 Dec 2008 16:38:37 -0000	1.38
@@ -22,9 +22,7 @@
 # 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():
@@ -59,16 +57,11 @@
 # table to make it possible to find out quickly which
 # subpackage has which source's number
 # LAST NUMBER: 120
-# 109 agent
-# 101 amarok_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
@@ -76,89 +69,37 @@
 # 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
-# alsa_sound
-# amarok_mediaplayer
 # anonymous_check
-# antistring
-# ao_sound
-# audacious_mediaplayer
-# auto_hide
-# autostatus
-# cenzor
-# esd_sound
-# filedesc
-# filtering
-# firewall
 # globalhotkeys
-# last_seen
 # led_notify
-# mediaplayer
-# plus_pl_sms
-# osd_hints
+# mail
+# mime_tex
 # panelkadu
-# parser_extender
-# pcspeaker
+# plus_pl_sms
 # powerkadu
-# profiles
 # senthistory
-# screenshot
-# spellchecker
 # split_messages
 # tabs
-# water_notify
-# weather
-# word_fix
-# xmms_mediaplayer
+
 
 # whether we want to build certain subpackages or not
 # 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_with amarok_mediaplayer
 %bcond_without anonymous_check
-#%bcond_without antistring
-#%bcond_without ao_sound
-%bcond_with audacious_mediaplayer
-%bcond_without auto_hide
-#%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 led_notify
 %bcond_without mail
-#%bcond_without mediaplayer
 %bcond_without mime_tex
-%bcond_with mx610_notify
-%bcond_with osd_hints # formerly osd_hints
+%bcond_without osd_hints
 %bcond_without panelkadu
-#%bcond_without parser_extender
-#%bcond_without pcspeaker
-%bcond_without plus_pl_sms # formerly miastoplusa_sms
+%bcond_without plus_pl_sms
 %bcond_without powerkadu
-#%bcond_without profiles
-#%bcond_without screenshot
 %bcond_without senthistory
-#%bcond_without spellchecker
 %bcond_without split_messages
 %bcond_without tabs
-%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
@@ -166,7 +107,7 @@
 Name:		kadu_opt
 %endif
 Version:	0.6.5
-Release:	3%{?dist}
+Release:	7%{?dist}
 Summary:	An Gadu-Gadu client for online messaging
 Summary(pl):	Klient Gadu-Gadu
 Group:		Applications/Internet
@@ -176,21 +117,9 @@
 Source3:	kadu.desktop
 
 # external modules:
-%if %{with agent}
-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}
 Source117:	http://kadu.net/~patryk/anonymous_check/anonymous_check-0.6.5.1.tar.bz2
 %endif
-%if %{with audacious_mediaplayer}
-Source119:	http://www.kadu.net/download/modules_extra/audacious_mediaplayer/audacious_mediaplayer-20080423.tar.bz2
-%endif
-%if %{with falf_mediaplayer}
-Source110:      http://www.kadu.net/download/modules_extra/falf_mediaplayer/falf_mediaplayer-20071225.tar.bz2
-%endif
 %if %{with globalhotkeys}
 Source102:	http://www.ultr.pl/kadu/globalhotkeys-0.6.5-7.tar.gz
 %endif
@@ -206,9 +135,6 @@
 %if %{with mime_tex}
 Source112:      http://kadu.net/~patryk/mime_tex/mime_tex-0.6.5.1.tar.bz2
 %endif
-%if %{with mx610_notify}
-Source113:      http://kadu.jarzebski.pl/mx610_notify-0.3.1.tar.bz2
-%endif
 %if %{with osd_hints}
 Source115:	http://www.kadu.net/~dorr/moduly/kadu-osd_hints-0.1.2.tar.bz2
 %endif
@@ -227,15 +153,6 @@
 %if %{with tabs}
 Source106:	http://www.kadu.net/~arvenil/tabs/download/0.6.5/kadu-tabs-1.2.1.tar.bz2
 %endif
-%if %{with water_notify}
-Source116:	http://kadu.jarzebski.pl/water_notify-0.1.1-try2.tar.bz2
-%endif
-%if %{with weather}
-Source107:	http://kadu.net/~blysk/weather-3.13.tar.bz2
-%endif
-%if %{with xmms_mediaplayer}
-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
@@ -246,6 +163,8 @@
 BuildRequires:	libgadu-devel > 1.8.0
 BuildRequires:	gsm-devel
 BuildRequires:  desktop-file-utils
+BuildRequires:	aspell-devel alsa-lib-devel
+BuildRequires:	libao-devel
 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
@@ -253,12 +172,15 @@
 #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}-agent < 0.6.5-2
 Obsoletes:	%{name}-alsa_sound < 0.6.5-2
 Provides:	%{name}-alsa_sound = %{version}-%{release}
 Obsoletes:	%{name}-advanced_userlist < 0.6.0-0.1.alpha1
 Provides:	%{name}-advanced_userlist = %{version}-%{release}
+Obsoletes:	%{name}-amarok_mediaplayer < 0.6.5-2
 Obsoletes:	%{name}-antistring < 0.6.5-2
 Provides:	%{name}-antistring = %{version}-%{release}
+Obsoletes:	%{name}-audacious_mediaplayer < 0.6.5-2
 Obsoletes:	%{name}-exec_notify < 0.6.0-0.1.alpha1
 Provides:	%{name}-exec_notify = %{version}-%{release}
 Obsoletes:	%{name}-cenzor < 0.6.5-1
@@ -270,6 +192,8 @@
 Provides:	%{name}-autostatus = %{version}-%{release}
 Obsoletes:	%{name}-auto_hide < 0.6.5-0.1.rc2
 Provides:	%{name}-auto_hide = %{version}-%{release}
+Obsoletes:	%{name}-esd_sound < 0.6.5-2
+Obsoletes:	%{name}-falf_mediaplayer < 0.6.5-2
 Obsoletes:	%{name}-filedesc < 0.6.5-0.1.rc2
 Provides:	%{name}-filedesc = %{version}-%{release}
 Obsoletes:	%{name}-filtering < 0.6.5-0.1.rc2
@@ -279,6 +203,7 @@
 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}-mx610_notify < 0.6.5-2
 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
@@ -289,8 +214,12 @@
 Provides:	%{name}-screenshot = %{version}-%{release}
 Obsoletes:	%{name}-spellchecker < 0.6.5-1
 Provides:	%{name}-spellchecker = %{version}-%{release}
+Obsoletes:	%{name}-water_notify < 0.6.5-2
+Obsoletes:	%{name}-weather < 0.6.5-2
 Obsoletes:	%{name}-word_fix < 0.6.5-0.1.rc2
 Provides:	%{name}-word_fix = %{version}-%{release}
+Obsoletes:	%{name}-xmms_mediaplayer < 0.6.5-2
+
 
 
 %description
@@ -301,55 +230,6 @@
 Kadu to dynamicznie rozwijajÄ…cy siÄ™ komunikator internetowy kompatybilny z
 protokoÅ‚em Gadu-Gadu.
 
-%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.
-
-%endif
-
-%if %{with alsa_sound}
-%package alsa_sound
-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_sound is a module to support sound with ALSA.
-
-%description alsa_sound -l pl
-Alsa_sound to moduÅ‚ umoÅ¼liwiajÄ…cy obsÅ‚ugÄ™ dÅºwiÄ™ku przez ALSA.
-
-%endif
-
-%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}
-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.
-
-%description amarok_mediaplayer -l pl
-Amarok_mediaplayer to moduÅ‚ umoÅ¼liwiajÄ…cy umieszczenie tytuÅ‚u aktualnie
-sÅ‚uchanej piosenki w Amaroku w opisie.
-
-%endif
 
 %if %{with anonymous_check}
 %package anonymous_check
@@ -368,146 +248,6 @@
 
 %endif
 
-#%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 -l pl
-#Antistring to moduÅ‚ sÅ‚uÅ¼Ä…cy do ochrony przed Å‚aÅ„cuszkami.
-
-#%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}
-BuildRequires:	libao-devel
-%description ao_sound
-Ao_sound is a module to support sound using libao.
-
-%description ao_sound -l pl
-Ao_sound to moduÅ‚ umoÅ¼liwiajÄ…cy obsÅ‚ugÄ™ dÅºwiÄ™ku przy uÅ¼yciu libao.
-
-%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}
-Requires:	%{name}-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 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 -l pl
-#Automatyczne ukrywanie okna kadu.
-
-#%endif
-
-%if %{with autostatus}
-%package autostatus
-Summary:        Autostatus
-Summary(pl):    Automatyczne zmiany statusu
-Group:          Applications/Internet
-Requires:       %{name} = %{version}-%{release}
-
-%description autostatus
-Autostatus is a module to change status automatically.
-
-%description autostatus -l pl
-Autostatus to moduÅ‚ do automatycznych zmian statusu.
-
-%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}
-%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 globalhotkeys}
 %package globalhotkeys
@@ -526,22 +266,6 @@
 
 %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.
-
-#%endif
 
 %if %{with led_notify}
 %package led_notify
@@ -574,20 +298,21 @@
 
 %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 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.
+
+%description mime_tex -l pl
+Mime_tex to moduÅ‚ umoÅ¼liwiajÄ…cy edycjÄ™ formuÅ‚ matematycznych TeX
+w oknie rozmowy.
+
+%endif
 
-#%endif
 
 %if %{with plus_pl_sms}
 %package plus_pl_sms
@@ -606,36 +331,6 @@
 
 %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.
-
-%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 osd_hints}
 %package osd_hints
@@ -643,8 +338,8 @@
 Summary(pl):	Powiadamanie o zdarzeniach przy pomocy dymkÃ³w typu OSD
 Group:          Applications/Internet
 Requires:       %{name} = %{version}-%{release}
-Obsoletes:	%{name}-osdhints-notify < 0.6.5-1
-Provides:	%{name}-osd_hints = %{version}-%{release}
+Obsoletes:	%{name}-osdhints_notify < 0.6.5-1
+Provides:	%{name}-osdhints_notify = %{version}-%{release}
 %description osd_hints
 Osd_hints is a module to notify users about some events
 with OSD-like hints.
@@ -670,36 +365,6 @@
 
 %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}
-
-#%description parser_extender
-#Extends Kadu Parser.
-
-#%description parser_extender -l pl
-#Rozszerza moÅ¼liwoÅ›Ä‡ parsera Kadu.
-
-#%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 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 powerkadu}
 %package powerkadu
@@ -727,38 +392,6 @@
 
 %endif
 
-%if %{with profiles}
-%package profiles
-Summary:	Profiles support
-Summary(pl):	ObsÅ‚uga profili
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%description profiles
-Profiles is a module to quick and comfortable support of multiple
-profiles.
-
-%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 screenshot
-Screenshot is a module to select a part of the screen and send an
-image with its content.
-
-%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 senthistory}
 %package senthistory
 Summary:	History of sent messages in chat windows
@@ -775,22 +408,6 @@
 
 %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}
-BuildRequires:	aspell-devel
-%description spellchecker
-Spellchecker is a module to check spelling in chat window.
-
-%description spellchecker -l pl
-Spellchecker to moduÅ‚ umoÅ¼liwiajÄ…cy sprawdzanie pisowni w oknie
-rozmowy.
-
-%endif
-
 %if %{with split_messages}
 %package split_messages
 Summary:        Split too long messages
@@ -825,90 +442,13 @@
 
 %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
-
-
-%if %{with weather}
-%package weather
-Summary:	Weather checking
-Summary(pl):	Sprawdzanie pogody
-Group:		Applications/Internet
-Requires:	%{name} = %{version}-%{release}
-%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 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 -l pl
-#Automatyczna zamiana sÅ‚Ã³w
-
-#%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
-BuildRequires:	xmms-devel
-Requires:	%{name} = %{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.
-
-%description xmms_mediaplayer -l pl
-Xmms_mediaplayer to moduÅ‚ umoÅ¼liwiajÄ…cy umieszczenie tytuÅ‚u aktualnie
-sÅ‚uchanej piosenki w xmms w opisie.
-
-%endif
-
-
 %prep
 %setup -q -n kadu
-%unpack_module_source 109 agent
-%unpack_module_source 101 amarok_mediaplayer
 %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
@@ -916,11 +456,9 @@
 %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
 
+#internal modules
 %enable_module alsa_sound
 %enable_module antistring
 %enable_module ao_sound
@@ -931,7 +469,6 @@
 %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
@@ -949,12 +486,6 @@
 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
-sed 's#cflags`#cflags` -I/usr/include/dbus-1.0#' -i spec
-# above adds missing include path
-popd
-%endif
 
 #let's not annoy users with update notifies
 #and disable them
@@ -1070,50 +601,12 @@
 
 # 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
-
 %if %{with anonymous_check}
 %files anonymous_check
 %defattr(-, root, root, -)
 %module_files anonymous_check -ct
 %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
-
-%if %{with falf_mediaplayer}
-%files falf_mediaplayer
-%defattr(-, root, root, -)
-%module_files falf_mediaplayer
-%endif
 
 %if %{with globalhotkeys}
 %files globalhotkeys
@@ -1146,12 +639,6 @@
 %{_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 osd_hints}
 %files osd_hints
 %defattr(-, root, root, -)
@@ -1189,27 +676,20 @@
 %module_files tabs -ct
 %endif
 
-%if %{with water_notify}
-%files water_notify
-%defattr(-, root, root, -)
-%module_files water_notify -ct
-%endif
 
+%changelog
+* Tue Dec 16 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.5-7
+- Osd_hints tarball was missing in sources
 
-%if %{with weather}
-%files weather
-%defattr(-, root, root, -)
-%module_files weather -cdt
-%endif
+* Tue Dec 16 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.5-6
+- Enable kadu-osd_hints by default
 
-%if %{with xmms_mediaplayer}
-%files xmms_mediaplayer
-%defattr(-, root, root, -)
-%module_files xmms_mediaplayer
-%endif
+* Tue Dec 16 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.5-5
+- Fix conflicts with kadu-osd_hints and kadu-agent
 
+* Wed Dec 10 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.5-4
+- More cleaning
 
-%changelog
 * Tue Dec 09 2008 MichaÅ‚ Bentkowski <mr.ecik at gmail.com> - 0.6.5-3
 - Fix bz #475629
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kadu/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	6 Dec 2008 21:48:32 -0000	1.18
+++ sources	18 Dec 2008 16:38:37 -0000	1.19
@@ -10,3 +10,4 @@
 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
+69b868bf177a3d2aee09a62a54265d23  kadu-osd_hints-0.1.2.tar.bz2


