# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1176664512 0
# Node ID c4f779253fab863f4c626e353543696e5aae8694
# Parent  fb6a333f517a9ef2ee75fc736b53c2f5f041d4f4# Parent  14fe3c5a77497f455d82b800f5f4d995515e81b4
merge of '818e92282383bd62cfd83d7cde9d0bad84e648ab'
     and 'c08f41c4401b2b1347920ce1c79d3a47497cddde'

diff -r fb6a333f517a -r c4f779253fab pidgin.spec.in
--- a/pidgin.spec.in	Sun Apr 15 18:52:54 2007 +0000
+++ b/pidgin.spec.in	Sun Apr 15 19:15:12 2007 +0000
@@ -70,11 +70,13 @@
 Requires: perl
 # Gadu-Gadu support was split out temporarily (only as gaim)
 Provides: gaim-gadugadu = %{epoch}:%{version}-%{release}
+Obsoletes: gaim
 
 %package devel
 Summary:    Development headers, documentation, and libraries for Pidgin
 Group:      Applications/Internet
 Requires:   pkgconfig, pidgin = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version}
+Obsoletes:  gaim-devel
 
 %package -n libpurple
 Summary:    libpurple library for IM clients like Pidgin and Finch
@@ -178,9 +180,9 @@
 SILC (Secure Internet Live Conferencing) plugin for Pidgin.
 %endif
 
-%if 0%{!?without_text:1}
+%if 0%{!?_without_text:1}
 %description -n finch
-A text-based user interface for Pidgin.  This can be run from a
+A text-based user interface for using libpurple.  This can be run from a
 standard text console or from a terminal within X Windows.  It
 uses ncurses and our homegrown gnt library for drawing windows
 and text.