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

[Tomáš Mráz]

Author: tmraz

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

Modified Files:
	gnet2.spec 
Added Files:
	gnet2-2.0.8-build.patch 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:
 gnetcheck.h |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gnet2-2.0.8-build.patch ---
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
@@ -310,6 +310,8 @@ int main (int argc, char **argv)				\
 
 gboolean _gnet_check_run_test_func (const gchar * func_name);
 
+#define _tcase_add_test  __gnet_tcase_add_test
+
 static inline void
 __gnet_tcase_add_test (TCase * tc, TFun tf, const gchar * func_name,
     int sig, int start, int end)
@@ -319,7 +321,6 @@ __gnet_tcase_add_test (TCase * tc, TFun 
   }
 }
 
-#define _tcase_add_test  __gnet_tcase_add_test
 
 G_END_DECLS
 

gnet2-2.0.8-noxmlrpc.patch:
 Makefile.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gnet2-2.0.8-noxmlrpc.patch ---
diff -up gnet-2.0.8/examples/Makefile.in.noxmlrpc gnet-2.0.8/examples/Makefile.in
--- gnet-2.0.8/examples/Makefile.in.noxmlrpc	2008-02-03 13:07:21.000000000 +0100
+++ gnet-2.0.8/examples/Makefile.in	2010-02-16 11:56:22.000000000 +0100
@@ -339,7 +339,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-SUBDIRS = xmlrpc
+SUBDIRS =
 CLEANFILES = $(EXTRA_PROGRAMS)
 AM_CFLAGS = $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
 INCLUDES = -I$(top_srcdir)/src 


Index: gnet2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnet2/devel/gnet2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gnet2.spec	25 Jul 2009 00:31:13 -0000	1.16
+++ gnet2.spec	16 Feb 2010 17:25:02 -0000	1.17
@@ -1,12 +1,14 @@
 Name:           gnet2
 Version:        2.0.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A simple network library built upon glib
 
 Group:          System Environment/Libraries
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glib2-devel
@@ -26,6 +28,8 @@ use GNet 2.
 
 %prep
 %setup -q -n gnet-%{version}
+%patch1 -p1 -b .noxmlrpc
+%patch2 -p1 -b .build
 
 %build
 %configure --disable-static
@@ -59,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Feb 16 2010 Tomas Mraz <tmraz at redhat.com> 2.0.8-4
+- Fix FTBFS due to linker and gcc changes (#564691)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild