rpms/empathy/devel .cvsignore, 1.7, 1.8 empathy-README.ConnectionManagers, 1.1, 1.2 empathy.spec, 1.12, 1.13 sources, 1.7, 1.8 empathy-svn380-fix-contact-DnD.patch, 1.1, NONE

Wed Nov 14 03:33:29 UTC 2007

Author: pgordon

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

Modified Files:
	.cvsignore empathy-README.ConnectionManagers empathy.spec 
	sources 
Removed Files:
	empathy-svn380-fix-contact-DnD.patch 
Log Message:
Update to 0.21.2; drop backported patch (no longer needed, since it was fixed upstream); and update README.ConnectionManagers (+Haze, -Galago)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8

--- .cvsignore	2 Oct 2007 22:29:36 -0000	1.7
+++ .cvsignore	14 Nov 2007 03:32:15 -0000	1.8
@@ -1,3 +1 @@
-empathy-0.12.tar.bz2
-empathy-0.13.tar.bz2
-empathy-0.14.tar.bz2
+empathy-0.21.2.tar.bz2


Index: empathy-README.ConnectionManagers
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-README.ConnectionManagers,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- empathy-README.ConnectionManagers	16 Oct 2007 22:58:59 -0000	1.1
+++ empathy-README.ConnectionManagers	14 Nov 2007 03:32:15 -0000	1.2
@@ -5,12 +5,13 @@
 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:
+protocols available for Empathy. They are as follows, listed by their package
+name:
 
 * telepathy-butterfly: MSN
-* telepathy-feed: Galago
 * telepathy-idle: IRC
 * telepathy-stream-engine: Multimedia streaming
+* telepathy-haze-mission-control: AIM and MSN, via Haze
 
 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


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- empathy.spec	19 Oct 2007 18:35:57 -0000	1.12
+++ empathy.spec	14 Nov 2007 03:32:15 -0000	1.13
@@ -5,12 +5,12 @@
 ## respectively.
 %global	gtk2_min_version	2.12
 %global	glib2_min_version	2.14
-%global	tp_mc_min_version	4.33
+%global	tp_mc_min_version	4.37
 %global	libtp_min_version	0.0.57		
 
 Name:		empathy
-Version:	0.14
-Release:	5%{?dist}
+Version:	0.21.2
+Release:	1%{?dist}
 Summary:	GNOME Instant Messaging Client
 
 Group:		Applications/Communications
@@ -18,7 +18,6 @@
 URL:		http://live.gnome.org/Empathy
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
-Patch0: 	%{name}-svn380-fix-contact-DnD.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	aspell-devel
@@ -101,7 +100,6 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .fix-contact-DnD
 
 
 %build
@@ -116,10 +114,10 @@
 %find_lang %{name}
 ## Remove --no-connect from the .desktop file; without this empathy won't
 ## launch from the menu.
-sed -i 's/--no-connect//' %{buildroot}%{_datadir}/gnome/autostart/%{name}.desktop
+sed -i 's/--no-connect//' %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}.desktop
 desktop-file-install --vendor fedora --delete-original	\
 	--dir %{buildroot}%{_datadir}/applications	\
-	%{buildroot}%{_datadir}/gnome/autostart/%{name}.desktop
+	%{buildroot}%{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 
 %clean
@@ -169,8 +167,6 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.ConnectionManagers NEWS
-%exclude %{_libdir}/*.la
-%exclude %{_libdir}/*.a
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 %{_sysconfdir}/gconf/schemas/GNOME_Megaphone_Applet.schemas
 %{_bindir}/empathy
@@ -179,17 +175,30 @@
 %{_datadir}/empathy/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}*
-%{_datadir}/mission-control/profiles/*
+## AIM support is through Haze, and it (the telepathy-haze-mission-control
+## package) provides its own profile 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
+%{_datadir}/mission-control/profiles/gtalk.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}/telepathy/managers/empathy-chat.chandler
 %{_datadir}/telepathy/managers/empathy-call.chandler
 %{_libexecdir}/megaphone-applet
+%{_libexecdir}/empathy-call-chandler
+%{_libexecdir}/empathy-chat-chandler
 %{_libdir}/bonobo/servers/GNOME_Megaphone_Applet.server
-%{_bindir}/empathy-call-chandler
 %{_datadir}/dbus-1/services/org.gnome.Empathy.Call.service
 
 %files	libs
 %defattr(-,root,root,-)
 %doc COPYING
+%exclude %{_libdir}/*.la
+%exclude %{_libdir}/*.a
 %{_libdir}/libempathy*.so.*
 
 %files	devel
@@ -209,6 +218,14 @@
 
 
 %changelog
+* Tue Nov 13 2007 Peter Gordon <peter at thecodergeek.com> - 0.21.2-1
+- Update to new upstream release (0.21.2)
+- Drop backported drag-and-drop patch (fixed upstream):
+    - svn380-fix-contact-DnD.patch
+- Update README.ConnectionManagers: Include Haze package note, remove Galago
+  note (a feed-only connection manager isn't useful for instant messaging),
+  and fix some wording.
+
 * Fri Oct 19 2007 Peter Gordon <peter at thecodergeek.com> - 0.14-5
 - Backport upstream patch to fixes crashes when using drag-and-drop of a
   contact from the buddy list to the current conversation window to initiate a


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Oct 2007 22:29:36 -0000	1.7
+++ sources	14 Nov 2007 03:32:15 -0000	1.8
@@ -1,3 +1 @@
-bd573be24ca435accb9313f41301a656  empathy-0.12.tar.bz2
-7b2470404e3f5466c015b2eac2120ad2  empathy-0.13.tar.bz2
-676154eddfb47f212e4716bebc0fdf26  empathy-0.14.tar.bz2
+c7951d16d843f64a73ea475797308c64  empathy-0.21.2.tar.bz2


--- empathy-svn380-fix-contact-DnD.patch DELETED ---


