From d25d76f90f80936bcd0bc7c318bbc03760f70990 Mon Sep 17 00:00:00 2001 From: Michał Bentkowski Date: Dec 16 2008 15:51:56 +0000 Subject: - Fix conflicts with kadu-osd_hints and kadu-agent --- diff --git a/kadu.spec b/kadu.spec index b04d2f4..cea55c4 100644 --- a/kadu.spec +++ b/kadu.spec @@ -106,7 +106,7 @@ Name: kadu Name: kadu_opt %endif Version: 0.6.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: An Gadu-Gadu client for online messaging Summary(pl): Klient Gadu-Gadu Group: Applications/Internet @@ -171,7 +171,7 @@ 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}-kadu_agent < 0.6.5-2 +Obsoletes: %{name}-agent < 0.6.5-2 Obsoletes: %{name}-alsa_sound < 0.6.5-2 Provides: %{name}-alsa_sound = %{version}-%{release} Obsoletes: %{name}-advanced_userlist < 0.6.0-0.1.alpha1 @@ -338,7 +338,7 @@ Summary(pl): Powiadamanie o zdarzeniach przy pomocy dymków typu OSD Group: Applications/Internet Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-osdhints_notify < 0.6.5-1 -Provides: %{name}-osd_hints = %{version}-%{release} +Provides: %{name}-osdhints_notify = %{version}-%{release} %description osd_hints Osd_hints is a module to notify users about some events with OSD-like hints. @@ -677,6 +677,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Dec 16 2008 Michał Bentkowski - 0.6.5-5 +- Fix conflicts with kadu-osd_hints and kadu-agent + * Wed Dec 10 2008 Michał Bentkowski - 0.6.5-4 - More cleaning