rpms/empathy/F-8 empathy-README.ConnectionManagers, NONE, 1.1 empathy.spec, 1.9, 1.10

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/empathy/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27286

Modified Files:
	empathy.spec 
Added Files:
	empathy-README.ConnectionManagers 
Log Message:
Fix bugs 308871 and 334221: Hardcode dependencies on Gabble and Salut for default XMPP support.


--- NEW FILE empathy-README.ConnectionManagers ---
Empathy is a client built on the Telepathy messaging framework. However, 
without a proper backend (connection manager) installed, it is essentially
useless.

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. They are as follows, listed by their package name:

* telepathy-butterfly: MSN
* telepathy-feed: Galago
* telepathy-idle: IRC
* telepathy-stream-engine: Multimedia streaming

If you wish to us any of these protocols with Empathy, you will need to
install the appropriate package for the connection manager and configure
the account through Empathy's "Accounts" dialog.


Index: empathy.spec
===================================================================
RCS file: /cvs/extras/rpms/empathy/F-8/empathy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- empathy.spec	3 Oct 2007 02:56:32 -0000	1.9
+++ empathy.spec	16 Oct 2007 23:33:31 -0000	1.10
@@ -10,13 +10,14 @@
 
 Name:		empathy
 Version:	0.14
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GNOME Instant Messaging Client
 
 Group:		Applications/Communications
 License:	GPLv2+
 URL:		http://live.gnome.org/Empathy
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Source1:	%{name}-README.ConnectionManagers
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	aspell-devel
@@ -37,6 +38,14 @@
 
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	telepathy-filesystem
+## Empathy is useless without a proper Telepathy connection manager installed.
+## We hardcode dependencies on Salut and Gabble to support XMPP on a default
+## install, in both the link-local and Jabber/GoogleTalk incarnations. 
+## (RHBZ: 308871 and 334221)
+## TODO: Perhaps we can configure these to be installed "on demand" with
+##       PackageKit and friends?
+Requires:	telepathy-gabble
+Requires:	telepathy-salut
 	
 Requires(pre):	GConf2
 
@@ -96,6 +105,7 @@
 %build
 %configure --disable-voip
 make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+install -m 0644 %{SOURCE1} ./README.ConnectionManagers
 
 
 %install
@@ -156,7 +166,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README NEWS
+%doc AUTHORS COPYING README README.ConnectionManagers NEWS
 %exclude %{_libdir}/*.la
 %exclude %{_libdir}/*.a
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
@@ -197,6 +207,14 @@
 
 
 %changelog
+* Tue Oct 16 2007 Peter Gordon <peter at thecodergeek.com> - 0.14-3
+- Depend on Salut and Gabble to enable XMPP by default. Otherwise, Empathy
+  is essentially useless due to the need to install an external connection
+  manager. Also, add a README.ConnectionManagers to the installed
+  documentation which lists other possibilities.
+- Resolves: bug 308871 (Make empathy dependent at least on telepathy-gabble)
+  and bug 334221 (Default empathy install is useless).
+
 * Tue Oct 02 2007 Peter Gordon <peter at thecodergeek.com> - 0.14-2
 - Disable VoIP support at this time, since it is deemed unstable by upstream
   for now. (Thanks to Brian Pepple for the notice.)