rpms/NetworkManager/devel nm-applet-0.7.0-fixes.patch, NONE, 1.1 NetworkManager-0.7.0-ppp-manager-fpic.patch, 1.1, 1.2 NetworkManager.spec, 1.161, 1.162

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	NetworkManager-0.7.0-ppp-manager-fpic.patch 
	NetworkManager.spec 
Added Files:
	nm-applet-0.7.0-fixes.patch 
Log Message:
Add more fPIC bits

nm-applet-0.7.0-fixes.patch:

--- NEW FILE nm-applet-0.7.0-fixes.patch ---
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.h.fixes	2007-08-30 21:24:02.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.h	2007-08-30 21:24:12.000000000 -0400
@@ -26,6 +26,8 @@
 #include <config.h>
 #endif
 
+#include <string.h>
+
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
 #include <glade/glade.h>
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/menu-items.c.fixes	2007-08-30 21:21:14.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/menu-items.c	2007-08-30 21:21:57.000000000 -0400
@@ -228,7 +228,7 @@ nm_network_menu_item_set_ssid (NMNetwork
 guint32
 nm_network_menu_item_get_strength (NMNetworkMenuItem * item)
 {
-	g_return_if_fail (item != NULL);
+	g_return_if_fail (item != NULL, 0);
 
 	return item->int_strength;
 }
@@ -249,8 +249,8 @@ const guchar *
 nm_network_menu_item_get_hash (NMNetworkMenuItem * item,
                                guint32 * length)
 {
-	g_return_if_fail (item != NULL);
-	g_return_if_fail (length != NULL);
+	g_return_if_fail (item != NULL, NULL);
+	g_return_if_fail (length != NULL, NULL);
 
 	*length = item->hash_len;
 	return item->hash;

NetworkManager-0.7.0-ppp-manager-fpic.patch:

Index: NetworkManager-0.7.0-ppp-manager-fpic.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager-0.7.0-ppp-manager-fpic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NetworkManager-0.7.0-ppp-manager-fpic.patch	30 Aug 2007 23:49:36 -0000	1.1
+++ NetworkManager-0.7.0-ppp-manager-fpic.patch	31 Aug 2007 01:39:20 -0000	1.2
@@ -1,5 +1,15 @@
---- NetworkManager-0.7.0/src/ppp-manager/Makefile.am.fpic	2007-08-30 19:41:49.000000000 -0400
-+++ NetworkManager-0.7.0/src/ppp-manager/Makefile.am	2007-08-30 19:42:00.000000000 -0400
+--- NetworkManager-0.7.0/libnm-util/Makefile.am.fpic	2007-08-30 21:17:33.000000000 -0400
++++ NetworkManager-0.7.0/libnm-util/Makefile.am	2007-08-30 21:18:12.000000000 -0400
+@@ -5,6 +5,7 @@ lib_LTLIBRARIES=libnm-util.la
+ libnm_util_la_CPPFLAGS =				\
+ 	$(GLIB_CFLAGS)					\
+ 	$(DBUS_CFLAGS)					\
++	-fPIC		\
+ 	-DDBUS_API_SUBJECT_TO_CHANGE		\
+ 	-DG_DISABLE_DEPRECATED			\
+ 	-DGDK_DISABLE_DEPRECATED			\
+--- NetworkManager-0.7.0/src/ppp-manager/Makefile.am.fpic	2007-08-30 14:45:45.000000000 -0400
++++ NetworkManager-0.7.0/src/ppp-manager/Makefile.am	2007-08-30 19:43:20.000000000 -0400
 @@ -33,7 +33,7 @@ nm_pppd_plugin_so_SOURCES = \
  	nm-pppd-plugin.h	\
  	nm-ppp-status.h


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- NetworkManager.spec	30 Aug 2007 23:49:36 -0000	1.161
+++ NetworkManager.spec	31 Aug 2007 01:39:20 -0000	1.162
@@ -22,6 +22,7 @@
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: NetworkManager-0.7.0-missing-includes.patch
 Patch3: NetworkManager-0.7.0-ppp-manager-fpic.patch
+Patch4: nm-applet-0.7.0-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -125,6 +126,7 @@
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
+%patch4 -p1 -b .fixes
 
 %build
 # Even though we don't require named, we still build with it