rpms/gnet2/devel gnet2-2.0.8-build.patch,1.2,1.3

[Tomáš Mráz]

Author: tmraz

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

Modified Files:
	gnet2-2.0.8-build.patch 
Log Message:
* Tue Feb 16 2010 Tomas Mraz <tmraz at redhat.com> 2.0.8-4
- Fix FTBFS due to linker and gcc changes (#564691)


gnet2-2.0.8-build.patch:
 examples/Makefile.in        |    2 +-
 examples/xmlrpc/Makefile.in |    2 +-
 tests/check/Makefile.in     |    2 +-
 tests/check/gnetcheck.h     |    3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

Index: gnet2-2.0.8-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnet2/devel/gnet2-2.0.8-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnet2-2.0.8-build.patch	16 Feb 2010 18:32:00 -0000	1.2
+++ gnet2-2.0.8-build.patch	16 Feb 2010 18:45:02 -0000	1.3
@@ -1,30 +1,30 @@
 diff -up gnet-2.0.8/examples/Makefile.in.build gnet-2.0.8/examples/Makefile.in
 --- gnet-2.0.8/examples/Makefile.in.build	2008-02-03 13:07:21.000000000 +0100
-+++ gnet-2.0.8/examples/Makefile.in	2010-02-16 19:29:05.000000000 +0100
-@@ -343,7 +343,7 @@ SUBDIRS = xmlrpc
- CLEANFILES = $(EXTRA_PROGRAMS)
- AM_CFLAGS = $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
- INCLUDES = -I$(top_srcdir)/src 
--LDADD = $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
-+LDADD = $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la -lglib-2.0
- 
- ##########
- echoclient_SOURCES = echoclient.c
++++ gnet-2.0.8/examples/Makefile.in	2010-02-16 19:42:24.000000000 +0100
+@@ -254,7 +254,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(GLIB_LIBS)
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 diff -up gnet-2.0.8/examples/xmlrpc/Makefile.in.build gnet-2.0.8/examples/xmlrpc/Makefile.in
 --- gnet-2.0.8/examples/xmlrpc/Makefile.in.build	2008-02-03 13:07:21.000000000 +0100
-+++ gnet-2.0.8/examples/xmlrpc/Makefile.in	2010-02-16 19:31:02.000000000 +0100
-@@ -264,7 +264,7 @@ target_vendor = @target_vendor@
- noinst_LIBRARIES = libgnetxmlrpc.a
- AM_CFLAGS = $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
- INCLUDES = -I$(top_srcdir)/src 
--LDADD = $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
-+LDADD = $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la -lglib-2.0
- libgnetxmlrpc_a_SOURCES = xmlrpc-client.c xmlrpc-server.c xmlrpc.h
- libgnetxmlrpc_a_LIBADD = $(top_builddir)/src/libgnet-$(GNET_MAJOR_VERSION).$(GNET_MINOR_VERSION).la
- test_xmlrpc_client_SOURCES = test-xmlrpc-client.c xmlrpc.h
++++ gnet-2.0.8/examples/xmlrpc/Makefile.in	2010-02-16 19:42:24.000000000 +0100
+@@ -176,7 +176,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(GLIB_LIBS)
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
 diff -up gnet-2.0.8/tests/check/gnetcheck.h.build gnet-2.0.8/tests/check/gnetcheck.h
 --- gnet-2.0.8/tests/check/gnetcheck.h.build	2008-02-03 13:04:41.000000000 +0100
-+++ gnet-2.0.8/tests/check/gnetcheck.h	2010-02-16 19:29:05.000000000 +0100
++++ gnet-2.0.8/tests/check/gnetcheck.h	2010-02-16 19:42:24.000000000 +0100
 @@ -310,6 +310,8 @@ int main (int argc, char **argv)				\
  
  gboolean _gnet_check_run_test_func (const gchar * func_name);
@@ -42,3 +42,15 @@ diff -up gnet-2.0.8/tests/check/gnetchec
  
  G_END_DECLS
  
+diff -up gnet-2.0.8/tests/check/Makefile.in.build gnet-2.0.8/tests/check/Makefile.in
+--- gnet-2.0.8/tests/check/Makefile.in.build	2008-02-03 13:07:21.000000000 +0100
++++ gnet-2.0.8/tests/check/Makefile.in	2010-02-16 19:44:33.000000000 +0100
+@@ -272,7 +272,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ $(GLIB_LIBS)
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@