rpms/ekg2/devel ekg2-gcc43.patch, 1.2, 1.3 ekg2.spec, 1.10, 1.11 ekg2-limits.patch, 1.1, NONE

Wed May 28 20:37:42 UTC 2008

Author: rathann

Update of /cvs/pkgs/rpms/ekg2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26386

Modified Files:
	ekg2.spec 
Added Files:
	ekg2-gcc43.patch 
Removed Files:
	ekg2-limits.patch 
Log Message:
- fix build on rawhide


ekg2-gcc43.patch:

Index: ekg2-gcc43.patch
===================================================================
RCS file: ekg2-gcc43.patch
diff -N ekg2-gcc43.patch

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ekg2-gcc43.patch	28 May 2008 20:36:53 -0000	1.3
@@ -0,0 +1,36 @@
+diff -up ekg2-0.2-rc1/ekg/resolver.c.g ekg2-0.2-rc1/ekg/resolver.c
+--- ekg2-0.2-rc1/ekg/resolver.c.g	2008-02-28 21:23:03.000000000 +0100
++++ ekg2-0.2-rc1/ekg/resolver.c	2008-05-28 22:18:26.000000000 +0200
+@@ -125,7 +125,7 @@ watch_t *ekg_resolver2(plugin_t *plugin,
+ 			if (!he)
+ 				a.s_addr = INADDR_NONE;
+ 			else
+-				memcpy(&a, he->h_addr, sizeof(a));
++				memcpy(&a, he->h_addr_list[0], sizeof(a));
+ 		}
+ 		write(fd[1], &a, sizeof(a));
+ 		xfree(myserver);
+diff -up ekg2-0.2-rc1/plugins/jabber/Makefile.am.g ekg2-0.2-rc1/plugins/jabber/Makefile.am
+--- ekg2-0.2-rc1/plugins/jabber/Makefile.am.g	2008-02-28 21:22:56.000000000 +0100
++++ ekg2-0.2-rc1/plugins/jabber/Makefile.am	2008-05-28 22:13:35.000000000 +0200
+@@ -4,7 +4,7 @@ lib_LTLIBRARIES = jabber.la
+ jabber_la_SOURCES = jabber.c commands.c misc.c digest.c xmlnode.c jabber_dcc.c jabber_handlers.c jabber.h jabber_dcc.h jabber-ssl.h
+ jabber_la_LDFLAGS = -module -avoid-version
+ jabber_la_LIBADD = $(EXPAT_LIBS) $(JABBER_SSL_LIBS) $(ZLIB_LIBS)
+-jabber_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS) $(JABBER_SSL_CPPFLAGS)
++jabber_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS) $(JABBER_SSL_CPPFLAGS) -D_POSIX_SOURCE
+ 
+ libdir = $(plugindir)
+ 
+diff -up ekg2-0.2-rc1/plugins/feed/Makefile.am.g ekg2-0.2-rc1/plugins/feed/Makefile.am
+--- ekg2-0.2-rc1/plugins/feed/Makefile.am.g	2008-02-28 21:23:00.000000000 +0100
++++ ekg2-0.2-rc1/plugins/feed/Makefile.am	2008-05-28 22:14:10.000000000 +0200
+@@ -2,7 +2,7 @@ lib_LTLIBRARIES = feed.la
+ feed_la_SOURCES = feed.c feed.h rss.c nntp.c
+ feed_la_LDFLAGS = -module -avoid-version
+ feed_la_LIBADD = $(EXPAT_LIBS)
+-feed_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS)
++feed_la_CPPFLAGS = $(C_FVISIBILITY) $(EXPAT_CPPFLAGS) -D_POSIX_SOURCE
+ 
+ libdir = $(plugindir)
+ 


Index: ekg2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ekg2/devel/ekg2.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ekg2.spec	28 May 2008 18:48:52 -0000	1.10
+++ ekg2.spec	28 May 2008 20:36:53 -0000	1.11
@@ -11,8 +11,8 @@
 Source0:	http://pl.ekg2.org/%{name}-%{version}-rc1.tar.gz
 Source1:	%{name}.pc.in
 Patch1:		%{name}-rpm.patch
-Patch2:		%{name}-pkgconfig.patch
-Patch3:		%{name}-limits.patch
+Patch2:		%{name}-gcc43.patch
+Patch3:		%{name}-pkgconfig.patch
 URL:		http://www.ekg2.org/
 BuildRequires:	aspell-devel
 BuildRequires:	automake17
@@ -199,8 +199,8 @@
 %setup -q -n %{name}-%{version}-rc1
 cp -p %{SOURCE1} ekg/
 %patch1 -p1 -b .r
-%patch2 -p1 -b .p
-%patch3 -p1 -b .g
+%patch2 -p1 -b .gcc43
+%patch3 -p1 -b .p
 cp -p README README-main
 # convert docs to UTF-8
 for file in \
@@ -360,7 +360,8 @@
 * Wed May 28 2008 Dominik Mierzejewski <rpm at greysector.net> 0.2-0.1.rc1
 - updated to 0.2-rc1 (#435369)
 - fix multiarch conflicts (#341051)
-- dropped obsolete gcc43 patch
+- updated gcc43 patch
+- fixed compilation against the new glibc
 
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.1.1-4
 Rebuild for new perl


--- ekg2-limits.patch DELETED ---


