rpms/NetworkManager/F-8 .cvsignore, 1.71, 1.72 NetworkManager.spec, 1.196, 1.197 nm-applet-0.7.0-disable-stuff.patch, 1.2, 1.3 sources, 1.90, 1.91
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Tue Dec 4 19:56:42 UTC 2007
Author: dcbw
Update of /cvs/extras/rpms/NetworkManager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21056
Modified Files:
.cvsignore NetworkManager.spec
nm-applet-0.7.0-disable-stuff.patch sources
Log Message:
* Tue Dec 4 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.6.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)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/.cvsignore,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- .cvsignore 26 Nov 2007 19:54:27 -0000 1.71
+++ .cvsignore 4 Dec 2007 19:56:06 -0000 1.72
@@ -57,3 +57,5 @@
NetworkManager-0.7.0.svn3109.tar.gz
nm-applet-0.7.0.svn367.tar.gz
nm-applet-0.7.0.svn368.tar.gz
+NetworkManager-0.7.0.svn3133.tar.gz
+nm-applet-0.7.0.svn376.tar.gz
Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- NetworkManager.spec 26 Nov 2007 19:54:27 -0000 1.196
+++ NetworkManager.spec 4 Dec 2007 19:56:06 -0000 1.197
@@ -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 svn3133
Name: NetworkManager
Summary: Network connection manager and user applications
@@ -18,7 +18,7 @@
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}.svn376.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 @@
%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,12 @@
%changelog
+* Tue Dec 4 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.6.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)
+
* Mon Nov 26 2007 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.6.svn3109
- Fix device descriptions shown in applet menu
nm-applet-0.7.0-disable-stuff.patch:
Index: nm-applet-0.7.0-disable-stuff.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/nm-applet-0.7.0-disable-stuff.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nm-applet-0.7.0-disable-stuff.patch 22 Oct 2007 03:38:52 -0000 1.2
+++ nm-applet-0.7.0-disable-stuff.patch 4 Dec 2007 19:56:06 -0000 1.3
@@ -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 @@
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 @@
/* '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);
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/sources,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- sources 26 Nov 2007 19:54:27 -0000 1.90
+++ sources 4 Dec 2007 19:56:06 -0000 1.91
@@ -1,2 +1,2 @@
-b94d14d775ade4d969c7c9a6c0c1c887 NetworkManager-0.7.0.svn3109.tar.gz
-3d4b223982a2f4dac3d5a0d5cc864252 nm-applet-0.7.0.svn368.tar.gz
+8decde915d7d843836828127e1160bfd NetworkManager-0.7.0.svn3133.tar.gz
+12c6e9f05b6d0ab08df23c2e4bc076a3 nm-applet-0.7.0.svn376.tar.gz
More information about the fedora-extras-commits
mailing list