Author: arvenil                      Date: Sun Mar  2 20:36:34 2008 GMT
Module: SPECS                         Tag: AC-DEVEL
---- Log message:
- merged all changes from DEVEL

---- Files affected:
SPECS:
   kadu.spec (1.97.2.102.2.4 -> 1.97.2.102.2.5) 

---- Diffs:

================================================================
Index: SPECS/kadu.spec
diff -u SPECS/kadu.spec:1.97.2.102.2.4 SPECS/kadu.spec:1.97.2.102.2.5
--- SPECS/kadu.spec:1.97.2.102.2.4      Tue Feb 19 21:17:50 2008
+++ SPECS/kadu.spec     Sun Mar  2 21:36:29 2008
@@ -2,11 +2,6 @@
 #
 # TODO:
 # - Some modules with bcond_with will not work for now, we need to wait for 
next releases
-# - Add Obsoletes for modules iwait4u, powerkadu if they will not be fixed 
before final 0.6.0
-#
-# NOTE:
-# - We use staticly linked libgadu because of no stable release with dcc7
-# - There is no audacious in AC so audacious module for kadu is disabled
 #
 # Conditional build:
 %bcond_with    snap                    # build cvs snapshot
@@ -14,9 +9,14 @@
 
 %bcond_without advanced_userlist       # without Advanced Userlist support
 %bcond_without agent                   # without agent module support
+%bcond_without antistring              # without antistring module support
+%bcond_without auto_hide               # without auto_hide module support
 %bcond_without autoresponder           # without autoresponder module support
+%bcond_without anonymous_check         # without anonymous_check module support
+%bcond_without cenzor                  # without cenzor module support
 %bcond_without dcopexport              # without dcopexport module support
 %bcond_without docking_desktop         # without desktop_docking module support
+%bcond_without docking_wmaker          # without wmaker_docking module support
 %bcond_without encryption              # without encryption module support
 %bcond_without filedesc                # without filedesc module support
 %bcond_without filtering               # without filtering module support
@@ -38,7 +38,8 @@
 %bcond_without notify_water            # without water_notify module support
 %bcond_without notify_xosd             # without xosd_notify module support
 %bcond_without panelkadu               # without panelkadu module support
-%bcond_with    powerkadu               # with PowerKadu extensions
+%bcond_without parser_extender         # without parser_extender extensions
+%bcond_without powerkadu               # without PowerKadu extensions
 %bcond_without profiles                # without profiles module support
 %bcond_without sound_alsa              # without ALSA support
 %bcond_without sound_ao                # without ao support
@@ -50,40 +51,50 @@
 %bcond_without screenshot              # without screenshot module support
 %bcond_without sms_miastoplusa         # without miastoplusa_sms module support
 %bcond_without spellchecker            # without spellchecker (Aspell support) 
invisible
+%bcond_without split_messages          # without split_messages module support
 %bcond_without tabs                    # without tabs support module
 %bcond_without voice                   # without voice support module
 %bcond_without weather                 # without weather check module support
+%bcond_without word_fix                # without word_fix module support
 
 %define                _snap   20080208
 %define                _rel    rc4
+%define                _libgadu_ver            4:1.8.0
 
 %define                _agent_mod_ver          0.4.4
 %define                _amarok_mod_ver         20071220
+%define                _anonymous_check_ver    0.2
+%define                _antistring_ver         0.2
+%define                _auto_hide_ver          0.2.1
+%define                _cenzor_ver             0.2
 %define                _dcopexport_ver         0.11.3-20071129
 %define                _falf_mod_ver           20071225
 %define                _filedesc_ver           20080104
-%define                _filtering_ver          20080204
+%define                _filtering_ver          20080224
 %define                _firewall_ver           0.7.5
 %define                _iwait4u_ver            1.3
-%define                _mail_ver               0.3.2
-%define                _mediaplayer_mod_ver    20080210
-%define                _mediaplayer_audacious_ver      20071220
+%define                _mail_ver               0.3.3
+%define                _mediaplayer_mod_ver    20080224
+%define                _mediaplayer_audacious_ver      20080224
 %define                _mime_tex_ver           1.4.1
 %define                _notify_exec_ver        20070101
 %define                _notify_led_ver         0.18
 %define                _notify_mx610_ver       0.3.1
-%define                _notify_osdhints_ver    0.4.0.8
+%define                _notify_osdhints_ver    0.4.0.9
 %define                _notify_pcspeaker_ver   0.6.0.3
 %define                _notify_water_ver       0.1.1-try2
-%define                _panelkadu_ver          alpha3
-%define                _powerkadu_ver          20070129
+%define                _panelkadu_ver          beta3
+%define                _parser_extender_ver    0.1.1
+%define                _powerkadu_ver          2.0.1
 %define                _profiles_ver           0.3.1
 %define                _screenshot_ver         20080104
 %define                _sms_miastoplusa_ver    1.3.9
 %define                _sound_ao_ver           20060424
 %define                _spellchecker_mod_ver   20071230
-%define                _tabs_ver               1.1.4
+%define                _split_messages_ver     0.2
+%define                _tabs_ver               1.1.5
 %define                _weather_ver            3.13
+%define                _word_fix_ver           0.3
 %define                _xmms_mod_ver           20080116
 
 %if %{with snap}
@@ -107,7 +118,7 @@
 %endif
 Source1:       %{name}.desktop
 Source2:       
http://www.kadu.net/download/modules_extra/mediaplayer/mediaplayer-%{_mediaplayer_mod_ver}.tar.bz2
-# Source2-md5: f24c85c640fa88a887cab078d8cacfc4
+# Source2-md5: 8a27d4873e6896d63f7c8193029b24ca
 Source3:       
http://www.kadu.net/download/modules_extra/amarok_mediaplayer/amarok_mediaplayer-%{_amarok_mod_ver}.tar.bz2
 # Source3-md5: 51d304e335e814f3d8c0f1654007a7d7
 Source4:       
http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-%{_dcopexport_ver}-%{version}.tar.bz2
@@ -115,7 +126,7 @@
 Source5:       
http://www.kadu.net/download/modules_extra/filedesc/filedesc-%{_filedesc_ver}.tar.bz2
 # Source5-md5: 8d11979fa8a3795f7ab20fbb1fb8bdbb
 Source6:       
http://www.kadu.net/download/modules_extra/filtering/filtering-%{_filtering_ver}.tar.bz2
-# Source6-md5: 89174f20bf9c71d23ca7d3619907737a
+# Source6-md5: a672d4ef9ce113196e4689b9141b4aef
 Source7:       
http://www.kadu.net/~pan_wojtas/iwait4u/download/%{name}-iwait4u-%{_iwait4u_ver}.tar.gz
 # Source7-md5: 6233a8ef21d901fc5fb91c0db40d0e32
 Source8:       
http://www.kadu.net/download/modules_extra/falf_mediaplayer/falf_mediaplayer-%{_falf_mod_ver}.tar.bz2
@@ -123,11 +134,11 @@
 Source9:       http://kadu.net/~blysk/led_notify-%{_notify_led_ver}.tar.bz2
 # Source9-md5: 786a0ee40a3aef03b51e2d89a2bceda5
 Source10:      
http://www.kadu.net/~dorr/moduly/%{name}-osdhints_notify-%{_notify_osdhints_ver}.tar.bz2
-# Source10-md5:        ca064370d08cab843e5c33eed61afbf4
+# Source10-md5:        f515d2dd54d4a5948f691b05d13be70d
 Source11:      
http://www.kadu.net/~dorr/moduly/%{name}-pcspeaker-%{_notify_pcspeaker_ver}.tar.bz2
 # Source11-md5:        4b8abfe0c57efabb49ba8c6c71a316f2
-Source12:      
http://kadu.net/~patryk/powerkadu/powerkadu-%{_powerkadu_ver}.tar.gz
-# Source12-md5:        c6046e8b49dd9994fbf573faaafddab8
+Source12:      
http://www.kadu.net/~dorr/moduly/%{name}-powerkadu-%{_powerkadu_ver}.tar.bz2
+# Source12-md5:        2a0360e80e72cb4dbd1c65eb7bdca2c0
 Source13:      
http://www.kadu.net/~dorr/moduly/%{name}-profiles-%{_profiles_ver}.tar.bz2
 # Source13-md5:        d7ec7f808d15308d10ed76d1e3743f37
 Source14:      
http://www.kadu.net/download/modules_extra/screenshot/screenshot-%{_screenshot_ver}.tar.bz2
@@ -139,7 +150,7 @@
 Source17:      
http://misiek.jah.pl/assets/2008/2/8/agent-%{_agent_mod_ver}.tar.gz
 # Source17-md5:        4401e0e3c509af347cb14a89236301ea
 Source18:      
http://kadu.net/~arvenil/tabs/download/%{version}/%{_tabs_ver}/%{name}-tabs-%{_tabs_ver}.tar.bz2
-# Source18-md5:        57e4c970f496ba81495d59d7b96bcdf1
+# Source18-md5:        8313ae2aa85b4a6f890203ed5f93fa1b
 Source19:      http://kadu.net/~blysk/weather-%{_weather_ver}.tar.bz2
 # Source19-md5:        41a6edd1356a36e4606e432d0bc856f6
 Source20:      
http://www.kadu.net/download/modules_extra/xmms_mediaplayer/xmms_mediaplayer-%{_xmms_mod_ver}.tar.bz2
@@ -147,11 +158,13 @@
 Source21:      
http://kadu.jarzebski.pl/water_notify-%{_notify_water_ver}.tar.bz2
 # Source21-md5:        10320f9b96366422bbcd7ec76d4e85a1
 Source22:      http://www.ultr.pl/kadu/panelkadu-0.6-%{_panelkadu_ver}.tar.gz
-# Source22-md5:        85adfdc9a9792b171d4a4892b2fef621
+# Source22-md5:        0070c9bb4559ec29bb1195acdc5c5967
 Source23:      
http://www.kadu.net/download/additions/%{name}-0.6-theme-glass-16.tar.gz
-# Source23-md5:        d09256b6b2ae801088c1f6e04bbac5f7
+# Source23-md5:        74712871bc3edc4a9e612e18138c49b0
 Source24:      
http://www.kadu.net/download/additions/%{name}-0.6-theme-glass-22.tar.gz
-# Source24-md5:        d9f33f1224315771615faaefd2397918
+# Source24-md5:        c3f43652254f877dc991747b2d70f70a
+Source25:      
http://www.kadu.net/~dorr/moduly/%{name}-word_fix-%{_word_fix_ver}.tar.bz2
+# Source25-md5:        691484a500c75079508b240449cb9c90
 Source27:      
http://www.kadu.net/~dorr/moduly/%{name}-firewall-%{_firewall_ver}.tar.bz2
 # Source27-md5:        9b0f04b4254b4ff08254b15e59a81be7
 Source28:      
http://kadu.net/~patryk/mime_tex/mime_tex-%{_mime_tex_ver}.tar.bz2
@@ -161,17 +174,31 @@
 Source30:      
http://www.kadu.net/~joi/ao_sound/packages/ao_sound-%{_sound_ao_ver}.tar.bz2
 # Source30-md5:        95809d330e48e61f58ec961ddbf0b529
 Source31:      
http://www.kadu.net/download/modules_extra/audacious_mediaplayer/audacious_mediaplayer-%{_mediaplayer_audacious_ver}.tar.bz2
-# Source31-md5:        37cb762e361208c5c571771fb86968b5
+# Source31-md5:        aa427d5b87fcc48cdd799cf19fe92da1
 Source32:      http://www.kadu.net/~weagle/mail/mail-%{_mail_ver}.tar.bz2
-# Source32-md5:        0526354146a6c46b3670239f820a7caa
+# Source32-md5:        898561b215ac10a99be62fa4e3a50a55
 Source33:      
http://www.kadu.net/download/additions/%{name}-0.6-theme-oxygen-16.tar.gz
 # Source33-md5:        fb13f2624dec27632c42a6bc2c1a252f
 Source34:      
http://www.kadu.net/download/additions/%{name}-0.6-theme-tango-16.tar.gz
 # Source34-md5:        52fe12765b600b9aa44cfc6489dce8eb
+Source35:      
http://www.kadu.net/~dorr/moduly/%{name}-split_messages-%{_split_messages_ver}.tar.bz2
+# Source35-md5:        450cbb8047aa15f4d040da361b660c5d
+Source36:      
http://kadu.net/~patryk/anonymous_check/anonymous_check-%{_anonymous_check_ver}.tar.bz2
+# Source36-md5:        84abb6515abc9a5aaa5d1f6b1f2b12e0
+Source37:      
http://www.kadu.net/~dorr/moduly/%{name}-antistring-%{_antistring_ver}.tar.bz2
+# Source37-md5:        4e09f977471ec504ad4acdb52fdb76ec
+Source38:      
http://www.kadu.net/~dorr/moduly/%{name}-auto_hide-%{_auto_hide_ver}.tar.bz2
+# Source38-md5:        42dd07b9745aabd1c52bf088ae3b79e9
+Source39:      
http://www.kadu.net/~dorr/moduly/%{name}-cenzor-%{_cenzor_ver}.tar.bz2
+# Source39-md5:        ff759d913d2cc3f160502fbf23993c87
+Source40:      
http://www.kadu.net/~dorr/moduly/%{name}-parser_extender-%{_parser_extender_ver}.tar.bz2
+# Source40-md5:        06378537ce5dace67ce623bcb05b0ea1
+Source41:      
http://www.kadu.net/download/additions/%{name}-theme-kadu05.tar.gz
+# Source41-md5:        8576eef06700e8a9b7335452423a37a2
+
 Patch0:                %{name}-ac_am.patch
 Patch1:                %{name}-voice.patch
-Patch2:                %{name}-mediaplayer-audacious.patch
-Patch3:                %{name}-gcc3.patch
+Patch2:                %{name}-gcc3.patch
 URL:           http://kadu.net/
 %{?with_sound_alsa:BuildRequires:      alsa-lib-devel}
 %{?with_sound_arts:BuildRequires:      artsc-devel}
@@ -185,6 +212,7 @@
 BuildRequires: kdelibs-devel
 %endif
 %{?with_sound_ao:BuildRequires:        libao-devel}
+BuildRequires: libgadu-devel >= %{_libgadu_ver}
 %{?with_voice:BuildRequires:   libgsm-devel}
 BuildRequires: libsndfile-devel >= 1.0
 %{?with_sound_nas:BuildRequires:       nas-devel}
@@ -192,9 +220,12 @@
 %{?with_mediaplayer_audacious:BuildRequires:   pkgconfig}
 BuildRequires: qt-linguist
 BuildRequires: sed >= 4.0
+%{?with_mediaplayer_audacious:BuildRequires:   which}
 %{?with_mediaplayer_xmms:BuildRequires:        xmms-devel}
 %{?with_notify_xosd:BuildRequires:     xosd-devel}
+Requires:      libgadu >= %{_libgadu_ver}
 Obsoletes:     kadu-module-imiface <= 0.4.3
+Obsoletes:     kadu-module-iwait4u <= 0.5.0
 Obsoletes:     kadu-module-speech <= 0.4.3
 Obsoletes:     kadu-module-tcl_scripting <= 0.4.3
 Obsoletes:     kadu-theme-icons-crystal16 <= 0.5.0
@@ -253,6 +284,55 @@
 %description module-autoresponder -l pl.UTF-8
 Moduł autoodpowiedzi.
 
+%package module-anonymous_check
+Summary:       Automatic lookup of an interlocutor in public directory
+Summary(pl.UTF-8):     Automatyczne wyszukiwanie nieznajomych rozmĂłwcĂłw w 
publicznym katalogu
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+
+%description module-anonymous_check
+Automatic lookup of an interlocutor in public directory.
+
+%description module-anonymous_check -l pl.UTF-8
+Automatyczne wyszukiwanie nieznajomych rozmĂłwcĂłw w publicznym
+katalogu.
+
+%package module-antistring
+Summary:       Antistring
+Summary(pl.UTF-8):     Ochrona przed łańcuszkami
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+
+%description module-antistring
+Antistring.
+
+%description module-antistring -l pl.UTF-8
+Ochrona przed łańcuszkami.
+
+%package module-auto_hide
+Summary:       Auto hide Kadu window
+Summary(pl.UTF-8):     Automatyczne ukrywanie okna Kadu
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+
+%description module-auto_hide
+Auto hide Kadu window.
+
+%description module-auto_hide -l pl.UTF-8
+Automatyczne ukrywanie okna Kadu.
+
+%package module-cenzor
+Summary:       Censor
+Summary(pl.UTF-8):     Cenzor
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+
+%description module-cenzor
+Censor.
+
+%description module-cenzor -l pl.UTF-8
+Cenzor.
+
 %package module-dcopexport
 Summary:       Kadu DCOP interface
 Summary(pl.UTF-8):     Interfejs niektĂłrych funkcji Kadu do DCOP
@@ -277,6 +357,18 @@
 %description module-docking-desktop -l pl.UTF-8
 Moduł dokowania w dowolnym punkcie ekranu.
 
+%package module-docking-wmaker
+Summary:       WindowMaker docking module for Kadu
+Summary(pl.UTF-8):     Moduł dokujący ikonę Kadu w WindowMakerze
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+
+%description module-docking-wmaker
+WindowMaker docking module for Kadu.
+
+%description module-docking-wmaker -l pl.UTF-8
+Moduł dokujący ikonę Kadu w WindowMakerze.
+
 %package module-encryption
 Summary:       Chat encryption module
 Summary(pl.UTF-8):     Moduł szyfrowania rozmów
@@ -400,6 +492,7 @@
 Summary(pl.UTF-8):     Moduł statusu dla falf
 Group:         Applications/Communications
 Requires:      %{name}-module-mediaplayer = %{version}-%{release}
+Requires:      falf
 
 %description module-mediaplayer-falf
 Module which allows showing in status description information about
@@ -549,21 +642,39 @@
 %description module-panelkadu -l pl.UTF-8
 Moduł sprawiający, że Kadu wygląda i zachowuje się jak panel.
 
+%package module-parser_extender
+Summary:       Extends Kadu Parser
+Summary(pl.UTF-8):     Rozszerza możliwości Parsera Kadu
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+
+%description module-parser_extender
+Extends Kadu Parser.
+
+%description module-parser_extender -l pl.UTF-8
+Rozszerza możliwości Parsera Kadu.
+
 %package module-powerkadu
 Summary:       PowerKadu extensions
 Summary(pl.UTF-8):     Rozszerzenia PowerKadu
 Group:         Applications/Communications
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-module-anonymous_check = %{version}-%{release}
+Requires:      %{name}-module-antistring = %{version}-%{release}
+Requires:      %{name}-module-auto_hide = %{version}-%{release}
+Requires:      %{name}-module-cenzor = %{version}-%{release}
+Requires:      %{name}-module-parser_extender = %{version}-%{release}
+Requires:      %{name}-module-split_messages = %{version}-%{release}
+Requires:      %{name}-module-word_fix = %{version}-%{release}
 
 %description module-powerkadu
 PowerKadu is an add-on to Kadu. It extends Kadu functionality by
-useful functions, like : autostatus, antistring, cenzor, TeX formula,
-words fix, ...
+useful functions, like: autostatus, antistring, cenzor, words fix...
 
 %description module-powerkadu -l pl.UTF-8
 PowerKadu jest dodatkiem do Kadu. Poszerza on możliwości Kadu o
 przydatne funkcje, takie jak: autostatus, antyłańcuszek, cenzor,
-formuły TeX-a, korekta słów...
+korekta słów...
 
 %package module-profiles
 Summary:       Kadu Profiles
@@ -702,6 +813,19 @@
 %description module-spellchecker -l pl.UTF-8
 Moduł sprawdzający pisownię.
 
+%package module-split_messages
+Summary:       Automaticaly split too long messages in Kadu
+Summary(pl.UTF-8):     Automatyczne dzielenie zbyt długich wiadomości w Kadu
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+Requires:      aspell
+
+%description module-split_messages
+Automaticaly split too long messages in Kadu.
+
+%description module-split_messages -l pl.UTF-8
+Automatyczne dzielenie zbyt długich wiadomości w Kadu.
+
 %package module-tabs
 Summary:       Tabbed chat dialog module
 Summary(pl.UTF-8):     Moduł okna rozmowy z kartami
@@ -738,6 +862,18 @@
 %description module-weather -l pl.UTF-8
 Informacje o pogodzie w miejscowości danego kontaktu.
 
+%package module-word_fix
+Summary:       Automatic word replacement module for Kadu
+Summary(pl.UTF-8):     Moduł automatycznej zamiany słów dla Kadu
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+
+%description module-word_fix
+Automatic word replacement module for Kadu.
+
+%description module-word_fix -l pl.UTF-8
+Moduł automatycznej zamiany słów dla Kadu.
+
 %package theme-icons-glass16
 Summary:       Glass16 icon theme
 Summary(pl.UTF-8):     Zestaw ikon glass16
@@ -762,6 +898,18 @@
 %description theme-icons-glass22 -l pl.UTF-8
 Zestaw ikon glass22.
 
+%package theme-icons-kadu05
+Summary:       Kadu05 icon theme
+Summary(pl.UTF-8):     Zestaw ikon Kadu05
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+
+%description theme-icons-kadu05
+Kadu05 icon theme.
+
+%description theme-icons-kadu05 -l pl.UTF-8
+Zestaw ikon Kadu05.
+
 %package theme-icons-oxygen16
 Summary:       Oxygen16 icon theme
 Summary(pl.UTF-8):     Zestaw ikon Oxygen16
@@ -790,17 +938,22 @@
 %setup -q -T -b %{?with_snap:10}0 -n %{name}
 %patch0 -p1
 %patch1 -p1
-%patch3 -p1
+%patch2 -p1
 
-%if %{with mediaplayer}
-tar xjf %{SOURCE2} -C modules
+%if %{with agent}
+tar xzf %{SOURCE17} -C modules
 %endif
-%if %{with mediaplayer_amarok}
-tar xjf %{SOURCE3} -C modules
+%if %{with anonymous_check}
+tar xjf %{SOURCE36} -C modules
 %endif
-%if %{with mediaplayer_audacious}
-tar xjf %{SOURCE31} -C modules
-%patch2 -p1
+%if %{with antistring}
+tar xjf %{SOURCE37} -C modules
+%endif
+%if %{with auto_hide}
+tar xjf %{SOURCE38} -C modules
+%endif
+%if %{with cenzor}
+tar xjf %{SOURCE39} -C modules
 %endif
 %if %{with dcopexport}
 tar xjf %{SOURCE4} -C modules
@@ -820,9 +973,21 @@
 %if %{with mail}
 tar xjf %{SOURCE32} -C modules
 %endif
+%if %{with mediaplayer}
+tar xjf %{SOURCE2} -C modules
+%endif
+%if %{with mediaplayer_amarok}
+tar xjf %{SOURCE3} -C modules
+%endif
+%if %{with mediaplayer_audacious}
+tar xjf %{SOURCE31} -C modules
+%endif
 %if %{with mediaplayer_falf}
 tar xjf %{SOURCE8} -C modules
 %endif
+%if %{with mediaplayer_xmms}
+tar xjf %{SOURCE20} -C modules
+%endif
 %if %{with mime_tex}
 tar xjf %{SOURCE28} -C modules
 %endif
@@ -844,8 +1009,11 @@
 %if %{with panelkadu}
 tar xzf %{SOURCE22} -C modules
 %endif
+%if %{with parser_extender}
+tar xjf %{SOURCE40} -C modules
+%endif
 %if %{with powerkadu}
-tar xzf %{SOURCE12} -C modules
+tar xjf %{SOURCE12} -C modules
 %endif
 %if %{with profiles}
 tar xjf %{SOURCE13} -C modules
@@ -862,8 +1030,8 @@
 %if %{with spellchecker}
 tar xjf %{SOURCE16} -C modules
 %endif
-%if %{with agent}
-tar xzf %{SOURCE17} -C modules
+%if %{with split_messages}
+tar xjf %{SOURCE35} -C modules
 %endif
 %if %{with tabs}
 tar xjf %{SOURCE18} -C modules
@@ -871,34 +1039,55 @@
 %if %{with weather}
 tar xjf %{SOURCE19} -C modules
 %endif
-%if %{with mediaplayer_xmms}
-tar xjf %{SOURCE20} -C modules
+%if %{with word_fix}
+tar xjf %{SOURCE25} -C modules
 %endif
 # themes-icons
 tar xzf %{SOURCE23} -C varia/themes/icons
 tar xzf %{SOURCE24} -C varia/themes/icons
 tar xzf %{SOURCE33} -C varia/themes/icons
 tar xzf %{SOURCE34} -C varia/themes/icons
+tar xzf %{SOURCE41} -C varia/themes/icons
 
 # Change hard coded path to modules data files
 %{__sed} -i 's,dataPath("kadu/modules/*,("%{_modules_data_dir}/,g' 
kadu-core/modules.cpp
 
 %build
+%if %{with agent}
+%{__sed} -i 's/module_agent=n/module_agent=m/' .config
+%else
+%{__sed} -i 's/module_agent=m/module_agent=n/' .config
+%endif
 %if %{with advanced_userlist}
 %{__sed} -i 's/module_advanced_userlist=n/module_advanced_userlist=m/' .config
 %else
 %{__sed} -i 's/module_advanced_userlist=m/module_advanced_userlist=n/' .config
 %endif
-%if %{with agent}
-%{__sed} -i 's/module_agent=n/module_agent=m/' .config
+%if %{with anonymous_check}
+%{__sed} -i 's/module_anonymous_check=n/module_anonymous_check=m/' .config
 %else
-%{__sed} -i 's/module_agent=m/module_agent=n/' .config
+%{__sed} -i 's/module_anonymous_check=m/module_anonymous_check=n/' .config
+%endif
+%if %{with antistring}
+%{__sed} -i 's/module_antistring=n/module_antistring=m/' .config
+%else
+%{__sed} -i 's/module_antistring=m/module_antistring=n/' .config
 %endif
 %if %{with autoresponder}
 %{__sed} -i 's/module_autoresponder=n/module_autoresponder=m/' .config
 %else
 %{__sed} -i 's/module_autoresponder=m/module_autoresponder=n/' .config
 %endif
+%if %{with auto_hide}
+%{__sed} -i 's/module_auto_hide=n/module_auto_hide=m/' .config
+%else
+%{__sed} -i 's/module_auto_hide=m/module_auto_hide=n/' .config
+%endif
+%if %{with cenzor}
+%{__sed} -i 's/module_cenzor=n/module_cenzor=m/' .config
+%else
+%{__sed} -i 's/module_cenzor=m/module_cenzor=n/' .config
+%endif
 %if %{with dcopexport}
 %{__sed} -i 's/module_dcopexport=n/module_dcopexport=m/' .config
 %else
@@ -909,6 +1098,11 @@
 %else
 %{__sed} -i 's/module_desktop_docking=m/module_desktop_docking=n/' .config
 %endif
+%if %{with docking_wmaker}
+%{__sed} -i 's/module_wmaker_docking=n/module_wmaker_docking=m/' .config
+%else
+%{__sed} -i 's/module_wmaker_docking=m/module_wmaker_docking=n/' .config
+%endif
 %if %{with encryption}
 %{__sed} -i 's/module_encryption=n/module_encryption=m/' .config
 %else
@@ -1016,10 +1210,13 @@
 %else
 %{__sed} -i 's/module_panelkadu=m/module_panelkadu=n/' .config
 %endif
+%if %{with parser_extender}
+%{__sed} -i 's/module_parser_extender=n/module_parser_extender=m/' .config
+%else
+%{__sed} -i 's/module_parser_extender=m/module_parser_extender=n/' .config
+%endif
 %if %{with powerkadu}
 %{__sed} -i 's/module_powerkadu=n/module_powerkadu=m/' .config
-# fix for 20070107 version
-rm -f modules/powerkadu/bin/mimetex
 %else
 %{__sed} -i 's/module_powerkadu=m/module_powerkadu=n/' .config
 %endif
@@ -1079,6 +1276,11 @@
 %else
 %{__sed} -i 's/module_spellchecker=m/module_spellchecker=n/' .config
 %endif
+%if %{with split_messages}
+%{__sed} -i 's/module_split_messages=n/module_split_messages=m/' .config
+%else
+%{__sed} -i 's/module_split_messages=m/module_split_messages=n/' .config
+%endif
 %if %{with tabs}
 %{__sed} -i 's/module_tabs=n/module_tabs=m/' .config
 %else
@@ -1094,9 +1296,15 @@
 %else
 %{__sed} -i 's/module_weather=m/module_weather=n/' .config
 %endif
+%if %{with word_fix}
+%{__sed} -i 's/module_word_fix=n/module_word_fix=m/' .config
+%else
+%{__sed} -i 's/module_word_fix=m/module_word_fix=n/' .config
+%endif
 
 %{__sed} -i 's/icons_glass16=n/icons_glass16=y/' .config
 %{__sed} -i 's/icons_glass22=n/icons_glass22=y/' .config
+%{__sed} -i 's/icons_kadu05=n/icons_kadu05=y/' .config
 %{__sed} -i 's/icons_oxygen16=n/icons_oxygen16=y/' .config
 %{__sed} -i 's/icons_tango16=n/icons_tango16=y/' .config
 
@@ -1109,6 +1317,7 @@
 %configure \
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kadu.spec?r1=1.97.2.102.2.4&r2=1.97.2.102.2.5&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to