packages: kadu/kadu.spec - obsoleted modules: voice, weather

[lisu]

Author: lisu                         Date: Wed Sep 14 08:27:20 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- obsoleted modules: voice, weather

---- Files affected:
packages/kadu:
   kadu.spec (1.342 -> 1.343) 

---- Diffs:

================================================================
Index: packages/kadu/kadu.spec
diff -u packages/kadu/kadu.spec:1.342 packages/kadu/kadu.spec:1.343
--- packages/kadu/kadu.spec:1.342	Wed Sep 14 10:20:09 2011
+++ packages/kadu/kadu.spec	Wed Sep 14 10:27:14 2011
@@ -3,7 +3,6 @@
 # TODO:
 # - modules update/remove: desc_history, geoip, mail, mediaplayer_amarok2, notify_kde, notify_mx610,
 #   notify_water, pajacyk, plus_pl_sms
-# - make voice module link with system libgsm
 #
 # Conditional build:
 %bcond_without	anonymous_check		# without anonymous_check module support
@@ -53,8 +52,6 @@
 %bcond_without	sound_qt4		# without qt4 sound module support
 %bcond_without	spellchecker		# without spellchecker (enchant support) invisible
 %bcond_without	tabs			# without tabs support module
-%bcond_with	voice			# without voice support module
-%bcond_with	weather			# without weather check module support
 %bcond_without	word_fix		# without word_fix module support
 
 %define		libgadu_ver		4:1.11.0
@@ -163,7 +160,6 @@
 %{?with_spellchecker:BuildRequires:	enchant-devel}
 %{?with_sound_ao:BuildRequires:	libao-devel}
 BuildRequires:	libgadu-devel >= %{libgadu_ver}
-%{?with_voice:BuildRequires:	libgsm-devel}
 BuildRequires:	libsndfile-devel >= 1.0
 BuildRequires:	libstdc++-devel
 %{?with_encryption:BuildRequires:	openssl-devel >= 0.9.7d}
@@ -205,6 +201,8 @@
 Obsoletes:	kadu-module-sound-esd <= 0.6.5
 %{!?with_speech:Obsoletes:	kadu-module-speech <= 0.4.3}
 Obsoletes:	kadu-module-tcl_scripting <= 0.4.3
+Obsoletes:	kadu-module-voice
+Obsoletes:	kadu-module-weather
 Obsoletes:	kadu-theme-icons-crystal16
 Obsoletes:	kadu-theme-icons-crystal22
 Obsoletes:	kadu-theme-icons-nuvola16
@@ -832,30 +830,6 @@
 %description module-tabs -l pl.UTF-8
 Moduł okna rozmowy z kartami.
 
-%package module-voice
-Summary:	Voice chat support module
-Summary(pl.UTF-8):	Moduł obsługi rozmów głosowych
-Group:		Applications/Communications
-Requires:	%{name} = %{version}-%{release}
-
-%description module-voice
-Voice chat support module.
-
-%description module-voice -l pl.UTF-8
-Moduł obsługi rozmów głosowych.
-
-%package module-weather
-Summary:	Weather module
-Summary(pl.UTF-8):	Moduł pogodowy
-Group:		Applications/Communications
-Requires:	%{name} = %{version}-%{release}
-
-%description module-weather
-Informations of weather in locality of contact.
-
-%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
@@ -1135,16 +1109,6 @@
 %{!?with_spellchecker:%{__sed} -i 's/\tspellchecker$/\t#spellchecker/' Plugins.cmake}
 %{?with_messagessplitter:%{__sed} -i '/^set (COMPILE_PLUGINS$/a\\tmessagessplitter' Plugins.cmake}
 %{!?with_tabs:%{__sed} -i 's/\ttabs$/\t#tabs/' Plugins.cmake}
-%if %{with voice}
-%{__sed} -i 's/module_voice=n/module_voice=m/' .config
-%else
-%{__sed} -i 's/module_voice=m/module_voice=n/' .config
-%endif
-%if %{with weather}
-%{__sed} -i 's/module_weather=n/module_weather=m/' .config
-%else
-%{__sed} -i 's/module_weather=m/module_weather=n/' .config
-%endif
 %{!?with_word_fix:%{__sed} -i 's/\tword_fix$/\t#word_fix/' Plugins.cmake}
 
 %{__sed} -i 's/icons_glass16=n/icons_glass16=y/' .config
@@ -1878,33 +1842,6 @@
 %lang(pl) %{modules_data_dir}/translations/tabs_pl.qm
 %endif
 
-%if 0
-%if %{with voice}
-%files module-voice
-%defattr(644,root,root,755)
-%{modules_data_dir}/voice.desc
-%{modules_data_dir}/configuration/voice.ui
-%attr(755,root,root) %{modules_lib_dir}/libvoice.so
-%lang(de) %{modules_data_dir}/translations/voice_de.qm
-%lang(fr) %{modules_data_dir}/translations/voice_fr.qm
-%lang(it) %{modules_data_dir}/translations/voice_it.qm
-%lang(pl) %{modules_data_dir}/translations/voice_pl.qm
-%endif
-
-%if %{with weather}
-%files module-weather
-%defattr(644,root,root,755)
-%{modules_data_dir}/weather.desc
-%{modules_data_dir}/configuration/weather.ui
-%attr(755,root,root) %{modules_lib_dir}/libweather.so
-%lang(pl) %{modules_data_dir}/translations/weather_pl.qm
-%dir %{modules_data_dir}/data/weather
-%{modules_data_dir}/data/weather/*.ini
-%dir %{modules_data_dir}/data/weather/icons
-%{modules_data_dir}/data/weather/icons/*.gif
-%endif
-%endif
-
 %if %{with word_fix}
 %files module-word_fix
 %defattr(644,root,root,755)
@@ -1961,6 +1898,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.343  2011/09/14 08:27:14  lisu
+- obsoleted modules: voice, weather
+
 Revision 1.342  2011/09/14 08:20:09  lisu
 - files for messagessplitter module
 - removed files for old split_messages module
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kadu/kadu.spec?r1=1.342&r2=1.343&f=u