From 9e37500280ddb5454bae160ad7466fef6ca417d0 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Wed, 5 Dec 2007 21:59:14 +0000 Subject: [PATCH] Update from F-8 branch --- NetworkManager.spec | 27 ++++++++++++++++++++++----- nm-applet-0.7.0-disable-stuff.patch | 28 ++++++++++++++++++++++------ sources | 4 ++-- 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index 2b01b2b..d6db90a 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -1,13 +1,13 @@ ExcludeArch: s390 s390x -%define dbus_version 1.0.2 +%define dbus_version 1.1 %define dbus_glib_version 0.73 %define hal_version 0.5.0 -%define gtk2_version 2.10.0 +%define gtk2_version 2.12.0 %define wireless_tools_version 1:28-0pre9 -%define snapshot svn3109 +%define snapshot svn3138 Name: NetworkManager Summary: Network connection manager and user applications @@ -18,7 +18,7 @@ Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}.%{snapshot}.tar.gz -Source1: nm-applet-%{version}.svn368.tar.gz +Source1: nm-applet-%{version}.svn383.tar.gz Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch Patch2: nm-applet-0.7.0-disable-stuff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -169,11 +169,14 @@ popd %find_lang %{name} %find_lang nm-applet cat nm-applet.lang >> %{name}.lang + +%{__mv} $RPM_BUILD_ROOT%{_libdir}/NetworkManager/nm-pppd-plugin.* $RPM_BUILD_ROOT%{_libdir}/ + %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la # Remove system settings daemon for now %{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf -%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm-settings-plugin* +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/libnm-settings-plugin* %{__rm} -f $RPM_BUILD_ROOT%{_sbindir}/nm-system-settings %clean @@ -266,6 +269,20 @@ fi %changelog +* Wed Dec 5 2007 Dan Williams - 1:0.7.0-0.8.svn3138 +- Fix applet connection comparison which failed to send connection updated + signals to NM in some cases +- Make VPN connection applet more robust against plugin failures + +* Tue Dec 4 2007 Dan Williams - 1:0.7.0-0.8.svn3134 +- 64-bit -Wall compile fixes + +* Tue Dec 4 2007 Dan Williams - 1:0.7.0-0.8.svn3133 +- Fix applet crash when choosing to ignore the CA certificate (rh #359001) +- Fix applet crash when editing VPN properties and VPN connection failures (rh #409351) +- Add file filter name in certificate file picker dialog (rh #410201) +- No longer start named when starting NM (rh #381571) + * Tue Nov 27 2007 Jeremy Katz - 1:0.7.0-0.8.svn3109 - Fix upgrading from an earlier rawhide snap diff --git a/nm-applet-0.7.0-disable-stuff.patch b/nm-applet-0.7.0-disable-stuff.patch index 912f7bb..402976a 100644 --- a/nm-applet-0.7.0-disable-stuff.patch +++ b/nm-applet-0.7.0-disable-stuff.patch @@ -1,7 +1,23 @@ -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-connection-editor NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-connection-editor 2007-09-25 13:01:18.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c 2007-09-25 14:43:31.000000000 -0400 -@@ -1167,6 +1168,7 @@ nma_menu_add_create_network_item (GtkWid +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.disable-stuff NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.disable-stuff 2007-12-04 14:03:14.000000000 -0500 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c 2007-12-04 14:45:32.000000000 -0500 +@@ -315,6 +315,7 @@ nma_show_info_cb (GtkMenuItem *mi, NMApp + gtk_window_present (GTK_WINDOW (dialog)); + } + ++#if 0 + static void + nma_edit_connections_cb (GtkMenuItem *mi, NMApplet *applet) + { +@@ -325,6 +326,7 @@ nma_edit_connections_cb (GtkMenuItem *mi + + g_object_unref (connection_list); + } ++#endif + + static void about_dialog_activate_link_cb (GtkAboutDialog *about, + const gchar *url, +@@ -1442,6 +1444,7 @@ nma_menu_add_create_network_item (GtkWid label = gtk_label_new_with_mnemonic (_("Create _New Wireless Network...")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_container_add (GTK_CONTAINER (menu_item), label); @@ -9,7 +25,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-connection-editor gtk_widget_show_all (menu_item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); g_signal_connect (menu_item, "activate", G_CALLBACK (new_network_item_selected), applet); -@@ -1781,6 +1783,7 @@ static GtkWidget *nma_context_menu_creat +@@ -2060,6 +2063,7 @@ static GtkWidget *nma_context_menu_creat gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (applet->info_menu_item), image); gtk_menu_shell_append (menu, applet->info_menu_item); @@ -17,7 +33,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-connection-editor /* 'Edit Connections...' item */ applet->connections_menu_item = gtk_menu_item_new_with_mnemonic (_("Edit Connections...")); g_signal_connect (applet->connections_menu_item, -@@ -1788,6 +1791,7 @@ static GtkWidget *nma_context_menu_creat +@@ -2067,6 +2071,7 @@ static GtkWidget *nma_context_menu_creat G_CALLBACK (nma_edit_connections_cb), applet); gtk_menu_shell_append (menu, applet->connections_menu_item); diff --git a/sources b/sources index 572a17e..07100b4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b94d14d775ade4d969c7c9a6c0c1c887 NetworkManager-0.7.0.svn3109.tar.gz -3d4b223982a2f4dac3d5a0d5cc864252 nm-applet-0.7.0.svn368.tar.gz +d4a7d986b0fe5eb839ae6467ac49f0f5 NetworkManager-0.7.0.svn3138.tar.gz +cf8070b1dc9af7106c28327b01558511 nm-applet-0.7.0.svn383.tar.gz