From 24f9036643d6da18d0f5f6b2df14f643201654f4 Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Tue, 18 Aug 2009 05:27:50 +0200
Subject: resolved conflict

---
 abrt.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/abrt.spec b/abrt.spec
index 773a7ef4..a20d0448 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -22,6 +22,7 @@ BuildRequires: xmlrpc-c-devel
 BuildRequires: file-devel
 BuildRequires: python-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: %{name}-libs = %{version}-%{release}
 
 %description
 %{name} is a tool to help users to detect defects in applications and
@@ -48,6 +49,9 @@ Summary: %{name}'s gui
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: dbus-python, pygtk2, pygtk2-libglade
+Provides: abrt-applet = %{version}-%{release}
+Obsoletes: abrt-applet < 0.0.5
+Conflicts: abrt-applet < 0.0.5
 
 %description gui
 GTK+ wizard for convenient bug reporting.
-- 
cgit