From ab976795942009e4de87c774aa78a54f9ca81e26 Mon Sep 17 00:00:00 2001 From: Michał Bentkowski Date: Mar 14 2008 15:04:52 +0000 Subject: - Fix bugs 436574 (f8) and 436575 (f7) - New versions of tabs and osdhints_notify - New modules: anonymous_check antistring auto_hide cenzor parser_extender powerkadu split_messages word_fix --- diff --git a/.cvsignore b/.cvsignore index ff5206a..f6576f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,5 +1,6 @@ agent-0.4.4.tar.gz amarok_mediaplayer-20071220.tar.bz2 +anonymous_check-0.2.tar.bz2 ao_sound-20060424.tar.bz2 audacious_mediaplayer-20080224.tar.bz2 dcopexport-0.11.3-20071129-0.6.0.tar.bz2 @@ -7,11 +8,18 @@ falf_mediaplayer-20071225.tar.bz2 filedesc-20080104.tar.bz2 filtering-20080224.tar.bz2 kadu-0.6.0.tar.bz2 +kadu-antistring-0.2.tar.bz2 +kadu-auto_hide-0.2.1.tar.bz2 +kadu-cenzor-0.2.tar.bz2 kadu-firewall-0.7.5.tar.bz2 -kadu-osdhints_notify-0.4.0.9.tar.bz2 +kadu-osdhints_notify-0.4.0.11.tar.bz2 +kadu-parser_extender-0.1.1.tar.bz2 kadu-pcspeaker-0.6.0.3.tar.bz2 +kadu-powerkadu-2.0.1.tar.bz2 kadu-profiles-0.3.1.tar.bz2 -kadu-tabs-1.1.4.tar.bz2 +kadu-split_messages-0.2.tar.bz2 +kadu-tabs-1.1.5.tar.bz2 +kadu-word_fix-0.3.tar.bz2 led_notify-0.18.tar.bz2 mail-0.3.3.tar.bz2 mediaplayer-20080224.tar.bz2 diff --git a/kadu.spec b/kadu.spec index be090ed..dec1245 100644 --- a/kadu.spec +++ b/kadu.spec @@ -32,7 +32,7 @@ sed "s#^module_%2=.#module_%2=m#" -i ../.config\ %{_datadir}/kadu/modules/configuration/%1.ui\ %endif\ %if "%{-t}" \ -%{_datadir}/kadu/modules/translations/%{1}_*.qm\ +%{_datadir}/kadu/modules/translations/%{1}*.qm\ %endif\ %if "%{-d}" \ %{_datadir}/kadu/modules/data/%1\ @@ -42,7 +42,7 @@ sed "s#^module_%2=.#module_%2=m#" -i ../.config\ # kadu.spec # table to make it possible to find out quickly which # subpackage has which source's number -# LAST NUMBER: 125 +# LAST NUMBER: 133 # 116 agent # 101 amarok_mediaplayer # 102 ao_sound @@ -73,9 +73,13 @@ sed "s#^module_%2=.#module_%2=m#" -i ../.config\ # agent # alsa_sound # amarok_mediaplayer +# anonymous_check +# antistring # ao_sound # arts_sound # audacious_mediaplayer +# auto_hide +# cenzor # dcopexport # esd_sound # filedesc @@ -86,13 +90,17 @@ sed "s#^module_%2=.#module_%2=m#" -i ../.config\ # miastoplusa_sms # osdhints_notify # panelkadu +# parser_extender # pcspeaker +# powerkadu # profiles # screenshot # spellchecker +# split_messages # tabs # water_notify # weather +# word_fix # xmms_mediaplayer # whether we want to build certain subpackages or not @@ -100,9 +108,13 @@ sed "s#^module_%2=.#module_%2=m#" -i ../.config\ %bcond_without agent %bcond_without alsa_sound %bcond_without amarok_mediaplayer +%bcond_without anonymous_check +%bcond_without antistring %bcond_without ao_sound %bcond_without arts_sound %bcond_without audacious_mediaplayer +%bcond_without auto_hide +%bcond_without cenzor %bcond_without dcopexport %bcond_without esd_sound %bcond_without falf_mediaplayer @@ -117,22 +129,23 @@ sed "s#^module_%2=.#module_%2=m#" -i ../.config\ %bcond_without mx610_notify %bcond_without osdhints_notify %bcond_without panelkadu +%bcond_without parser_extender %bcond_without pcspeaker +%bcond_without powerkadu %bcond_without profiles %bcond_without screenshot %bcond_without spellchecker +%bcond_without split_messages %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. - +%bcond_without word_fix +%bcond_without xmms_mediaplayer +%bcond_without existing_libgadu Name: kadu Version: 0.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An Gadu-Gadu client for online messaging Summary(pl): Klient Gadu-Gadu Group: Applications/Internet @@ -148,12 +161,24 @@ Source116: http://misiek.jah.pl/assets/2008/2/8/agent-0.4.4.tar.gz %if %{with amarok_mediaplayer} Source101: http://www.kadu.net/download/modules_extra/amarok_mediaplayer/amarok_mediaplayer-20071220.tar.bz2 %endif +%if %{with anonymous_check} +Source126: http://kadu.net/~patryk/anonymous_check/anonymous_check-0.2.tar.bz2 +%endif +%if %{with antistring} +Source127: http://www.kadu.net/~dorr/moduly/kadu-antistring-0.2.tar.bz2 +%endif %if %{with ao_sound} Source102: http://www.kadu.net/~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 auto_hide} +Source128: http://www.kadu.net/~dorr/moduly/kadu-auto_hide-0.2.1.tar.bz2 +%endif +%if %{with cenzor} +Source129: http://www.kadu.net/~dorr/moduly/kadu-cenzor-0.2.tar.bz2 +%endif %if %{with dcopexport} Source104: http://alan.umcs.lublin.pl/~pinkworm/dcopexport/dcopexport-0.11.3-20071129-0.6.0.tar.bz2 %endif @@ -188,14 +213,20 @@ Source119: http://kadu.net/~patryk/mime_tex/mime_tex-1.4.1.tar.bz2 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 +Source124: http://www.kadu.net/~dorr/moduly/kadu-osdhints_notify-0.4.0.11.tar.bz2 %endif %if %{with panelkadu} Source123: http://www.ultr.pl/kadu/panelkadu-0.6-beta3.tar.gz %endif +%if %{with parser_extender} +Source130: http://www.kadu.net/~dorr/moduly/kadu-parser_extender-0.1.1.tar.bz2 +%endif %if %{with pcspeaker} Source109: http://kadu.net/~dorr/moduly/kadu-pcspeaker-0.6.0.3.tar.bz2 %endif +%if %{with powerkadu} +Source131: http://www.kadu.net/~dorr/moduly/kadu-powerkadu-2.0.1.tar.bz2 +%endif %if %{with profiles} Source110: http://www.kadu.net/~dorr/moduly/kadu-profiles-0.3.1.tar.bz2 %endif @@ -205,8 +236,11 @@ Source111: http://www.kadu.net/download/modules_extra/screenshot/screenshot-2008 %if %{with spellchecker} Source112: http://www.kadu.net/download/modules_extra/spellchecker/spellchecker-20071230.tar.bz2 %endif +%if %{with split_messages} +Source132: http://www.kadu.net/~dorr/moduly/kadu-split_messages-0.2.tar.bz2 +%endif %if %{with tabs} -Source113: http://www.kadu.net/~arvenil/tabs/download/0.6.0/kadu-tabs-1.1.4.tar.bz2 +Source113: http://www.kadu.net/~arvenil/tabs/download/0.6.0/kadu-tabs-1.1.5.tar.bz2 %endif %if %{with water_notify} Source125: http://kadu.jarzebski.pl/water_notify-0.1.1-try2.tar.bz2 @@ -214,19 +248,27 @@ Source125: http://kadu.jarzebski.pl/water_notify-0.1.1-try2.tar.bz2 %if %{with weather} Source114: http://kadu.net/~blysk/weather-3.13.tar.bz2 %endif +%if %{with word_fix} +Source133: http://www.kadu.net/~dorr/moduly/kadu-word_fix-0.3.tar.bz2 +%endif %if %{with xmms_mediaplayer} Source115: http://www.kadu.net/download/modules_extra/xmms_mediaplayer/xmms_mediaplayer-20080116.tar.bz2 %endif #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 +BuildRequires: libpng-devel libsndfile-devel openssl-devel +%if %fedora < 9 +BuildRequires: qt-devel +%else +BuildRequires: qt3-devel +%endif %if %{with existing_libgadu} BuildRequires: libgadu-devel %endif -Obsoletes: kadu-extinfo < 0.6.0-0.1.alpha1 +Obsoletes: kadu-ext_info < 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-wmaker_docking < 0.6.0-0.1.alpha1 Obsoletes: kadu-advanced_userlist < 0.6.0-0.1.alpha1 Provides: kadu-advanced_userlist = %{version}-%{release} Obsoletes: kadu-exec_notify < 0.6.0-0.1.alpha1 @@ -306,6 +348,38 @@ słuchanej piosenki w Amaroku w opisie. %endif +%if %{with anonymous_check} +%package anonymous_check +Summary: Automatic lookup of an interlocutor in public directory +Summary(pl): Automatyczne wyszukiwanie nieznajomych w katalogu +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} + +%description anonymous_check +Anonymous_check is a module to automatic lookup who is an interlocutor +when (s)he starts talking to you. + +%description anonymous_check -l pl +Anonymous_check to moduł, która automatycznie sprawdza dane w publicznym +katalogu nieznajomego, gdy ten zagada. + +%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 @@ -356,6 +430,36 @@ 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 cenzor} +%package cenzor +Summary: Censor +Summary(pl): Cenzor +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} + +%description cenzor +Censor. + +%description cenzor -l pl +Cenzor. + +%endif + %if %{with dcopexport} %package dcopexport Summary: Export some functions via DCOP @@ -574,6 +678,21 @@ Panelkadu to moduł zamieniający kadu w panel na skraju ekranu. %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 @@ -590,6 +709,30 @@ zdarzeniach przy pomocy PC Speakera. %endif +%if %{with powerkadu} +%package powerkadu +Summary: PowerKadu +Summary(pl): PowerKadu +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} +Requires: kadu-anonymous_check = %{version}-%{release} +Requires: kadu-antistring = %{version}-%{release} +Requires: kadu-auto_hide = %{version}-%{release} +Requires: kadu-cenzor = %{version}-%{release} +Requires: kadu-parser_extender = %{version}-%{release} +Requires: kadu-split_messages = %{version}-%{release} +Requires: kadu-word_fix = %{version}-%{release} + +%description powerkadu +PowerKadu is a metapackage which contains modules known from the "old" +powerkadu. + +%description powerkadu -l pl +PowerKadu to teraz metapakiet, który zawiera moduły znane ze "starego" +powerkadu. + +%endif + %if %{with profiles} %package profiles Summary: Profiles support @@ -638,6 +781,23 @@ rozmowy. %endif +%if %{with split_messages} +%package split_messages +Summary: Split too long messages +Summary(pl): Dzielenie zbyt długich wiadomości +Group: Applications/Internet +Requires: %{name} = %{version}-%{release} + +%description split_messages +Split_messages is a module to split a message to smaller parts +if it's too long. + +%description split_messages -l pl +Split_messages to moduł dzielący wiadomość na mniejsze części, +jeśli jest za długa. + +%endif + %if %{with tabs} %package tabs Summary: Tabbed chat dialog @@ -691,6 +851,21 @@ 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 @@ -740,6 +915,14 @@ słuchanej piosenki w xmms w opisie. %unpack_module_source 123 panelkadu %unpack_module_source 124 osdhints_notify %unpack_module_source 125 water_notify +%unpack_module_source 126 anonymous_check +%unpack_module_source 127 antistring +%unpack_module_source 128 auto_hide +%unpack_module_source 129 cenzor +%unpack_module_source 130 parser_extender +%unpack_module_source 131 powerkadu +%unpack_module_source 132 split_messages +%unpack_module_source 133 word_fix %setup -q -D -T -n kadu %if %{with alsa_sound} @@ -878,6 +1061,18 @@ rm -rf $RPM_BUILD_ROOT %module_files alsa_sound -ct %endif +%if %{with anonymous_check} +%files anonymous_check +%defattr(-, root, root, -) +%module_files anonymous_check -ct +%endif + +%if %{with antistring} +%files antistring +%defattr(-, root, root, -) +%module_files antistring -cdt +%endif + %if %{with ao_sound} %files ao_sound %defattr(-, root, root, -) @@ -897,6 +1092,18 @@ rm -rf $RPM_BUILD_ROOT %module_files audacious_mediaplayer %endif +%if %{with auto_hide} +%files auto_hide +%defattr(-, root, root, -) +%module_files auto_hide -ct +%endif + +%if %{with cenzor} +%files cenzor +%defattr(-, root, root, -) +%module_files cenzor -cdt +%endif + %if %{with dcopexport} %files dcopexport %defattr(-, root, root, -) @@ -983,6 +1190,11 @@ rm -rf $RPM_BUILD_ROOT %module_files panelkadu -ct %endif +%if %{with parser_extender} +%files parser_extender +%defattr(-, root, root, -) +%module_files parser_extender -ct +%endif %if %{with pcspeaker} %files pcspeaker @@ -990,6 +1202,12 @@ rm -rf $RPM_BUILD_ROOT %module_files pcspeaker -ct %endif +%if %{with powerkadu} +%files powerkadu +%defattr(-, root, root, -) +%module_files powerkadu -dt +%endif + %if %{with profiles} %files profiles %defattr(-, root, root, -) @@ -1008,6 +1226,12 @@ rm -rf $RPM_BUILD_ROOT %module_files spellchecker -cdt %endif +%if %{with split_messages} +%files split_messages +%defattr(-, root, root, -) +%module_files split_messages -ct +%endif + %if %{with tabs} %files tabs %defattr(-, root, root, -) @@ -1027,6 +1251,12 @@ rm -rf $RPM_BUILD_ROOT %module_files weather -cdt %endif +%if %{with word_fix} +%files word_fix +%defattr(-, root, root, -) +%module_files word_fix -cdt +%endif + %if %{with xmms_mediaplayer} %files xmms_mediaplayer %defattr(-, root, root, -) @@ -1035,6 +1265,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 12 2008 Michał Bentkowski - 0.6.0-2 +- Fix bugs 436574 (f8) and 436575 (f7) +- New versions of tabs and osdhints_notify +- New modules: anonymous_check antistring auto_hide cenzor parser_extender +powerkadu split_messages word_fix + + * Thu Feb 28 2008 Michał Bentkowski - 0.6.0-1 - Stable - New versions of osdhints_notify, audacious_mediaplayer, filtering, @@ -1192,3 +1429,4 @@ all * Thu Jul 20 2006 Michał Bentkowski - 0.5.0-0.1.20060716svn - Another first release + diff --git a/sources b/sources index 25f23d4..fb72aa3 100644 --- a/sources +++ b/sources @@ -1,5 +1,6 @@ 4401e0e3c509af347cb14a89236301ea agent-0.4.4.tar.gz 51d304e335e814f3d8c0f1654007a7d7 amarok_mediaplayer-20071220.tar.bz2 +84abb6515abc9a5aaa5d1f6b1f2b12e0 anonymous_check-0.2.tar.bz2 95809d330e48e61f58ec961ddbf0b529 ao_sound-20060424.tar.bz2 aa427d5b87fcc48cdd799cf19fe92da1 audacious_mediaplayer-20080224.tar.bz2 b36fcfcf4756285f30cbb6c2b6c2a2da dcopexport-0.11.3-20071129-0.6.0.tar.bz2 @@ -7,11 +8,18 @@ b36fcfcf4756285f30cbb6c2b6c2a2da dcopexport-0.11.3-20071129-0.6.0.tar.bz2 8d11979fa8a3795f7ab20fbb1fb8bdbb filedesc-20080104.tar.bz2 a672d4ef9ce113196e4689b9141b4aef filtering-20080224.tar.bz2 8f1ee07558c82573d2c6e7ccd05f224f kadu-0.6.0.tar.bz2 +4e09f977471ec504ad4acdb52fdb76ec kadu-antistring-0.2.tar.bz2 +42dd07b9745aabd1c52bf088ae3b79e9 kadu-auto_hide-0.2.1.tar.bz2 +ff759d913d2cc3f160502fbf23993c87 kadu-cenzor-0.2.tar.bz2 9b0f04b4254b4ff08254b15e59a81be7 kadu-firewall-0.7.5.tar.bz2 -f515d2dd54d4a5948f691b05d13be70d kadu-osdhints_notify-0.4.0.9.tar.bz2 +fa2a9019a1a4a10cbbb469907e6e5a57 kadu-osdhints_notify-0.4.0.11.tar.bz2 +06378537ce5dace67ce623bcb05b0ea1 kadu-parser_extender-0.1.1.tar.bz2 4b8abfe0c57efabb49ba8c6c71a316f2 kadu-pcspeaker-0.6.0.3.tar.bz2 +2a0360e80e72cb4dbd1c65eb7bdca2c0 kadu-powerkadu-2.0.1.tar.bz2 d7ec7f808d15308d10ed76d1e3743f37 kadu-profiles-0.3.1.tar.bz2 -57e4c970f496ba81495d59d7b96bcdf1 kadu-tabs-1.1.4.tar.bz2 +450cbb8047aa15f4d040da361b660c5d kadu-split_messages-0.2.tar.bz2 +8313ae2aa85b4a6f890203ed5f93fa1b kadu-tabs-1.1.5.tar.bz2 +691484a500c75079508b240449cb9c90 kadu-word_fix-0.3.tar.bz2 786a0ee40a3aef03b51e2d89a2bceda5 led_notify-0.18.tar.bz2 898561b215ac10a99be62fa4e3a50a55 mail-0.3.3.tar.bz2 8a27d4873e6896d63f7c8193029b24ca mediaplayer-20080224.tar.bz2