packages: kadu/kadu.spec - removed modules: parser_extender, profiles, soun...
lisu
lisu at pld-linux.org
Wed Sep 14 09:36:43 CEST 2011
Author: lisu Date: Wed Sep 14 07:36:43 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- removed modules: parser_extender, profiles, sound-alsa, sound-ao, sound-dsp
- updated modules: panelkadu, senthistory
---- Files affected:
packages/kadu:
kadu.spec (1.338 -> 1.339)
---- Diffs:
================================================================
Index: packages/kadu/kadu.spec
diff -u packages/kadu/kadu.spec:1.338 packages/kadu/kadu.spec:1.339
--- packages/kadu/kadu.spec:1.338 Tue Sep 13 22:41:35 2011
+++ packages/kadu/kadu.spec Wed Sep 14 09:36:37 2011
@@ -2,7 +2,7 @@
#
# TODO:
# - modules update/remove: desc_history, geoip, mail, mediaplayer_amarok2, notify_kde, notify_mx610,
-# notify_water, pajacyk
+# notify_water, pajacyk, plus_pl_sms
# - make voice module link with system libgsm
#
# Conditional build:
@@ -41,17 +41,12 @@
%bcond_without notify_speech # without Speech synthesis support
%bcond_with notify_water # without water_notify module support
%bcond_with pajacyk # without pajacyk module support
-%bcond_with panelkadu # without panelkadu module support
-%bcond_with parser_extender # without parser_extender extensions
+%bcond_without panelkadu # without panelkadu module support
%bcond_with powerkadu # without PowerKadu extensions
-%bcond_with profiles # without profiles module support
%bcond_without screenshot # without screenshot module support
-%bcond_with senthistory # without senthistory module support
+%bcond_without senthistory # without senthistory module support
%bcond_without single_window # without single_window module support
%bcond_with sms_plus_pl # without plus_pl_sms module support
-%bcond_with sound_alsa # without ALSA support
-%bcond_with sound_ao # without ao support
-%bcond_with sound_dsp # without DSP support
%bcond_without sound_ext # without external application sound module support
%bcond_without sound_phonon # without phonon sound module support
%bcond_without sound_qt4 # without qt4 sound module support
@@ -78,8 +73,8 @@
%define notify_mx610_ver 0.4.1
%define notify_water_ver 0.2.1
%define pajacyk_ver 0.2.1
-%define panelkadu_ver 0.9.0-7
-%define senthistory_ver 0.9.0-7
+%define panelkadu_ver 0.10-8
+%define senthistory_ver 0.10-9
%define sms_plus_pl_ver 0.6.5.4-1
Summary: A Gadu-Gadu client for online messaging
@@ -111,9 +106,9 @@
Source10: http://www.kadu.net/~dorr/moduly/%{name}-water_notify-%{notify_water_ver}.tar.bz2
# Source10-md5: 4196e85fc4be93bd662f5148ebc18235
Source11: http://www.ultr.pl/kadu/panelkadu-%{panelkadu_ver}.tar.gz
-# Source11-md5: 19d9670d7def5e738a578a64a3bf15d2
+# Source11-md5: 26772365e6aa794bc6e8155a60c9d01d
Source12: http://www.ultr.pl/kadu/senthistory-%{senthistory_ver}.tar.gz
-# Source12-md5: fc6b8b1912adad6c5a21c47fb0c44265
+# Source12-md5: 0ec2a68a636f2428be1f20967fa23baf
Source13: http://kadu.net/~patryk/plus_pl_sms/plus_pl_sms-plus_pl_sms-%{sms_plus_pl_ver}.tar.bz2
# Source13-md5: 59f7ba01a63464818acaa5ff6fd176d5
Source14: http://kadu.net/~neeo/kadu/geoip/geoip_lookup-%{geoip_ver}.tar.bz2
@@ -159,7 +154,6 @@
BuildRequires: QtSvg-devel >= %{qt_ver}
BuildRequires: QtWebKit-devel >= %{qt_ver}
BuildRequires: QtXmlPatterns-devel >= %{qt_ver}
-%{?with_sound_alsa:BuildRequires: alsa-lib-devel}
BuildRequires: cmake >= 2.8.0
%{?with_sms_plus_pl:BuildRequires: curl-devel}
%{?with_notify_water:BuildRequires: dbus-devel}
@@ -197,8 +191,14 @@
Obsoletes: kadu-module-mediaplayer-xmms2
%{!?with_mediaplayer:Obsoletes: kadu-module-mediaplayer}
Obsoletes: kadu-module-notify-osdhints
+Obsoletes: kadu-module-notify-window
Obsoletes: kadu-module-notify-xosd <= 0.6.5
+Obsoletes: kadu-module-parser_extender
+Obsoletes: kadu-module-profiles
+Obsoletes: kadu-module-sound-alsa
+Obsoletes: kadu-module-sound-ao
Obsoletes: kadu-module-sound-arts <= 0.6.5
+Obsoletes: kadu-module-sound-dsp
Obsoletes: kadu-module-sound-esd <= 0.6.5
%{!?with_speech:Obsoletes: kadu-module-speech <= 0.4.3}
%{!?with_split_messages:Obsoletes: kadu-module-split_messages}
@@ -679,18 +679,6 @@
%description module-panelkadu -l pl.UTF-8
Moduł sprawiający, że Kadu wygląda i zachowuje się jak panel.
-%package module-parser_extender
-Summary: Module to extend Kadu Parser
-Summary(pl.UTF-8): Moduł rozszerzający możliwości Parsera Kadu
-Group: Applications/Communications
-Requires: %{name} = %{version}-%{release}
-
-%description module-parser_extender
-Module to extend Kadu Parser.
-
-%description module-parser_extender -l pl.UTF-8
-Moduł rozszerzający możliwości Parsera Kadu.
-
%package module-powerkadu
Summary: PowerKadu extensions
Summary(pl.UTF-8): Rozszerzenia PowerKadu
@@ -701,7 +689,6 @@
Requires: %{name}-module-auto_hide = %{version}-%{release}
Requires: %{name}-module-autostatus = %{version}-%{release}
Requires: %{name}-module-cenzor = %{version}-%{release}
-Requires: %{name}-module-parser_extender = %{version}-%{release}
%if %{with split_messages}
Requires: %{name}-module-split_messages = %{version}-%{release}
%endif
@@ -716,18 +703,6 @@
przydatne funkcje, takie jak: autostatus, antyłańcuszek, cenzor,
korekta słów...
-%package module-profiles
-Summary: Kadu Profiles
-Summary(pl.UTF-8): Profile w Kadu
-Group: Applications/Communications
-Requires: %{name} = %{version}-%{release}
-
-%description module-profiles
-Kadu Profiles.
-
-%description module-profiles -l pl.UTF-8
-Profile w Kadu.
-
%package module-senthistory
Summary: Kadu module which adds history of sent messages to chat windows
Summary(pl.UTF-8): Moduł kadu który dodaje historię wysłanych wiadomości do okien rozmowy
@@ -767,43 +742,6 @@
%description module-sms-plus_pl -l pl.UTF-8
Moduł obsługi bramki SMS Plus.pl.
-%package module-sound-alsa
-Summary: ALSA sound support module
-Summary(pl.UTF-8): Moduł obsługi dźwięku przez ALSA
-Group: Applications/Communications
-Requires: %{name} = %{version}-%{release}
-Requires: alsa-lib
-
-%description module-sound-alsa
-ALSA sound support module.
-
-%description module-sound-alsa -l pl.UTF-8
-Moduł obsługi dźwięku przez ALSA.
-
-%package module-sound-ao
-Summary: Libao sound module
-Summary(pl.UTF-8): Moduł obsługi dźwięku poprzez bibliotekę libao
-Group: Applications/Communications
-Requires: %{name} = %{version}-%{release}
-
-%description module-sound-ao
-Libao sound module.
-
-%description module-sound-ao -l pl.UTF-8
-Moduł obsługi dźwięku poprzez bibliotekę libao.
-
-%package module-sound-dsp
-Summary: DSP sound module
-Summary(pl.UTF-8): Moduł obsługi dźwięku przez DSP
-Group: Applications/Communications
-Requires: %{name} = %{version}-%{release}
-
-%description module-sound-dsp
-DSP sound module.
-
-%description module-sound-dsp -l pl.UTF-8
-Moduł obsługi dźwięku przez DSP.
-
%package module-sound-ext
Summary: External application sound module
Summary(pl.UTF-8): Moduł obsługi dźwięku przez zewnętrzną aplikację
@@ -1172,53 +1110,20 @@
%else
%{__sed} -i 's/module_pajacyk=m/module_pajacyk=n/' .config
%endif
-%if %{with panelkadu}
-%{__sed} -i 's/module_panelkadu=n/module_panelkadu=m/' .config
-%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
+%{?with_panelkadu:%{__sed} -i '/^set (COMPILE_PLUGINS$/a\\tpanelkadu' Plugins.cmake}
%if %{with powerkadu}
%{__sed} -i 's/module_powerkadu=n/module_powerkadu=m/' .config
%else
%{__sed} -i 's/module_powerkadu=m/module_powerkadu=n/' .config
%endif
-%if %{with profiles}
-%{__sed} -i 's/module_profiles=n/module_profiles=m/' .config
-%else
-%{__sed} -i 's/module_profiles=m/module_profiles=n/' .config
-%endif
%{!?with_screenshot:%{__sed} -i 's/\tscreenshot$/\t#screenshot/' Plugins.cmake}
-%if %{with senthistory}
-%{__sed} -i 's/module_senthistory=n/module_senthistory=m/' .config
-%else
-%{__sed} -i 's/module_senthistory=m/module_senthistory=n/' .config
-%endif
+%{?with_senthistory:%{__sed} -i '/^set (COMPILE_PLUGINS$/a\\tsenthistory' Plugins.cmake}
%{!?with_single_window:%{__sed} -i 's/\tsingle_window$/\t#single_window/' Plugins.cmake}
%if %{with sms_plus_pl}
%{__sed} -i 's/module_plus_pl_sms=n/module_plus_pl_sms=m/' .config
%else
%{__sed} -i 's/module_plus_pl_sms=m/module_plus_pl_sms=n/' .config
%endif
-%if %{with sound_alsa}
-%{__sed} -i 's/module_alsa_sound=n/module_alsa_sound=m/' .config
-%else
-%{__sed} -i 's/module_alsa_sound=m/module_alsa_sound=n/' .config
-%endif
-%if %{with sound_ao}
-%{__sed} -i 's/module_ao_sound=n/module_ao_sound=m/' .config
-%else
-%{__sed} -i 's/module_ao_sound=m/module_ao_sound=n/' .config
-%endif
-%if %{with sound_dsp}
-%{__sed} -i 's/module_dsp_sound=n/module_dsp_sound=m/' .config
-%else
-%{__sed} -i 's/module_dsp_sound=m/module_dsp_sound=n/' .config
-%endif
%{!?with_sound_ext:%{__sed} -i 's/\text_sound$/\t#ext_sound/' Plugins.cmake}
%{!?with_sound_phonon:%{__sed} -i 's/\tphonon_sound$/\t#phonon_sound/' Plugins.cmake}
%{!?with_sound_qt4:%{__sed} -i 's/\tqt4_sound$/\t#qt4_sound/' Plugins.cmake}
@@ -1840,15 +1745,6 @@
%lang(pl) %{modules_data_dir}/translations/panelkadu_pl.qm
%endif
-%if %{with parser_extender}
-%files module-parser_extender
-%defattr(644,root,root,755)
-%{modules_data_dir}/parser_extender.desc
-%{modules_data_dir}/configuration/parser_extender.ui
-%attr(755,root,root) %{modules_lib_dir}/libparser_extender.so
-%lang(pl) %{modules_data_dir}/translations/parser_extender_pl.qm
-%endif
-
%if %{with powerkadu}
%files module-powerkadu
%defattr(644,root,root,755)
@@ -1863,15 +1759,6 @@
%lang(en) %{modules_data_dir}/data/powerkadu/AUTHORS
%lang(pl) %{modules_data_dir}/data/powerkadu/AUTHORS.pl
%endif
-
-%if %{with profiles}
-%files module-profiles
-%defattr(644,root,root,755)
-%{modules_data_dir}/profiles.desc
-%attr(755,root,root) %{modules_lib_dir}/libprofiles.so
-#%lang(it) %{modules_data_dir}/translations/profiles_it.qm
-%lang(pl) %{modules_data_dir}/translations/profiles_pl.qm
-%endif
%endif
%if %{with single_window}
@@ -1919,37 +1806,6 @@
%dir %{modules_data_dir}/data/plus_pl_sms
%{modules_data_dir}/data/plus_pl_sms/curl-ca-bundle.crt
%endif
-
-%if %{with sound_alsa}
-%files module-sound-alsa
-%defattr(644,root,root,755)
-%{modules_data_dir}/alsa_sound.desc
-%{modules_data_dir}/configuration/alsa_sound.ui
-%attr(755,root,root) %{modules_lib_dir}/libalsa_sound.so
-%lang(de) %{modules_data_dir}/translations/alsa_sound_de.qm
-%lang(fr) %{modules_data_dir}/translations/alsa_sound_fr.qm
-%lang(it) %{modules_data_dir}/translations/alsa_sound_it.qm
-%lang(pl) %{modules_data_dir}/translations/alsa_sound_pl.qm
-%endif
-
-%if %{with sound_ao}
-%files module-sound-ao
-%defattr(644,root,root,755)
-%{modules_data_dir}/ao_sound.desc
-%attr(755,root,root) %{modules_lib_dir}/libao_sound.so
-%endif
-
-%if %{with sound_dsp}
-%files module-sound-dsp
-%defattr(644,root,root,755)
-%{modules_data_dir}/dsp_sound.desc
-%{modules_data_dir}/configuration/dsp_sound.ui
-%attr(755,root,root) %{modules_lib_dir}/libdsp_sound.so
-%lang(de) %{modules_data_dir}/translations/dsp_sound_de.qm
-%lang(fr) %{modules_data_dir}/translations/dsp_sound_fr.qm
-%lang(it) %{modules_data_dir}/translations/dsp_sound_it.qm
-%lang(pl) %{modules_data_dir}/translations/dsp_sound_pl.qm
-%endif
%endif
%if %{with sound_ext}
@@ -2100,6 +1956,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.339 2011/09/14 07:36:37 lisu
+- removed modules: parser_extender, profiles, sound-alsa, sound-ao, sound-dsp
+- updated modules: panelkadu, senthistory
+
Revision 1.338 2011/09/13 20:41:35 lisu
- residues of notify_window plugin removed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kadu/kadu.spec?r1=1.338&r2=1.339&f=u
More information about the pld-cvs-commit
mailing list