rpms/empathy/devel .cvsignore, 1.26, 1.27 empathy-fedora-mission-control-convert.patch, 1.2, 1.3 empathy.spec, 1.46, 1.47 sources, 1.26, 1.27

[Brian Pepple]

Author: bpepple

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

Modified Files:
	.cvsignore empathy-fedora-mission-control-convert.patch 
	empathy.spec sources 
Log Message:
* Tue Feb 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.25.90-1
- Update to 2.25.90.
- Bump min version of tp-glib needed.
- Add BR on tp-farsight-devel & libnotify-devel.
- Drop Requires on tp-stream-engine.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	6 Jan 2009 17:44:56 -0000	1.26
+++ .cvsignore	11 Feb 2009 17:15:06 -0000	1.27
@@ -1 +1 @@
-empathy-2.25.4.tar.bz2
+empathy-2.25.90.tar.bz2

empathy-fedora-mission-control-convert.patch:

Index: empathy-fedora-mission-control-convert.patch
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy-fedora-mission-control-convert.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- empathy-fedora-mission-control-convert.patch	20 Dec 2008 23:59:38 -0000	1.2
+++ empathy-fedora-mission-control-convert.patch	11 Feb 2009 17:15:06 -0000	1.3
@@ -1,8 +1,8 @@
-diff -urp empathy-2.25.3.OLD/src/empathy.c empathy-2.25.3/src/empathy.c
---- empathy-2.25.3.OLD/src/empathy.c	2008-12-15 14:41:56.000000000 -0500
-+++ empathy-2.25.3/src/empathy.c	2008-12-20 18:49:26.000000000 -0500
-@@ -371,6 +371,47 @@ get_startup_timestamp ()
- 	return (retval > 0) ? retval : 0;
+diff -urp empathy-2.25.90.OLD/src/empathy.c empathy-2.25.90/src/empathy.c
+--- empathy-2.25.90.OLD/src/empathy.c	2009-02-03 04:01:43.000000000 -0500
++++ empathy-2.25.90/src/empathy.c	2009-02-11 11:58:15.000000000 -0500
+@@ -404,6 +404,47 @@ new_call_handler_cb (EmpathyCallFactory 
+ 		gtk_widget_show (GTK_WIDGET (window));
  }
  
 +/* This change is specific to Fedora and how we set up
@@ -39,7 +39,7 @@
 +			g_rename (fullpath, newpath);
 +			g_free (newpath);
 +		}
-+		g_free (fullpath);
++ 		g_free (fullpath);
 +	}
 +
 +	g_dir_close (accts);
@@ -49,7 +49,7 @@
  int
  main (int argc, char *argv[])
  {
-@@ -414,6 +455,8 @@ main (int argc, char *argv[])
+@@ -458,6 +499,8 @@ main (int argc, char *argv[])
  	gtk_window_set_default_icon_name ("empathy");
  	textdomain (GETTEXT_PACKAGE);
  


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- empathy.spec	6 Jan 2009 17:44:56 -0000	1.46
+++ empathy.spec	11 Feb 2009 17:15:06 -0000	1.47
@@ -5,11 +5,11 @@
 %global	gtk2_min_version	2.14
 %global	glib2_min_version	2.16.0
 %global	tp_mc_min_version	4.61
-%global	tp_glib_min_version	0.7.15
+%global	tp_glib_min_version	0.7.19
 %global	enchant_version		1.2.0		
 
 Name:		empathy
-Version:	2.25.4
+Version:	2.25.90
 Release:	1%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
@@ -47,6 +47,8 @@
 BuildRequires:	scrollkeeper	
 BuildRequires:	telepathy-glib-devel >= %{tp_glib_min_version}
 BuildRequires:	telepathy-mission-control-devel >= %{tp_mc_min_version}
+BuildRequires:	telepathy-farsight-devel
+BuildRequires:	libnotify-devel >= 0.4.4
 
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	telepathy-filesystem
@@ -62,8 +64,6 @@
 ## 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
 
 Requires(pre):	GConf2
 
@@ -228,6 +228,12 @@
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Tue Feb 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.25.90-1
+- Update to 2.25.90.
+- Bump min version of tp-glib needed.
+- Add BR on tp-farsight-devel & libnotify-devel.
+- Drop Requires on tp-stream-engine.
+
 * Tue Jan  6 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.25.4-1
 - Update to 2.25.4.
 - Add BR on libcanberra-devel.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	6 Jan 2009 17:44:56 -0000	1.26
+++ sources	11 Feb 2009 17:15:06 -0000	1.27
@@ -1 +1 @@
-118753a765085c3482e9bf9019a09292  empathy-2.25.4.tar.bz2
+bdd92b8a1506f1e946b2657d639e9e08  empathy-2.25.90.tar.bz2