rpms/telepathy-salut/OLPC-3 telepathy-salut.spec, 1.24, 1.25 use-tp_debug_divert_messages.patch, 1.1, 1.2

[Guillaume Desmottes]

Author: gdesmott

Update of /cvs/pkgs/rpms/telepathy-salut/OLPC-3
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16742

Modified Files:
	telepathy-salut.spec use-tp_debug_divert_messages.patch 
Log Message:
Fix use-tp_debug_divert_messages.patch. Bump telepathy-glib version to 0.7.1 as use-tp_debug_divert_messages.patch needs it


Index: telepathy-salut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/telepathy-salut.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- telepathy-salut.spec	15 Aug 2008 10:10:42 -0000	1.24
+++ telepathy-salut.spec	25 Aug 2008 09:01:02 -0000	1.25
@@ -1,6 +1,6 @@
 Name:           telepathy-salut
 Version:        0.3.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Link-local XMPP telepathy connection manager
 
 Group:          Applications/Communications
@@ -20,7 +20,7 @@
 BuildRequires:	openssl-devel
 BuildRequires:	cyrus-sasl-devel
 BuildRequires:	libxslt
-BuildRequires:	telepathy-glib-devel >= 0.5.14
+BuildRequires:	telepathy-glib-devel >= 0.7.1
 BuildRequires:	check-devel >= 0.9.4
 
 Requires:	telepathy-filesystem
@@ -65,6 +65,10 @@
 %{_mandir}/man8/%{name}.8.gz
 
 %changelog
+* Mon Aug 25 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.3.3-6
+- Fix use-tp_debug_divert_messages.patch
+- Bump telepathy-glib version to 0.7.1 as use-tp_debug_divert_messages.patch needs it
+
 * Fri Aug 15 2008 Guillaume Desmottes <guillaume.desmottes at collabora.co.uk> - 0.3.3-5
 - Use tp_debug_divert_messages instead of our own copy of it (#7833)
 

use-tp_debug_divert_messages.patch:

Index: use-tp_debug_divert_messages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-salut/OLPC-3/use-tp_debug_divert_messages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- use-tp_debug_divert_messages.patch	15 Aug 2008 10:10:42 -0000	1.1
+++ use-tp_debug_divert_messages.patch	25 Aug 2008 09:01:03 -0000	1.2
@@ -70,17 +70,3 @@
    debug_set_flags_from_env ();
  
    if (g_getenv ("SALUT_PERSIST"))
-diff --git a/tests/salut-debug.c b/tests/salut-debug.c
-index 5efdfb6..8c1695c 100644
---- a/tests/salut-debug.c
-+++ b/tests/salut-debug.c
-@@ -24,7 +24,7 @@ main (int argc, char **argv)
-   g_type_init ();
-   g_set_prgname ("telepathy-salut");
- 
--  debug_set_log_file_from_env ();
-+  tp_debug_divert_messages (g_getenv ("SALUT_LOGFILE"));
-   debug_set_flags_from_env ();
- 
-   if (g_getenv ("SALUT_PERSIST"))
-