rpms/gnet2/devel gnet2-2.0.8-build.patch, 1.1, 1.2 gnet2.spec, 1.17, 1.18 gnet2-2.0.8-noxmlrpc.patch, 1.1, NONE

[Tomáš Mráz]

Author: tmraz

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

Modified Files:
	gnet2-2.0.8-build.patch gnet2.spec 
Removed Files:
	gnet2-2.0.8-noxmlrpc.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/gnetcheck.h     |    3 ++-
 3 files changed, 4 insertions(+), 3 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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gnet2-2.0.8-build.patch	16 Feb 2010 17:25:02 -0000	1.1
+++ gnet2-2.0.8-build.patch	16 Feb 2010 18:32:00 -0000	1.2
@@ -1,6 +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
+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
 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 18:15:51.000000000 +0100
++++ gnet-2.0.8/tests/check/gnetcheck.h	2010-02-16 19:29:05.000000000 +0100
 @@ -310,6 +310,8 @@ int main (int argc, char **argv)				\
  
  gboolean _gnet_check_run_test_func (const gchar * func_name);


Index: gnet2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnet2/devel/gnet2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- gnet2.spec	16 Feb 2010 17:25:02 -0000	1.17
+++ gnet2.spec	16 Feb 2010 18:32:01 -0000	1.18
@@ -7,8 +7,7 @@ Group:          System Environment/Libra
 License:        LGPLv2+
 URL:            http://www.gnetlibrary.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/gnet/2.0/gnet-%{version}.tar.bz2
-Patch1:         gnet2-2.0.8-noxmlrpc.patch
-Patch2:         gnet2-2.0.8-build.patch
+Patch1:         gnet2-2.0.8-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -28,8 +27,7 @@ use GNet 2.
 
 %prep
 %setup -q -n gnet-%{version}
-%patch1 -p1 -b .noxmlrpc
-%patch2 -p1 -b .build
+%patch1 -p1 -b .build
 
 %build
 %configure --disable-static


--- gnet2-2.0.8-noxmlrpc.patch DELETED ---