From c3173c2c6de23a6e2b5bc0cd1ba5cd37853f4194 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Jul 28 2009 15:35:12 +0000 Subject: - Update to upstream 'master' branch - Use modem-manager for better 3G modem support - Integrated system settings with NetworkManager itself - Use udev instead of HAL --- diff --git a/.cvsignore b/.cvsignore index 977f7e6..2bd9d96 100644 --- a/.cvsignore +++ b/.cvsignore @@ -153,3 +153,5 @@ NetworkManager-0.7.0.100.git20090408.tar.bz2 network-manager-applet-0.7.0.100.svn1260.tar.bz2 NetworkManager-0.7.1.git20090414.tar.bz2 network-manager-applet-0.7.1.tar.bz2 +NetworkManager-0.7.995.git20090728.tar.bz2 +network-manager-applet-0.7.995.git20090728.tar.bz2 diff --git a/NetworkManager.spec b/NetworkManager.spec index e595c6a..92f6063 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -2,21 +2,20 @@ %define dbus_version 1.1 %define dbus_glib_version 0.73-6 -%define hal_version 0.5.0 %define gtk2_version 2.12.0 %define wireless_tools_version 1:28-0pre9 %define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot .git20090708 -%define applet_snapshot .git20090708 +%define snapshot .git20090728 +%define applet_snapshot .git20090728 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.7.1 -Release: 9%{snapshot}%{?dist} +Version: 0.7.995 +Release: 0%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -26,13 +25,11 @@ Source1: network-manager-applet-%{version}%{applet_snapshot}.tar.bz2 Source2: nm-system-settings.conf Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch -Patch3: nm-applet-file-chooser-validation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} -Requires: hal >= %{hal_version} Requires: iproute Requires: dhclient >= 12:4.1.0 Requires: wpa_supplicant >= 1:0.6.8-4 @@ -43,6 +40,7 @@ Requires: avahi-autoipd Requires: dnsmasq Requires: udev Requires: mobile-broadband-provider-info >= 0.20090602 +Requires: ModemManager >= 0.2 Obsoletes: dhcdbd Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 @@ -53,7 +51,6 @@ Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: wireless-tools-devel >= %{wireless_tools_version} -BuildRequires: hal-devel >= %{hal_version} BuildRequires: glib2-devel gtk2-devel BuildRequires: libglade2-devel BuildRequires: GConf2-devel @@ -62,7 +59,7 @@ BuildRequires: gettext-devel BuildRequires: pkgconfig BuildRequires: wpa_supplicant BuildRequires: libnl-devel >= %{libnl_version} -BuildRequires: libnotify-devel >= 0.3 +BuildRequires: libnotify-devel >= 0.4 BuildRequires: perl(XML::Parser) BuildRequires: automake autoconf intltool libtool BuildRequires: ppp-devel >= %{ppp_version} @@ -72,6 +69,8 @@ BuildRequires: dhclient BuildRequires: gtk-doc BuildRequires: libudev-devel BuildRequires: libuuid-devel +BuildRequires: gnome-bluetooth-libs-devel >= 2.27.7.1-1 +BuildRequires: libgudev1 >= 143 %description NetworkManager attempts to keep an active network connection available at all @@ -146,7 +145,6 @@ tar -xjf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 -%patch3 -p1 -b .file-chooser-validate %build @@ -201,6 +199,7 @@ cat nm-applet.lang >> %{name}.lang %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.la %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.la install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir} @@ -253,10 +252,8 @@ fi %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf %{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf -%{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf %config %{_sysconfdir}/rc.d/init.d/NetworkManager %{_sbindir}/%{name} -%{_sbindir}/nm-system-settings %dir %{_sysconfdir}/%{name}/ %dir %{_sysconfdir}/%{name}/dispatcher.d %dir %{_sysconfdir}/%{name}/VPN @@ -275,12 +272,9 @@ fi %dir %{_datadir}/NetworkManager %{_datadir}/NetworkManager/gdb-cmd %dir %{_sysconfdir}/NetworkManager/system-connections -%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so %{_datadir}/PolicyKit/policy/*.policy -%{udev_scriptdir}/nm-modem-probe -%{udev_scriptdir}/rules.d/*.rules %files devel %defattr(-,root,root,0755) @@ -303,6 +297,7 @@ fi %{_datadir}/icons/hicolor/scalable/apps/*.svg %{_sysconfdir}/xdg/autostart/nm-applet.desktop %dir %{_datadir}/gnome-vpn-properties +%{_libdir}/gnome-bluetooth/plugins/* %files glib %defattr(-,root,root,0755) @@ -327,6 +322,12 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Tue Jul 28 2009 Dan Williams - 0.7.995-0.git20090728 +- Update to upstream 'master' branch +- Use modem-manager for better 3G modem support +- Integrated system settings with NetworkManager itself +- Use udev instead of HAL + * Fri Jul 24 2009 Fedora Release Engineering - 1:0.7.1-9.git20090708 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/nm-applet-file-chooser-validation.patch b/nm-applet-file-chooser-validation.patch deleted file mode 100644 index bca5a73..0000000 --- a/nm-applet-file-chooser-validation.patch +++ /dev/null @@ -1,57 +0,0 @@ -commit 16b389e00a828cfc114cfc0bcaa64d9e247fd890 -Author: Dan Williams -Date: Thu Jul 9 13:37:50 2009 -0400 - - eap: fix file chooser button validation - - file-set only emits on /user/ initiated events, not for example when - the file chooser has finally completed the async file operations after - gtk_file_chooser_set_filename(). - -diff --git a/network-manager-applet-0.7.1/src/wireless-security/eap-method-peap.c b/network-manager-applet-0.7.1/src/wireless-security/eap-method-peap.c -index 8d82fee..d9f4f46 100644 ---- a/network-manager-applet-0.7.1/src/wireless-security/eap-method-peap.c -+++ b/network-manager-applet-0.7.1/src/wireless-security/eap-method-peap.c -@@ -309,7 +309,7 @@ eap_method_peap_new (const char *glade_file, - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE); - gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget), - _("Choose a Certificate Authority certificate...")); -- g_signal_connect (G_OBJECT (widget), "file-set", -+ g_signal_connect (G_OBJECT (widget), "selection-changed", - (GCallback) wireless_security_changed_cb, - parent); - filter = eap_method_default_file_chooser_filter_new (FALSE); -diff --git a/network-manager-applet-0.7.1/src/wireless-security/eap-method-tls.c b/network-manager-applet-0.7.1/src/wireless-security/eap-method-tls.c -index 7d78d07..6912427 100644 ---- a/network-manager-applet-0.7.1/src/wireless-security/eap-method-tls.c -+++ b/network-manager-applet-0.7.1/src/wireless-security/eap-method-tls.c -@@ -311,14 +311,14 @@ setup_filepicker (GladeXML *xml, - * and desensitize the user cert button. - */ - if (privkey) { -- g_signal_connect (G_OBJECT (widget), "file-set", -+ g_signal_connect (G_OBJECT (widget), "selection-changed", - (GCallback) private_key_picker_file_set_cb, - method); - if (filename) - private_key_picker_helper ((EAPMethod *) method, filename, FALSE); - } - -- g_signal_connect (G_OBJECT (widget), "file-set", -+ g_signal_connect (G_OBJECT (widget), "selection-changed", - (GCallback) wireless_security_changed_cb, - parent); - -diff --git a/network-manager-applet-0.7.1/src/wireless-security/eap-method-ttls.c b/network-manager-applet-0.7.1/src/wireless-security/eap-method-ttls.c -index b455fc8..78d0f80 100644 ---- a/network-manager-applet-0.7.1/src/wireless-security/eap-method-ttls.c -+++ b/network-manager-applet-0.7.1/src/wireless-security/eap-method-ttls.c -@@ -341,7 +341,7 @@ eap_method_ttls_new (const char *glade_file, - gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (widget), TRUE); - gtk_file_chooser_button_set_title (GTK_FILE_CHOOSER_BUTTON (widget), - _("Choose a Certificate Authority certificate...")); -- g_signal_connect (G_OBJECT (widget), "file-set", -+ g_signal_connect (G_OBJECT (widget), "selection-changed", - (GCallback) wireless_security_changed_cb, - parent); - filter = eap_method_default_file_chooser_filter_new (FALSE); diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index c49df04..0d07908 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac ---- NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix 2009-04-04 18:03:25.000000000 -0400 -+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac +--- NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac.buildfix 2009-04-04 18:03:25.000000000 -0400 ++++ NetworkManager-0.7.995/network-manager-applet-0.7.995/configure.ac 2009-04-05 08:31:12.000000000 -0400 @@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.74 @@ -12,9 +12,9 @@ diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/configure.ac.buildfix gtk+-2.0 >= 2.14 libglade-2.0 gmodule-export-2.0 -diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am ---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am.buildfix 2009-04-03 09:30:25.000000000 -0400 -+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am +--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am.buildfix 2009-04-03 09:30:25.000000000 -0400 ++++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/connection-editor/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -1,5 +1,9 @@ bin_PROGRAMS = nm-connection-editor @@ -37,9 +37,9 @@ diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/connection-editor if NO_POLKIT_GNOME nm_connection_editor_LDADD += \ -diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am.buildfix 2008-11-26 20:37:43.000000000 -0500 -+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am +--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am.buildfix 2008-11-26 20:37:43.000000000 -0500 ++++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/gconf-helpers/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -57,9 +57,9 @@ diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/gconf-helpers/Mak + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am ---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 -+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am +--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 ++++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -4,6 +4,10 @@ NULL= bin_PROGRAMS = nm-applet @@ -82,9 +82,9 @@ diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/Makefile.am.build gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am ---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 -+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am +--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am.buildfix 2008-11-26 20:37:48.000000000 -0500 ++++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/utils/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -102,9 +102,9 @@ diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/utils/Makefile.am + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + -diff -up NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am ---- NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am.buildfix 2009-04-04 11:33:58.000000000 -0400 -+++ NetworkManager-0.7.1/network-manager-applet-0.7.1/src/wireless-security/Makefile.am 2009-04-05 08:31:12.000000000 -0400 +diff -up NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am +--- NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am.buildfix 2009-04-04 11:33:58.000000000 -0400 ++++ NetworkManager-0.7.995/network-manager-applet-0.7.995/src/wireless-security/Makefile.am 2009-04-05 08:31:12.000000000 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la diff --git a/sources b/sources index 9060a54..12b79cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f361c757fda787a2a90719b9ae668702 NetworkManager-0.7.1.git20090708.tar.bz2 -801d31708a175d2133edc66007667d71 network-manager-applet-0.7.1.git20090708.tar.bz2 +e171cb1a36402cfa749efe54d72f8713 NetworkManager-0.7.995.git20090728.tar.bz2 +5b5496c43ad1b0a257010f38f2d0b6d4 network-manager-applet-0.7.995.git20090728.tar.bz2