rpms/kadu/devel kadu.spec,1.36,1.37

[Michał Bentkowski]

Author: ecik

Update of /cvs/extras/rpms/kadu/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5447

Modified Files:
	kadu.spec 
Log Message:
* Tue Dec 09 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.5-3
- Fix bz #475629



Index: kadu.spec
===================================================================
RCS file: /cvs/extras/rpms/kadu/devel/kadu.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- kadu.spec	9 Dec 2008 18:40:45 -0000	1.36
+++ kadu.spec	9 Dec 2008 22:25:55 -0000	1.37
@@ -128,7 +128,7 @@
 %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_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 @@
 #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 @@
 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 @@
 
 %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}-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 @@
 %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 @@
 
 
 %changelog
+* Tue Dec 09 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.5-3
+- Fix bz #475629
+
 * Tue Dec 09 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.5-2
 - Fix kadu-0.6.5 bug and install sounds to proper directory
 
-
 * Wed Dec 03 2008 Michał Bentkowski <mr.ecik at gmail.com> - 0.6.5-1
 - 0.6.5
 - Lots of changes: