[NetworkManager/f18] Update to 0.9.8.2 release

[Daniel Williams]

commit b9503395275a3c79ceeab77599b58c52e1974c3a
Author: Dan Williams <dcbw at redhat.com>
Date:   Fri Jun 7 17:05:41 2013 -0500

    Update to 0.9.8.2 release

 NetworkManager.spec |   48 +++++++++++++++++++++++-------------------------
 sources             |    2 +-
 2 files changed, 24 insertions(+), 26 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index ddb2940..fcbaaf5 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,8 +6,8 @@
 %define libnl3_version 3.2.7
 %define ppp_version 2.4.5
 
-%define snapshot .git20130515
-%define realversion 0.9.8.1
+%define snapshot %{nil}
+%define realversion 0.9.8.2
 
 %global regen_docs 0
 
@@ -17,19 +17,18 @@
 %define systemd_dir %{_prefix}/lib/systemd/system
 %endif
 
-# NOTE! gtk-doc conflicts with hardened build: https://bugzilla.redhat.com/show_bug.cgi?id=892837
 %global _hardened_build 1
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.9.8.1
-Release: 4%{snapshot}%{?dist}
+Version: 0.9.8.2
+Release: 1%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 
-Source: %{name}-%{realversion}%{snapshot}.tar.bz2
+Source: %{name}-%{realversion}%{snapshot}.tar.xz
 Source1: NetworkManager.conf
 Patch1: explain-dns1-dns2.patch
 
@@ -38,9 +37,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(post): systemd-sysv
-Requires(post): /bin/systemctl
-Requires(preun): /bin/systemctl
-Requires(postun): /bin/systemctl
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
@@ -92,7 +91,7 @@ BuildRequires: iptables
 %ifnarch s390 s390x
 BuildRequires: wimax-devel
 %endif
-BuildRequires: systemd systemd-devel
+BuildRequires: systemd >= 200-3 systemd-devel
 %if 0%{?fedora} && 0%{?fedora} < 17
 # systemd.pc is in systemd-units for F16 and below
 BuildRequires: systemd-units
@@ -231,18 +230,15 @@ install -m 0755 test/.libs/nm-online %{buildroot}/%{_bindir}
 %{__cp} ORIG-docs/libnm-util/html/* $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libnm-util/
 %endif
 
-mkdir -p $RPM_BUILD_ROOT%{systemd_dir}/remote-fs-pre.target.wants
-ln -s ../NetworkManager-wait-online.service $RPM_BUILD_ROOT%{systemd_dir}/remote-fs-pre.target.wants
+mkdir -p $RPM_BUILD_ROOT%{systemd_dir}/network-online.target.wants
+ln -s ../NetworkManager-wait-online.service $RPM_BUILD_ROOT%{systemd_dir}/network-online.target.wants
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
 %post
-if [ $1 -eq 1 ] ; then 
-    # Initial installation
-    /bin/systemctl enable NetworkManager.service >/dev/null 2>&1 || :
-fi
+%systemd_post NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -252,15 +248,10 @@ if [ $1 -eq 0 ]; then
     # Don't kill networking entirely just on package remove
     #/bin/systemctl stop NetworkManager.service >/dev/null 2>&1 || :
 fi
+%systemd_preun NetworkManager-wait-online.service NetworkManager-dispatcher.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    # Don't restart networking to prevent hiccups
-    #/bin/systemctl try-restart NetworkManager.service >/dev/null 2>&1 || :
-    true
-fi
+%systemd_postun
 
 %triggerun -- NetworkManager < 1:0.8.990
 # Save the current service runlevel info
@@ -310,6 +301,7 @@ exit 0
 %{_mandir}/man8/*
 %dir %{_localstatedir}/lib/NetworkManager
 %dir %{_sysconfdir}/NetworkManager/system-connections
+%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
 %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
 %{_datadir}/polkit-1/actions/*.policy
@@ -317,8 +309,8 @@ exit 0
 # systemd stuff
 %{systemd_dir}/NetworkManager.service
 %{systemd_dir}/NetworkManager-wait-online.service
-%{systemd_dir}/remote-fs-pre.target.wants/NetworkManager-wait-online.service
-%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManager.service
+%{systemd_dir}/NetworkManager-dispatcher.service
+%{systemd_dir}/network-online.target.wants/NetworkManager-wait-online.service
 
 %ifnarch s390 s390x
 %files wimax
@@ -369,6 +361,12 @@ exit 0
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Fri Jun  7 2013 Dan Williams <dcbw at redhat.com> - 0.9.8.2-1
+- Update to 0.9.8.2 release
+- core: fix crash when IPv6 times out on Wi-Fi (rh #970293)
+- Update for systemd network-online.target (rh #787314)
+- Add system service for the script dispatcher (rh #948433)
+
 * Fri May 17 2013 Dan Williams <dcbw at redhat.com> - 0.9.8.1-4.git20130515
 - core: fix potential crash removing slaves from bond/bridge masters
 
diff --git a/sources b/sources
index 967a8b9..8635474 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-450c03b20d6af099afdb6b16508fa3c5  NetworkManager-0.9.8.1.git20130515.tar.bz2
+7ac4ee1652e77ba064a5e18dc7af7e25  NetworkManager-0.9.8.2.tar.xz