[kde-plasma-networkmanagement/f18: 2/2] Merge branch 'f18'

[Rex Dieter]

commit afd5a5c6720eeaf95891f075ac31741fd3de126f
Merge: 713d1df db8db28
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Dec 6 11:32:11 2012 -0600

    Merge branch 'f18'

 ...-about-things-that-must-not-go-to-the-log.patch |   27 +++
 ...crets-in-password-dialog-for-wifi-connect.patch |  223 ++++++++++++++++++++
 ...Condtion-wakeAll-call-with-mutex-lock-unl.patch |   28 +++
 ...cf-files-can-have-string-keys-either-as-k.patch |  169 +++++++++++++++
 0016-Text-formatting.patch                         |   45 ++++
 0022-Use-correct-default-password-mode.patch       |   86 ++++++++
 ...error-message-if-loading-vpn-plugin-fails.patch |   25 +++
 ...ionSecretsJob-doAskUser-for-vpn-connectio.patch |   26 +++
 kde-plasma-networkmanagement.spec                  |   23 ++-
 9 files changed, 650 insertions(+), 2 deletions(-)
---
diff --cc kde-plasma-networkmanagement.spec
index 78d9d8c,9ea8ab2..3985672
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@@ -1,11 -1,13 +1,11 @@@
  Name:           kde-plasma-networkmanagement
  Epoch:          1
  Version:        0.9.0.5
- Release:        2%{?dist}
+ Release:        3%{?dist}
  Summary:        NetworkManager KDE 4 integration
  
 -Group:          Applications/Internet
  License:        (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2
  URL:            https://projects.kde.org/projects/extragear/base/networkmanagement 
 -BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
  # yes, 0.9.0 is still under "unstable"
  Source0:        http://download.kde.org/unstable/networkmanagement/%{version}/src/networkmanagement-%{version}.tar.bz2