From 1c288b5b0e2c4bc0f759794e3cb0f899c27d43ca Mon Sep 17 00:00:00 2001 From: Michał Bentkowski Date: Dec 09 2008 22:46:43 +0000 Subject: - Fix bz #475629 --- diff --git a/kadu.spec b/kadu.spec index e630941..342b86a 100644 --- a/kadu.spec +++ b/kadu.spec @@ -128,7 +128,7 @@ sed "s#^module_%1=.#module_%1=m#" -i ./.config\ %bcond_with audacious_mediaplayer %bcond_without auto_hide #%bcond_without autostatus -#%bcond_without cenzor +%bcond_without cenzor #%bcond_with dcopexport %bcond_with falf_mediaplayer #%bcond_without filedesc @@ -166,7 +166,7 @@ Name: kadu Name: kadu_opt %endif Version: 0.6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An Gadu-Gadu client for online messaging Summary(pl): Klient Gadu-Gadu Group: Applications/Internet @@ -253,10 +253,16 @@ Obsoletes: %{name}-arts_sound < 0.6.5-0.1.rc2 #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}-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}-antistring < 0.6.5-2 +Provides: %{name}-antistring = %{version}-%{release} Obsoletes: %{name}-exec_notify < 0.6.0-0.1.alpha1 Provides: %{name}-exec_notify = %{version}-%{release} +Obsoletes: %{name}-cenzor < 0.6.5-1 +Provides: %{name}-cenzor = %{version}-%{release} Obsoletes: %{name}-devel < 0.6.5-0.1.rc2 Obsoletes: %{name}-ao_sound < 0.6.5-0.1.rc2 Provides: %{name}-ao_sound = %{version}-%{release} @@ -279,6 +285,10 @@ Obsoletes: %{name}-pcspeaker < 0.6.5-0.1.rc2 Provides: %{name}-pcspeaker = %{version}-%{release} Obsoletes: %{name}-profiles < 0.6.5-0.1.rc2 Provides: %{name}-profiles = %{version}-%{release} +Obsoletes: %{name}-screenshot < 0.6.5-1 +Provides: %{name}-screenshot = %{version}-%{release} +Obsoletes: %{name}-spellchecker < 0.6.5-1 +Provides: %{name}-spellchecker = %{version}-%{release} Obsoletes: %{name}-word_fix < 0.6.5-0.1.rc2 Provides: %{name}-word_fix = %{version}-%{release} @@ -437,20 +447,6 @@ Autostatus to moduł do automatycznych zmian statusu. %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 falf_mediaplayer} %package falf_mediaplayer @@ -714,7 +710,6 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-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: %{name}-split_messages = %{version}-%{release} #Requires: kadu-word_fix = %{version}-%{release} @@ -1106,11 +1101,6 @@ rm -rf $RPM_BUILD_ROOT %module_files audacious_mediaplayer %endif -#%if %{with cenzor} -#%files cenzor -#%defattr(-, root, root, -) -#%module_files cenzor -cdt -#%endif #if %{with dcopexport} #files dcopexport @@ -1220,10 +1210,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 09 2008 Michał Bentkowski - 0.6.5-3 +- Fix bz #475629 + * Tue Dec 09 2008 Michał Bentkowski - 0.6.5-2 - Fix kadu-0.6.5 bug and install sounds to proper directory - * Wed Dec 03 2008 Michał Bentkowski - 0.6.5-1 - 0.6.5 - Lots of changes: