rpms/pidgin/F-13 pidgin.spec,1.116,1.117

[Stu Tomlinson]

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31396/F-13

Modified Files:
	pidgin.spec 
Log Message:
- Add Obsoletes to pull in pidgin-evolution during updates



Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/F-13/pidgin.spec,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -p -r1.116 -r1.117
--- pidgin.spec	30 May 2010 16:40:19 -0000	1.116
+++ pidgin.spec	30 May 2010 17:12:31 -0000	1.117
@@ -97,7 +97,7 @@
 
 Name:		pidgin
 Version:	2.7.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -109,6 +109,10 @@ Obsoletes:      gaim < 999:1
 Provides:       gaim = 999:1
 ExcludeArch:    s390 s390x
 
+%if %{split_evolution}
+Obsoletes: pidgin <= 2.7.1-1%{?dist}
+%endif
+
 ## Fedora pidgin defaults
 # Only needs regenerating if Pidgin breaks backwards compatibility with prefs.xml
 # 1) uninstall any non-default pidgin or libpurple plugins
@@ -259,6 +263,7 @@ Microsoft Corporation, Yahoo! Inc., or I
 Summary: Pidgin Evolution integration plugin
 Group: Applications/Internet
 Requires: %{name} = %{version}-%{release}
+Obsoletes: pidgin <= 2.7.1-1%{?dist}
 
 %description evolution
 This package contains the Evolution integration plugin for Pidgin.
@@ -668,6 +673,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun May 30 2010 Stu Tomlinson <stu at nosnilmot.com> 2.7.1-2
+- Add Obsoletes to pull in pidgin-evolution during update
+
 * Sun May 30 2010 Stu Tomlinson <stu at nosnilmot.com> 2.7.1-1
 - 2.7.1
 - Adds Direct Connection support for MSN