- core: read nm-system-settings.conf before NetworkManager.conf (rh

#606160)
- core: fix editing system DSL connections when using keyfile plugin
- core: work around inconsistent proprietary driver associated AP reporting
- core: ensure empty VPN secrets are not used (rh #587784)
- core: don't request WiFi scans when connection is locked to a specific
    BSSID
- cli: show IPv6 settings and configuration
- applet: updated translations
- editor: fix a PolicyKit-related crash editing connections (rh #603566)
- applet: fix saving the ignore-missing-CA-cert preference (rh #610084)
- editor: fix listing connections on PPC64 (rh #608663)
- editor: ensure editor windows are destroyed when closed (rh #572466)

.cvsignore

@@ -186,3 +186,6 @@ nmcli-git20100129.tar.bz2
 NetworkManager-0.7.999.git20100211.tar.bz2
 network-manager-applet-0.7.999.git20100211.tar.bz2
 nmcli-git20100211.tar.bz2
+NetworkManager-0.8.git20100219.tar.bz2
+network-manager-applet-0.8.git20100219.tar.bz2
+nmcli-git20100219.tar.bz2

NetworkManager.spec

@@ -9,28 +9,25 @@
 %define libnl_version 1.1
 %define ppp_version 2.4.5
 
-%define snapshot .git20100211
-%define applet_snapshot .git20100211
-%define nmcli_snapshot -git20100211
-%define realversion 0.7.999
+%define snapshot %{nil}
+%define applet_snapshot %{nil}
+%define realversion 0.8.1
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.8.0
-Release: 0.4%{snapshot}%{?dist}
+Version: 0.8.1
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
 Source: %{name}-%{realversion}%{snapshot}.tar.bz2
 Source1: network-manager-applet-%{realversion}%{applet_snapshot}.tar.bz2
-Source2: nm-system-settings.conf
-Source3: nmcli%{nmcli_snapshot}.tar.bz2
+Source2: NetworkManager.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
 Patch3: nm-applet-no-notifications.patch
-Patch4: nmcli-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): chkconfig
@@ -48,7 +45,7 @@ Requires: avahi-autoipd
 Requires: dnsmasq
 Requires: udev
 Requires: mobile-broadband-provider-info >= 0.20090602
-Requires: ModemManager >= 0.2-3.20090826
+Requires: ModemManager >= 0.3-3.git20100317
 Obsoletes: dhcdbd
 
 Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
@@ -80,7 +77,6 @@ BuildRequires: gtk-doc
 BuildRequires: libudev-devel
 BuildRequires: libuuid-devel
 BuildRequires: libgudev1-devel >= 143
-BuildRequires: cmake
 BuildRequires: desktop-file-utils
 # No bluetooth on s390
 %ifnarch s390 s390x
@@ -157,12 +153,10 @@ NetworkManager functionality from applications that use glib.
 
 # unpack the applet and nmcli
 tar -xjf %{SOURCE1}
-tar -xjf %{SOURCE3}
 
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
 %patch3 -p1 -b .no-notifications
-%patch4 -p1 -b .nmcli-buildfix
 
 %build
 
@@ -181,16 +175,11 @@ autoreconf -i
 	--with-docs=yes \
 	--with-system-ca-path=/etc/pki/tls/certs \
 	--with-tests=yes \
-	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version}
+	--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
+	--with-dist-version=%{version}-%{release}
 
 make %{?_smp_mflags}
 
-# build the applet
-pushd nmcli
-	cmake .
-	make %{?_smp_mflags}
-popd
-
 # build the applet
 pushd network-manager-applet-%{realversion}
 	autoreconf -i
@@ -222,8 +211,6 @@ popd
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_localstatedir}/lib/NetworkManager
 
-%{__cp} nmcli/src/nmcli $RPM_BUILD_ROOT%{_bindir}/
-
 %find_lang %{name}
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
@@ -312,13 +299,14 @@ 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-ifcfg-rh.conf
 %config %{_sysconfdir}/rc.d/init.d/NetworkManager
 %{_sbindir}/%{name}
 %{_bindir}/nmcli
 %dir %{_sysconfdir}/%{name}/
 %dir %{_sysconfdir}/%{name}/dispatcher.d
 %dir %{_sysconfdir}/%{name}/VPN
-%config(noreplace) %{_sysconfdir}/%{name}/nm-system-settings.conf
+%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
 %{_bindir}/nm-tool
 %{_bindir}/nm-online
 %{_libexecdir}/nm-dhcp-client.action
@@ -327,6 +315,7 @@ fi
 %dir %{_libdir}/NetworkManager
 %{_libdir}/NetworkManager/*.so*
 %{_mandir}/man1/*
+%{_mandir}/man5/*
 %{_mandir}/man8/*
 %dir %{_localstatedir}/run/NetworkManager
 %dir %{_localstatedir}/lib/NetworkManager
@@ -389,6 +378,139 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Thu Jul 22 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-1
+- core: read nm-system-settings.conf before NetworkManager.conf (rh #606160)
+- core: fix editing system DSL connections when using keyfile plugin
+- core: work around inconsistent proprietary driver associated AP reporting
+- core: ensure empty VPN secrets are not used (rh #587784)
+- core: don't request WiFi scans when connection is locked to a specific BSSID
+- cli: show IPv6 settings and configuration
+- applet: updated translations
+- editor: fix a PolicyKit-related crash editing connections (rh #603566)
+- applet: fix saving the ignore-missing-CA-cert preference (rh #610084)
+- editor: fix listing connections on PPC64 (rh #608663)
+- editor: ensure editor windows are destroyed when closed (rh #572466)
+
+* Thu Jul  1 2010 Matthias Clasen <mclasen@redhatcom> - 0.8.1-0.5
+- Rebuild against new gnome-bluetooth
+
+* Fri Jun 25 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.4
+- Update to 0.8.1 release candidate
+- core: fix WWAN hardware enable state tracking (rh #591622)
+- core: fix Red Hat initscript return value on double-start (rh #584321)
+- core: add multicast route entry for IPv4 link-local connections
+- core: fix connection sharing in cases where a dnsmasq config file exists
+- core: fix handling of Ad-Hoc wifi connections to indicate correct network
+- core: ensure VPN interface name is passed to dispatcher when VPN goes down
+- ifcfg-rh: fix handling of ASCII WEP keys
+- ifcfg-rh: fix double-quoting of some SSIDs (rh #606518)
+- applet: ensure deleted connections are actually forgotten (rh #618973)
+- applet: don't crash if the AP's BSSID isn't availabe (rh #603236)
+- editor: don't crash on PolicyKit events after windows are closed (rh #572466)
+
+* Wed May 26 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.3
+- core: fix nm-online crash (rh #593677)
+- core: fix failed suspend disables network (rh #589108)
+- core: print out missing firmware errors (rh #594578)
+- applet: fix device descriptions for some mobile broadband devices
+- keyfile: bluetooth fixes
+- applet: updated translations (rh #589230)
+
+* Wed May 19 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.2.git20100519
+- core: use GIO in local mode only (rh #588745)
+- core: updated translations (rh #589230)
+- core: be more lenient in IPv6 RDNSS server expiry (rh #590202)
+- core: fix headers to be C++ compatible (rh #592783)
+- applet: updated translations (rh #589230)
+- applet: lock connections with well-known SSIDs to their specific AP
+
+* Mon May 10 2010 Dan Williams <dcbw@redhat.com> - 0.8.1-0.1.git20100510
+- core: fix handling of IPv6 RA flags when router goes away (rh #588560)
+- bluetooth: fix crash configuring DUN connections from the wizard (rh #590666)
+
+* Sun May  9 2010 Dan Williams <dcbw@redhat.com> - 0.8-13.git20100509
+- core: restore initial accept_ra value for IPv6 ignored connections (rh #588619)
+- bluetooth: fix bad timeout on PAN connections (rh #586961)
+- applet: updated translations
+
+* Wed May  4 2010 Dan Williams <dcbw@redhat.com> - 0.8-12.git20100504
+- core: treat missing IPv6 configuration as ignored (rh #588814)
+- core: don't flush IPv6 link-local routes (rh #587836)
+- cli: update output formatting
+
+* Mon May  3 2010 Dan Williams <dcbw@redhat.com> - 0.8-11.git20100503
+- core: allow IP configuration as long as one method completes (rh #567978)
+- core: don't prematurely remove IPv6 RDNSS nameservers (rh #588192)
+- core: ensure router advertisements are only used when needed (rh #588613)
+- editor: add IPv6 gateway editing capability
+
+* Sun May  2 2010 Dan Williams <dcbw@redhat.com> - 0.8-10.git20100502
+- core: IPv6 autoconf, DHCP, link-local, and manual mode fixes
+- editor: fix saving IPv6 address in user connections
+
+* Thu Apr 29 2010 Dan Williams <dcbw@redhat.com> - 0.8-9.git20100429
+- core: fix crash when IPv6 is enabled and interface is deactivated
+
+* Mon Apr 26 2010 Dan Williams <dcbw@redhat.com> - 0.8-8.git20100426
+- core: fix issues with IPv6 router advertisement mishandling (rh #530670)
+- core: many fixes for IPv6 RA and DHCP handling (rh #538499)
+- core: ignore WWAN ethernet devices until usable (rh #585214)
+- ifcfg-rh: fix handling of WEP passphrases (rh #581718)
+- applet: fix crashes (rh #582938) (rh #582428)
+- applet: fix crash with multiple concurrent authorization requests (rh #585405)
+- editor: allow disabling IPv4 on a per-connection basis
+- editor: add support for IPv6 DHCP-only configurations
+
+* Thu Apr 22 2010 Dan Williams <dcbw@redhat.com> - 0.8-7.git20100422
+- core: fix crash during install (rh #581794)
+- wifi: fix crash when supplicant segfaults after resume (rh #538717)
+- ifcfg-rh: fix MTU handling for wired connections (rh #569319)
+- applet: fix display of disabled mobile broadband devices
+
+* Thu Apr  8 2010 Dan Williams <dcbw@redhat.com> - 0.8-6.git20100408
+- core: fix automatic WiFi connections on resume (rh #578141)
+
+* Thu Apr  8 2010 Dan Williams <dcbw@redhat.com> - 0.8-5.git20100408
+- core: more flexible logging
+- core: fix crash with OLPC mesh devices after suspend
+- applet: updated translations
+- applet: show mobile broadband signal strength and technology in the icon
+- applet: fix continuous password requests for 802.1x connections (rh #576925)
+- applet: many updated translations
+
+* Thu Mar 25 2010 Dan Williams <dcbw@redhat.com> - 0.8-4.git20100325
+- core: fix modem enable/disable
+- core: fix modem default route handling
+
+* Tue Mar 23 2010 Dan Williams <dcbw@redhat.com> - 0.8-3.git20100323
+- core: don't exit early on non-fatal state file errors
+- core: fix Bluetooth connection issues (rh #572340)
+- applet: fix some translations (rh #576056)
+- applet: better feedback when wrong PIN/PUK is entered
+- applet: many updated translations
+- applet: PIN2 unlock not required for normal modem functionality
+- applet: fix wireless secrets dialog display
+
+* Wed Mar 17 2010 Dan Williams <dcbw@redhat.com> - 0.8-2.git20100317
+- man: many manpage updates
+- core: determine classful prefix if non is given via DHCP
+- core: ensure /etc/hosts is always up-to-date and correct (rh #569914)
+- core: support GSM network and roaming preferences
+- applet: startup speed enhancements
+- applet: better support for OTP/token-based WiFi connections (rh #526383)
+- applet: show GSM and CDMA registration status and signal strength when available
+- applet: fix zombie GSM and CDMA devices in the menu
+- applet: remove 4-character GSM PIN/PUK code limit
+- applet: fix insensitive WiFi Create... button (rh #541163)
+- applet: allow unlocking of mobile devices immediately when plugged in
+
+* Fri Feb 19 2010 Dan Williams <dcbw@redhat.com> - 0.8-1.git20100219
+- core: update to final 0.8 release
+- core: fix Bluetooth DUN connections when secrets are needed
+- ifcfg-rh: add helper for initscripts to determine ifcfg connection UUIDs
+- applet: fix Bluetooth connection secrets requests
+- applet: fix rare conflict with other gnome-bluetooth plugins
+
 * Thu Feb 11 2010 Dan Williams <dcbw@redhat.com> - 0.8-0.4.git20100211
 - core: fix mobile broadband PIN handling (rh #543088) (rh #560742)
 - core: better handling of /etc/hosts if hostname was already added by the user

branch

@@ -0,0 +1 @@
+F-13

nm-applet-internal-buildfixes.patch

@@ -1,14 +1,14 @@
-diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac
---- NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac	2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/configure.ac	2009-07-28 13:11:39.261718877 -0400
 @@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
  PKG_CHECK_MODULES(NMA,
  		[dbus-glib-1 >= 0.74
  		 glib-2.0 >= 2.16
--		 NetworkManager >= 0.7.999
--		 libnm-glib >= 0.7.999
--		 libnm-util >= 0.7.999
--		 libnm-glib-vpn >= 0.7.999
+-		 NetworkManager >= 0.8.1
+-		 libnm-glib >= 0.8.1
+-		 libnm-util >= 0.8.1
+-		 libnm-glib-vpn >= 0.8.1
  		 gtk+-2.0 >= 2.14
  		 libglade-2.0
  		 gmodule-export-2.0
@@ -17,15 +17,15 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/configure.ac.buil
  PKG_CHECK_MODULES(GNOME_BLUETOOTH,
  		  gconf-2.0
 -		  gnome-bluetooth-1.0 >= 2.27.6
--		  libnm-util
--		  libnm-glib,
+-		  libnm-util >= 0.8.1
+-		  libnm-glib >= 0.8.1,
 +		  gnome-bluetooth-1.0 >= 2.27.6,
  		  have_gbt=yes, have_gbt=no)
  AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
  
-diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am
---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
 @@ -1,5 +1,9 @@
  bin_PROGRAMS = nm-connection-editor
  
@@ -48,9 +48,9 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/connection-ed
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = \
-diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am
---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -1,3 +1,7 @@
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
@@ -68,9 +68,9 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gconf-helpers
 +	-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.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am
---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
 @@ -6,6 +6,9 @@ INCLUDES = \
  	-I$(top_builddir) \
  	-I${top_builddir}/src/marshallers \
@@ -79,8 +79,8 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetoo
 +	-I${top_srcdir}/../libnm-util \
 +	-I${top_srcdir}/../libnm-glib \
  	$(GNOME_BLUETOOTH_CFLAGS) \
+ 	$(DISABLE_DEPRECATED) \
  	$(WARN_CFLAGS)
- 
 @@ -14,7 +17,9 @@ plugin_LTLIBRARIES = libnma.la
  
  libnma_la_LIBADD = \
@@ -91,10 +91,10 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/gnome-bluetoo
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
  endif
  
- EXTRA_DIST = \
-diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am
---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+ EXTRA_DIST = $(BT_WIDGET_SOURCES)
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
  
  bin_PROGRAMS = nm-applet
@@ -117,9 +117,9 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/Makefile.am.b
  
  gladedir = $(datadir)/nm-applet
  glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am
---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -1,5 +1,9 @@
  SUBDIRS=. tests
  
@@ -139,9 +139,9 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/Makefil
 +	-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.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am
---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/utils/tests/Makefile.am	2009-07-28 11:29:11.686841642 -0400
 @@ -1,4 +1,7 @@
 -INCLUDES = -I$(top_srcdir)/src/utils
 +INCLUDES = -I$(top_srcdir)/src/utils \
@@ -151,9 +151,9 @@ diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/utils/tests/M
  
  noinst_PROGRAMS = test-utils
  
-diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am
---- NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
 @@ -1,5 +1,9 @@
  noinst_LTLIBRARIES = libwireless-security.la
  

nm-applet-no-notifications.patch

@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in.foo NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in
---- NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in.foo	2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.7.999/network-manager-applet-0.7.999/nm-applet.schemas.in	2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in.foo NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in
+--- NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in.foo	2009-10-21 17:23:29.480267635 -0700
++++ NetworkManager-0.8.1/network-manager-applet-0.8.1/nm-applet.schemas.in	2009-10-21 17:39:42.734142996 -0700
 @@ -6,7 +6,7 @@
        <applyto>/apps/nm-applet/disable-connected-notifications</applyto>
        <owner>nm-applet</owner>

nmcli-build.patch

@@ -1,30 +0,0 @@
-diff -up NetworkManager-0.7.999/nmcli/src/CMakeLists.txt.foo NetworkManager-0.7.999/nmcli/src/CMakeLists.txt
---- NetworkManager-0.7.999/nmcli/src/CMakeLists.txt.foo	2010-01-20 18:49:43.561505337 -0800
-+++ NetworkManager-0.7.999/nmcli/src/CMakeLists.txt	2010-01-20 18:51:51.262342074 -0800
-@@ -1,14 +1,15 @@
- FIND_PACKAGE (PkgConfig REQUIRED)
- PKG_CHECK_MODULES (GLIB2 REQUIRED glib-2.0>=2.18 )
- PKG_CHECK_MODULES (DBUS_GLIB REQUIRED dbus-glib-1>=0.76)
--PKG_CHECK_MODULES (NETWORK_MANAGER REQUIRED NetworkManager>=0.7.998)
--PKG_CHECK_MODULES (LIBNM REQUIRED libnm-glib>=0.7.998)
--PKG_CHECK_MODULES (LIBNM REQUIRED libnm-utils>=0.7.998)
-+#PKG_CHECK_MODULES (NETWORK_MANAGER REQUIRED NetworkManager>=0.7.998)
-+#PKG_CHECK_MODULES (LIBNM REQUIRED libnm-glib>=0.7.998)
-+#PKG_CHECK_MODULES (LIBNM REQUIRED libnm-utils>=0.7.998)
- 
- INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS})
- INCLUDE_DIRECTORIES (${DBUS_GLIB_INCLUDE_DIRS})
--INCLUDE_DIRECTORIES (${NETWORK_MANAGER_INCLUDE_DIRS})
--INCLUDE_DIRECTORIES (${LIBNM_INCLUDE_DIRS})
-+INCLUDE_DIRECTORIES (../../include)
-+INCLUDE_DIRECTORIES (../../libnm-glib)
-+INCLUDE_DIRECTORIES (../../libnm-util)
- 
- #ADD_DEFINITIONS( -Wall -Werror -std=gnu89 -g -O2 -Wshadow
- ADD_DEFINITIONS( -Wall -std=gnu89 -g -O0 -Wshadow
-@@ -28,4 +29,4 @@ set (NMCLI_SRC
- 
- ADD_EXECUTABLE (nmcli ${NMCLI_SRC})
- 
--TARGET_LINK_LIBRARIES (nmcli ${LIBNM_LIBRARIES})
-+TARGET_LINK_LIBRARIES (nmcli -L../../libnm-util/.libs/ -L../../libnm-glib/.libs/ -lnm-glib -lnm-util -lnm-glib-vpn ${DBUS_GLIB_LIBRARIES})

sources

@@ -1,3 +1,2 @@
-b80c04c5e10b0d1dae5b76efa39ca65b  NetworkManager-0.7.999.git20100211.tar.bz2
-76577af2ffd1a70b5ddd7879a845ca6b  network-manager-applet-0.7.999.git20100211.tar.bz2
-6e0d95a40d197a4c5afa920ea6ad4ea7  nmcli-git20100211.tar.bz2
+96e551149dda8f6e0a5621f77468ba79  NetworkManager-0.8.1.tar.bz2
+b709808c1a5cfe8236061b5da4907313  network-manager-applet-0.8.1.tar.bz2