rpms/libsoup22/devel libsoup-2.2.105-dprintf-conflict.patch, NONE, 1.1 libsoup22.spec, 1.3, 1.4

[Matthew Barnes]

Author: mbarnes

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

Modified Files:
	libsoup22.spec 
Added Files:
	libsoup-2.2.105-dprintf-conflict.patch 
Log Message:

error: %patch without corresponding "Patch:" tag
* Wed Jul 15 2009 Matthew Barnes <mbarnes at redhat.com> - 2.2.105-5
- Add patch for RH bug #511673 (dprintf conflict).


libsoup-2.2.105-dprintf-conflict.patch:

--- NEW FILE libsoup-2.2.105-dprintf-conflict.patch ---
diff -up libsoup-2.2.105/tests/context-test.c.dprintf-conflict libsoup-2.2.105/tests/context-test.c
--- libsoup-2.2.105/tests/context-test.c.dprintf-conflict	2009-07-15 12:21:30.000000000 -0400
+++ libsoup-2.2.105/tests/context-test.c	2009-07-15 12:21:51.000000000 -0400
@@ -28,7 +28,7 @@ GThread *server_thread;
 char *base_uri;
 
 static void
-dprintf (const char *format, ...)
+debug_printf (const char *format, ...)
 {
 	va_list args;
 
@@ -168,7 +168,7 @@ do_test1 (void)
 {
 	GMainLoop *loop;
 
-	dprintf ("Test 1: blocking the main thread does not block other thread\n");
+	debug_printf ("Test 1: blocking the main thread does not block other thread\n");
 
 	test1_cond = g_cond_new ();
 	test1_mutex = g_mutex_new ();
@@ -196,7 +196,7 @@ idle_start_test1_thread (gpointer loop)
 	if (g_cond_timed_wait (test1_cond, test1_mutex, &time))
 		g_thread_join (thread);
 	else {
-		dprintf ("  timeout!\n");
+		debug_printf ("  timeout!\n");
 		errors++;
 	}
 
@@ -232,17 +232,17 @@ test1_thread (gpointer user_data)
 
 	uri = g_build_filename (base_uri, "slow", NULL);
 
-	dprintf ("  send_message\n");
+	debug_printf ("  send_message\n");
 	msg = soup_message_new ("GET", uri);
 	soup_session_send_message (session, msg);
 	if (msg->status_code != SOUP_STATUS_OK) {
-		dprintf ("    unexpected status: %d %s\n",
+		debug_printf ("    unexpected status: %d %s\n",
 			 msg->status_code, msg->reason_phrase);
 		errors++;
 	}
 	g_object_unref (msg);
 
-	dprintf ("  queue_message\n");
+	debug_printf ("  queue_message\n");
 	msg = soup_message_new ("GET", uri);
 	loop = g_main_loop_new (async_context, FALSE);
 	g_object_ref (msg);
@@ -250,7 +250,7 @@ test1_thread (gpointer user_data)
 	g_main_loop_run (loop);
 	g_main_loop_unref (loop);
 	if (msg->status_code != SOUP_STATUS_OK) {
-		dprintf ("    unexpected status: %d %s\n",
+		debug_printf ("    unexpected status: %d %s\n",
 			 msg->status_code, msg->reason_phrase);
 		errors++;
 	}
@@ -279,7 +279,7 @@ do_test2 (void)
 	char *uri;
 	SoupMessage *msg;
 
-	dprintf ("Test 2: a session with its own context is independent of the main loop.\n");
+	debug_printf ("Test 2: a session with its own context is independent of the main loop.\n");
 
 	idle = g_idle_add_full (G_PRIORITY_HIGH, idle_test2_fail, NULL, NULL);
 
@@ -291,11 +291,11 @@ do_test2 (void)
 
 	uri = g_build_filename (base_uri, "slow", NULL);
 
-	dprintf ("  send_message\n");
+	debug_printf ("  send_message\n");
 	msg = soup_message_new ("GET", uri);
 	soup_session_send_message (session, msg);
 	if (msg->status_code != SOUP_STATUS_OK) {
-		dprintf ("    unexpected status: %d %s\n",
+		debug_printf ("    unexpected status: %d %s\n",
 			 msg->status_code, msg->reason_phrase);
 		errors++;
 	}
@@ -311,7 +311,7 @@ do_test2 (void)
 static gboolean
 idle_test2_fail (gpointer user_data)
 {
-	dprintf ("  idle ran!\n");
+	debug_printf ("  idle ran!\n");
 	errors++;
 	return FALSE;
 }
@@ -356,7 +356,7 @@ main (int argc, char **argv)
 	g_free (base_uri);
 	g_main_context_unref (g_main_context_default ());
 
-	dprintf ("\n");
+	debug_printf ("\n");
 	if (errors) {
 		printf ("context-test: %d error(s). Run with '-d' for details\n",
 			errors);


Index: libsoup22.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsoup22/devel/libsoup22.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libsoup22.spec	25 Feb 2009 18:17:04 -0000	1.3
+++ libsoup22.spec	15 Jul 2009 16:25:12 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name: libsoup22
 Version: 2.2.105
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Summary: Soup, an HTTP library implementation
@@ -10,6 +10,11 @@ URL: ftp://ftp.gnome.org/pub/gnome/sourc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source: ftp://ftp.gnome.org/pub/gnome/sources/libsoup/2.2/libsoup-%{version}.tar.bz2
 
+### Patches ###
+
+# RH bug #511673
+Patch1: libsoup-2.2.105-dprintf-conflict.patch
+
 ### Dependencies ###
 
 Requires: glib2 >= 2.12
@@ -47,6 +52,7 @@ you to develop applications that use the
 
 %prep
 %setup -q -n libsoup-%{version}
+%patch -p1 -b .dprintf-conflict
 
 %build
 %configure
@@ -82,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libsoup-2.2
 
 %changelog
+* Wed Jul 15 2009 Matthew Barnes <mbarnes at redhat.com> - 2.2.105-5
+- Add patch for RH bug #511673 (dprintf conflict).
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.105-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild