rpms/empathy/devel empathy-README.ConnectionManagers, 1.4, 1.5 empathy.spec, 1.28, 1.29

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15693

Modified Files:
	empathy-README.ConnectionManagers empathy.spec 
Log Message:
Switch to using Empathy-provided Haze profiles.


Index: empathy-README.ConnectionManagers
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-README.ConnectionManagers,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- empathy-README.ConnectionManagers	3 Jun 2008 00:10:37 -0000	1.4
+++ empathy-README.ConnectionManagers	14 Aug 2008 03:43:52 -0000	1.5
@@ -9,7 +9,7 @@
 name:
 
 * telepathy-butterfly: MSN
-* telepathy-haze-mission-control: AIM and MSN, via Haze
+* 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- empathy.spec	5 Aug 2008 02:16:53 -0000	1.28
+++ empathy.spec	14 Aug 2008 03:43:52 -0000	1.29
@@ -10,14 +10,17 @@
 
 Name:		empathy
 Version:	2.23.6
-Release:	1%{?dist}
+Release:	2%{?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}/0.23/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
+Source2:	%{name}-upgrade-haze-profiles.sh
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	enchant-devel >= %{enchant_version}
@@ -61,6 +64,10 @@
 
 Requires(postun):	scrollkeeper
 
+## We're using Empathy's upstreamed profiles for Haze-provided stuff now.
+Obsoletes:	telepathy-haze-mission-control < 0.2.0-3
+Provides:	telepathy-haze-mission-control = 0.2.0-3
+
 %description
 Empathy provides a powerful multiple protocol instant messaging
 client using the Telepathy framework.
@@ -106,6 +113,7 @@
 
 %prep
 %setup -q
+install -p -m 0755 %{SOURCE2} ./upgrade-haze-profiles.sh
 
 
 %build
@@ -182,6 +190,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.ConnectionManagers NEWS
+%doc upgrade-haze-profiles.sh
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas
 %{_bindir}/empathy
@@ -191,24 +200,7 @@
 %{_datadir}/gnome/help/%{name}/
 %{_datadir}/omf/%{name}/
 %{_datadir}/icons/hicolor/*/apps/%{name}*
-## Support for these are through Haze, and it (telepathy-haze-mission-control
-## package) provides its own profiles with greater "out of the box"
-## functionality, such as a slightly more sensible configuration UI with
-## proper by-default login server settings from Pidgin.
-%exclude %{_datadir}/mission-control/profiles/aim.profile
-%exclude %{_datadir}/mission-control/profiles/icq.profile
-%exclude %{_datadir}/mission-control/profiles/msn-haze.profile
-%exclude %{_datadir}/mission-control/profiles/yahoo.profile
-%{_datadir}/mission-control/profiles/ekiga.profile
-%{_datadir}/mission-control/profiles/fwd.profile
-%{_datadir}/mission-control/profiles/gtalk.profile
-%{_datadir}/mission-control/profiles/groupwise.profile
-%{_datadir}/mission-control/profiles/irc.profile
-%{_datadir}/mission-control/profiles/jabber.profile
-%{_datadir}/mission-control/profiles/msn.profile
-%{_datadir}/mission-control/profiles/salut.profile
-%{_datadir}/mission-control/profiles/sofiasip.profile
-%{_datadir}/mission-control/profiles/sipphone.profile
+%{_datadir}/mission-control/profiles/*.profile
 %{_libexecdir}/megaphone-applet
 %{_libexecdir}/nothere-applet
 %{_libdir}/bonobo/servers/GNOME_Megaphone_Applet.server
@@ -231,6 +223,12 @@
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Wed Aug 13 2008 Peter Gordon <peter at thecodergeek.com> - 2.23.6-2
+- Use upstream's AIM, ICQ, MSN-Haze, and Yahoo profiles instead of recommending
+  the telepathy-haze-mission-control package. (The Haze-provided ones have grown
+  horribly stale...). This makes for better automagic functionality (if Haze is
+  installed, Empathy/MC will autodetect it) and tracks upstream more closely.
+
 * Mon Aug 04 2008 Peter Gordon <peter at thecodergeek.com> - 2.23.6-1
 - Update to new upstream release (2.23.6)
 - Use the in-tarball libtool scripts instead of the system copy to workaround