rpms/NetworkManager/F-8 applet-build-fix.patch, NONE, 1.1 NetworkManager.spec, 1.217, 1.218

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8798

Modified Files:
	NetworkManager.spec 
Added Files:
	applet-build-fix.patch 
Log Message:
Another build fix

applet-build-fix.patch:

--- NEW FILE applet-build-fix.patch ---
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c.fix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c.fix	2008-08-11 14:55:55.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/gconf-upgrade.c	2008-08-11 14:56:03.000000000 -0400
@@ -528,7 +528,7 @@ nm_gconf_read_0_6_vpn_connection (GConfC
 	NMConnection *connection;
 	NMSettingConnection *s_con;
 	NMSettingVPN *s_vpn;
-	NMSettingIP4Config *s_ip4;
+	NMSettingIP4Config *s_ip4 = NULL;
 	char *path, *network, *id = NULL, *service_name = NULL;
 	GSList *str_routes = NULL, *vpn_data = NULL;
 


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- NetworkManager.spec	11 Aug 2008 18:25:42 -0000	1.217
+++ NetworkManager.spec	11 Aug 2008 18:55:53 -0000	1.218
@@ -30,6 +30,7 @@
 Patch5: explain-dns1-dns2.patch
 Patch6: pk-06-fixes.patch
 Patch7: preserve-f8-priorities.patch
+Patch20: applet-build-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -157,6 +158,7 @@
 %patch5 -p1 -b .explain-dns1-dns2
 %patch6 -p1 -b .pk-06-fixes
 %patch7 -p1 -b .f8-priorities
+%patch20 -p1 -b .another-fix
 
 %build
 autoreconf -i