rpms/empathy/devel empathy-README.ConnectionManagers, 1.5, 1.6 empathy.spec, 1.32, 1.33

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32705

Modified Files:
	empathy-README.ConnectionManagers empathy.spec 
Log Message:
Add Haze dependency. (#458935)


Index: empathy-README.ConnectionManagers
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-README.ConnectionManagers,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- empathy-README.ConnectionManagers	14 Aug 2008 03:43:52 -0000	1.5
+++ empathy-README.ConnectionManagers	24 Aug 2008 22:17:05 -0000	1.6
@@ -4,12 +4,15 @@
 
 XMPP, as a standardized and unencumbered protocol, is supported by default
 through the Gabble (Jabber and GoogleTalk) and Salut (link-local) connection
-managers. However, more are available in Fedora which implement other
-protocols available for Empathy. They are as follows, listed by their package
-name:
+managers. 
+
+Support for AIM/ICQ, MSN, Gadu-Gadu, Groupwise, QQ, and Yahoo! are all provided
+by Haze (installed by default with Empathy).
+
+However, more are available in Fedora which implement other protocols available
+for Empathy. They are as follows, listed by their package name:
 
 * telepathy-butterfly: MSN
-* telepathy-haze: AIM/ICQ, MSN, Yahoo! IM, and others via libpurple.                 
 * telepathy-idle: IRC
 
 If you wish to us any of these protocols with Empathy, you will need to


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- empathy.spec	22 Aug 2008 22:58:42 -0000	1.32
+++ empathy.spec	24 Aug 2008 22:17:05 -0000	1.33
@@ -10,7 +10,7 @@
 
 Name:		empathy
 Version:	2.23.90
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	GNOME Instant Messaging Client
 
 Group:		Applications/Communications
@@ -54,6 +54,10 @@
 ##       PackageKit and friends?
 Requires:	telepathy-gabble
 Requires:	telepathy-salut
+## Also hardcode Haze dependency since Empathy is the default IM client in F10+
+## and I'd hate for people to simply disregard it for lack of the "out of the
+## box" protocol support that Pidgin has. (RHBZ: 458935)
+Requires:	telepathy-haze
 # Require this for VOIP support 
 Requires:	telepathy-stream-engine
 
@@ -220,6 +224,12 @@
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Sun Aug 24 2008 Peter Gordon <peter at thecodergeek.com> - 2.23.90-2
+- Now that Empathy will be the default IM client in F10+, hardcode a dependency
+  on telepathy-haze to keep the same protocol functionality across upgrades,
+  for a much improved "out of the box" experience.
+- Reference: bug 458935.
+
 * Fri Aug 22 2008 Peter Gordon <peter at thecodergeek.com> - 2.23.90-1
 - Update to new upstream release (2.23.90)