rpms/gkrellm/devel gkrellm-2.3.1-netdb.patch, NONE, 1.1 gkrellm.spec, 1.14, 1.15

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gkrellm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4108

Modified Files:
	gkrellm.spec 
Added Files:
	gkrellm-2.3.1-netdb.patch 
Log Message:
* Wed Feb 13 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.1-3
- Fix building with latest glibc
- Rebuild for gcc 4.3


gkrellm-2.3.1-netdb.patch:

--- NEW FILE gkrellm-2.3.1-netdb.patch ---
--- gkrellm-2.3.1/src/client.c~	2008-02-13 20:23:09.000000000 +0100
+++ gkrellm-2.3.1/src/client.c	2008-02-13 20:23:09.000000000 +0100
@@ -1606,7 +1607,7 @@ KeyTable	update_table[] =
 
 
 static gint
-getline(gint fd, gchar *buf, gint len)
+gkrellm_getline(gint fd, gchar *buf, gint len)
 	{
 	fd_set			read_fds;
 	struct timeval	tv;
@@ -1698,7 +1699,7 @@ read_server_setup(gint fd)
 
 	while (1)
 		{
-		getline(fd, buf, sizeof(buf));
+		gkrellm_getline(fd, buf, sizeof(buf));
 		if (!strcmp(buf, "</gkrellmd_setup>"))
 			break;
 		process_server_line(&setup_table[0], table_size, buf);
@@ -1714,7 +1715,7 @@ read_server_setup(gint fd)
 	table_size = sizeof(update_table) / sizeof(KeyTable);
 	while (1)
 		{
-		getline(fd, buf, sizeof(buf));
+		gkrellm_getline(fd, buf, sizeof(buf));
 		if (!strcmp(buf, "</initial_update>"))
 			break;
 		process_server_line(&update_table[0], table_size, buf);


Index: gkrellm.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellm/devel/gkrellm.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gkrellm.spec	4 Dec 2007 21:23:18 -0000	1.14
+++ gkrellm.spec	13 Feb 2008 19:26:02 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gkrellm
 Version:        2.3.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Multiple stacked system monitors in one process
 Group:          Applications/System
 License:        GPLv3+
@@ -13,6 +13,7 @@
 Patch2:         gkrellm-2.2.4-sansfont.patch
 Patch3:         gkrellm-2.2.7-width.patch
 Patch4:         gkrellm-2.2.9-libdir.patch
+Patch5:         gkrellm-2.3.1-netdb.patch
 BuildRequires:  gtk2-devel gnutls-devel libSM-devel desktop-file-utils gettext
 BuildRequires:  lm_sensors-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +62,7 @@
 %patch2 -p1 -z .sansfont
 %patch3 -p1 -z .width
 %patch4 -p1 -z .libdir2
+%patch5 -p1 -z .netdb
 
 for i in gkrellmd.1 gkrellm.1 README Changelog Changelog-plugins.html; do
    sed -i -e "s@/usr/lib/gkrellm2/plugins@%{_libdir}/gkrellm2/plugins@" $i
@@ -74,7 +76,7 @@
 
 %build
 make %{?_smp_mflags} INSTALLROOT=%{_prefix} PKGCONFIGDIR=%{_libdir}/pkgconfig \
-  INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS"
+  INCLUDEDIR=%{_includedir} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 
 
 %install
@@ -167,6 +169,10 @@
 
 
 %changelog
+* Wed Feb 13 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.1-3
+- Fix building with latest glibc
+- Rebuild for gcc 4.3
+
 * Tue Dec  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.3.1-2
 - Clean up desktop-file-utils 0.14 warnings.