# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1176664405 0
# Node ID 14fe3c5a77497f455d82b800f5f4d995515e81b4
# Parent  1f6ea380fb0998cab039d0c1ad14effdab04098c
Fix for building RPMs without finch - fixes part of ticket 123, and add some
Obsoletes for gaim

diff -r 1f6ea380fb09 -r 14fe3c5a7749 pidgin.spec.in
--- a/pidgin.spec.in	Sat Apr 14 17:58:13 2007 +0000
+++ b/pidgin.spec.in	Sun Apr 15 19:13:25 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.