[kde-plasma-networkmanagement: 3/3] 0.9.0.6

Rex Dieter rdieter at fedoraproject.org
Sat Jan 5 20:18:07 UTC 2013


commit 6a453d4bff8b0c3f17c5af78641c507d95112d27
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Jan 5 14:18:28 2013 -0600

    0.9.0.6

 .gitignore                                         |    3 +-
 ...-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                  |   33 +---
 sources                                            |    2 +-
 11 files changed, 10 insertions(+), 657 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8de2c09..4179987 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/networkmanagement-0.9.0.4.tar.bz2
-/networkmanagement-0.9.0.5.tar.bz2
+/networkmanagement-0.9.0.6.tar.bz2
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 3985672..b58395b 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -1,7 +1,7 @@
 Name:           kde-plasma-networkmanagement
 Epoch:          1
-Version:        0.9.0.5
-Release:        3%{?dist}
+Version:        0.9.0.6
+Release:        1%{?dist}
 Summary:        NetworkManager KDE 4 integration
 
 License:        (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and LGPLv2
@@ -14,18 +14,10 @@ Source0:        http://download.kde.org/unstable/networkmanagement/%{version}/sr
 Source10: 00-fedora-networkmanagement.js
 
 ## upstream patches
-Patch102: 0002-Add-warning-about-things-that-must-not-go-to-the-log.patch
-Patch104: 0004-Pre-fill-secrets-in-password-dialog-for-wifi-connect.patch
-Patch114: 0014-guard-QWaitCondtion-wakeAll-call-with-mutex-lock-unl.patch
-Patch115: 0015-CISCO-vpn-pcf-files-can-have-string-keys-either-as-k.patch
-Patch116: 0016-Text-formatting.patch
-Patch122: 0022-Use-correct-default-password-mode.patch
-patch125: 0025-Print-error-message-if-loading-vpn-plugin-fails.patch
-Patch126: 0026-Fix-ConnectionSecretsJob-doAskUser-for-vpn-connectio.patch
 
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
-BuildRequires:  kdebase-workspace-devel
+BuildRequires:  kde-workspace-devel
 # really just a runtime dep, meh -- Rex
 BuildRequires:  mobile-broadband-provider-info-devel
 # use pkgconfig() to avoid need for tracking nm epoch
@@ -40,7 +32,7 @@ Obsoletes: kde-plasma-networkmanagement < 0.1-0.21
 Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
 
 Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
+Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}
 
 Obsoletes: knetworkmanager < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:  knetworkmanager = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -95,19 +87,10 @@ Requires:       NetworkManager-openconnect
 %{summary}.
 %endif
 
+
 %prep
 %setup -q -n networkmanagement-%{version}
 
-%patch102 -p1 -b .0002
-%patch104 -p1 -b .0004
-%patch114 -p1 -b .0014
-%patch115 -p1 -b .0015
-%patch116 -p1 -b .0016
-%patch122 -p1 -b .0022
-%patch125 -p1 -b .0025
-%patch126 -p1 -b .0026
-
-
 
 %build
 if [ -x %{_bindir}/plasma-dataengine-depextractor ] ; then
@@ -158,9 +141,6 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_pptp*
 rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_vpnc*
 %endif
 
-%clean
-rm -rf %{buildroot}
-
 
 %post
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null || :
@@ -230,6 +210,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
 
 
 %changelog
+* Sat Jan 05 2013 Rex Dieter <rdieter at fedoraproject.org> 0.9.0.6-1
+- 0.9.0.6
+
 * Thu Dec 06 2012 Rex Dieter <rdieter at fedoraproject.org> 0.9.0.5-3
 - backport upstream vpn-related fixes (#882308)
 
diff --git a/sources b/sources
index c884050..ef8a72d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df548f476134cb9ca3fbcf82458013e6  networkmanagement-0.9.0.5.tar.bz2
+b1c780bed7862ba5aa3fc0305682fc19  networkmanagement-0.9.0.6.tar.bz2


More information about the scm-commits mailing list