rpms/NetworkManager
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- sync with what was in F-8; rebuild against new dbus-glib

Browse Source
This commit is contained in:
Jeremy Katz 2007-11-13 14:54:20 +00:00
parent 3553c7b7ac
commit 6e15902460
4 changed files with 78 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
NetworkManager.spec
View File

@ -7,20 +7,21 @@ ExcludeArch: s390 s390x
%define gtk2_version 2.10.0 %define gtk2_version 2.10.0
%define wireless_tools_version 1:28-0pre9 %define wireless_tools_version 1:28-0pre9
%define snapshot svn2983 %define snapshot svn3030
Name: NetworkManager Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
Epoch: 1 Epoch: 1
Version: 0.7.0 Version: 0.7.0
Release: 0.4.%{snapshot}%{?dist} Release: 0.7.%{snapshot}%{?dist}
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
Source: %{name}-%{version}.%{snapshot}.tar.gz Source: %{name}-%{version}.%{snapshot}.tar.gz
Source1: nm-applet-%{version}.svn261.tar.gz Source1: nm-applet-%{version}.svn302.tar.gz
Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
Patch2: nm-applet-0.7.0-disable-stuff.patch Patch2: nm-applet-0.7.0-disable-stuff.patch
Patch3: nm-applet-0.7.0-applet-usb-vendor-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
PreReq: chkconfig PreReq: chkconfig
@ -30,7 +31,7 @@ Requires: dbus-glib >= %{dbus_glib_version}
Requires: hal >= %{hal_version} Requires: hal >= %{hal_version}
Requires: iproute openssl Requires: iproute openssl
Requires: dhclient >= 3.0.2-12 Requires: dhclient >= 3.0.2-12
Requires: wpa_supplicant >= 0.5.7-7 Requires: wpa_supplicant >= 0.5.7-13
Requires: %{name}-glib = %{epoch}:%{version}-%{release} Requires: %{name}-glib = %{epoch}:%{version}-%{release}
Obsoletes: dhcdbd Obsoletes: dhcdbd
@ -126,6 +127,7 @@ NetworkManager functionality from applications that use glib.
tar -xzf %{SOURCE1} tar -xzf %{SOURCE1}
%patch1 -p1 -b .buildfix %patch1 -p1 -b .buildfix
%patch2 -p1 -b .disable-stuff %patch2 -p1 -b .disable-stuff
%patch3 -p1 -b .applet-usb-vendor-fix
%build %build
# Even though we don't require named, we still build with it # Even though we don't require named, we still build with it
@ -260,8 +262,56 @@ fi
%changelog %changelog
* Tue Oct 23 2007 Matthias Clasen <mclasen@redhat.com> - 1:0.7.0-0.4.svn2983 * Tue Nov 13 2007 Jeremy Katz <katzj@redhat.com> - 1:0.7.0-0.7.svn3030
- Rebuild against new dbus-glib - sync with what was in F-8; rebuild against new dbus-glib
* Thu Nov 1 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.6.1.svn3030
- Fix applet crash with USB devices that don't advertise a product or vendor
(rh #337191)
* Sat Oct 27 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.5.svn3030
- Fix crash when getting WPA secrets (rh #355041)
* Fri Oct 26 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.4.svn3030
- Bring up ethernet devices by default if no connections are defined (rh #339201)
- Fix crash when switching networks or bringing up secrets dialog (rh #353091)
- Fix crash when editing VPN connection properties a second time
- Fix crash when cancelling the secrets dialog if another connection was
activated in the mean time
- Fix disembodied notification bubbles (rh #333391)
* Thu Oct 25 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.4.svn3020
- Handle PEM certificates
- Hide WPA-PSK Type combo since it's as yet unused
- Fix applet crash when AP security options changed and old secrets are still
in the keyring
- Fix applet crash connecting to unencrypted APs via the other network dialog
* Wed Oct 24 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn3020
- Fix WPA Enterprise connections that use certificates
- Better display of SSIDs in the menu
* Wed Oct 24 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn3016
- Fix getting current access point
- Fix WPA Enterprise connections
- Wireless dialog now defaults to sensible choices based on the connection
- Tell nscd to restart if needed, don't silently kill it
* Tue Oct 23 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn3014
- Suppress excessive GConf updates which sometimes caused secrets to be cleared
at the wrong times, causing connections to fail
- Various EAP and LEAP related fixes
* Tue Oct 23 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn3008
- Make WPA-EAP and Dynamic WEP options connect successfully
- Static IPs are now handled correctly in NM itself
* Mon Oct 22 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2995
- Add Dynamic WEP as a supported authentication/security option
* Sun Oct 21 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2994
- Re-enable "Connect to other network"
- Switch to new GUI bits for wireless security config and password entry
* Tue Oct 16 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2983 * Tue Oct 16 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2983
- Add rfkill functionality - Add rfkill functionality

20
nm-applet-0.7.0-applet-usb-vendor-fix.patch Normal file
View File

@ -0,0 +1,20 @@
diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.usb-vendor-fix NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c
--- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.usb-vendor-fix 2007-11-01 06:49:55.000000000 -0400
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c 2007-11-01 06:50:57.000000000 -0400
@@ -1515,6 +1515,16 @@ sort_devices (gconstpointer a, gconstpoi
char *bb_desc = nm_device_get_description (bb);
gint ret;
+ if (!aa_desc && bb_desc) {
+ g_free (bb_desc);
+ return -1;
+ } else if (aa_desc && !bb_desc) {
+ g_free (aa_desc);
+ return 1;
+ } else if (!aa_desc && !bb_desc) {
+ return 0;
+ }
+
ret = strcmp (aa_desc, bb_desc);
g_free (aa_desc);

8
nm-applet-0.7.0-disable-stuff.patch
View File

@ -1,14 +1,6 @@
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 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.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 +++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c 2007-09-25 14:43:31.000000000 -0400
@@ -1146,6 +1146,7 @@ static void nma_menu_add_custom_essid_it
label = gtk_label_new_with_mnemonic (_("_Connect to Other Wireless Network..."));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_container_add (GTK_CONTAINER (menu_item), label);
+ gtk_widget_set_sensitive (menu_item, FALSE);
gtk_widget_show_all (menu_item);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
g_signal_connect (menu_item, "activate", G_CALLBACK (custom_essid_item_selected), applet);
@@ -1167,6 +1168,7 @@ nma_menu_add_create_network_item (GtkWid @@ -1167,6 +1168,7 @@ nma_menu_add_create_network_item (GtkWid
label = gtk_label_new_with_mnemonic (_("Create _New Wireless Network...")); label = gtk_label_new_with_mnemonic (_("Create _New Wireless Network..."));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);

4
sources
View File

@ -1,2 +1,2 @@
7d3d314520cfa6499819c7243a14ac14 NetworkManager-0.7.0.svn2983.tar.gz 80a4e166b219a7fadfb760870d0585ab NetworkManager-0.7.0.svn3030.tar.gz
31bd3952fa8786c47ea3fac67a00255f nm-applet-0.7.0.svn261.tar.gz a8af8c29954daaf1ff7b79d286894992 nm-applet-0.7.0.svn302.tar.gz