diff --git a/NetworkManager.spec b/NetworkManager.spec index 2fd840f..7e852c2 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -30,6 +30,7 @@ Patch4: serial-debug.patch 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 @@ tar -xzf %{SOURCE1} %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 diff --git a/applet-build-fix.patch b/applet-build-fix.patch new file mode 100644 index 0000000..74be363 --- /dev/null +++ b/applet-build-fix.patch @@ -0,0 +1,12 @@ +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; +