[kde-plasma-nm] Update to the latest git snapshot

Jan Grulich jgrulich at fedoraproject.org
Wed Jul 2 17:29:05 UTC 2014


commit 6cae64adc4d3aabfa3e140ed38d7a23f633907dd
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Wed Jul 2 19:29:02 2014 +0200

    Update to the latest git snapshot

 kde-plasma-nm.spec                 |   19 +++++++++++--------
 sources                            |    2 +-
 vpn-crash-plasma-nm-0.9.3.4.patch  |   19 -------------------
 wifi-crash-plasma-nm-0.9.3.4.patch |   17 -----------------
 4 files changed, 12 insertions(+), 45 deletions(-)
---
diff --git a/kde-plasma-nm.spec b/kde-plasma-nm.spec
index e63b790..77de538 100644
--- a/kde-plasma-nm.spec
+++ b/kde-plasma-nm.spec
@@ -1,7 +1,7 @@
-%global         git_commit 043bbae
+%global         git_commit 61bb6a0
 Name:           kde-plasma-nm
 Version:        0.9.3.4
-Release:        5.20140520git%{git_commit}%{?dist}
+Release:        6.20140702git%{git_commit}%{?dist}
 Summary:        Plasma applet written in QML for managing network connections
 License:        LGPLv2+ and GPLv2+
 URL:            https://projects.kde.org/projects/playground/network/plasma-nm
@@ -12,9 +12,6 @@ Source0:        plasma-nm-%{version}.tar.xz
 # Add plasma-nm to default systray if needed, for upgraders...
 Source10: 01-fedora-plasma-nm.js
 
-Patch0:   vpn-crash-plasma-nm-0.9.3.4.patch
-Patch1:   wifi-crash-plasma-nm-0.9.3.4.patch
-
 BuildRequires:  gettext
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kde-workspace-devel
@@ -28,6 +25,9 @@ BuildRequires:  pkgconfig(openconnect) >= 4.00
 %endif
 
 Requires:  NetworkManager >= 0.9.8
+%if 0%{?fedora} > 20
+Requires:  NetworkManager-wifi >= 0.9.8
+%endif
 Requires:  libnm-qt >= 2:0.9.8.2
 
 Obsoletes: kde-plasma-networkmanagement < 1:0.9.1.0
@@ -42,6 +42,9 @@ the default NetworkManager service.
 # Required for properly working GMS/CDMA connections
 %package mobile
 Summary: Mobile support for %{name}
+%if 0%{?fedora} > 20
+Requires:  NetworkManager-wwan >= 0.9.8
+%endif
 Requires:  ModemManager
 Requires:  mobile-broadband-provider-info
 Requires:  libmm-qt >= 1.0.2
@@ -112,9 +115,6 @@ Provides:       kde-plasma-networkmanagement-pptp = 1:%{version}-%{release}
 %prep
 %setup -qn plasma-nm-%{version}
 
-%patch0 -p1 -b .vpn-crash
-%patch1 -p1 -b .wifi-crash
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
@@ -231,6 +231,9 @@ fi
 %endif
 
 %changelog
+* Wed Jul 02 2014 Jan Grulich <jgrulich at redhat.com> - 0.9.3.4-6.20140702git61bb6a0
+- update git snapshot
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3.4-5.20140520git043bbae
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 179e3bb..667a41a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-27d898b127db0192ee102fcbf93ca821  plasma-nm-0.9.3.4.tar.xz
+33a569e847f2bcc437f7d1bf748e6f25  plasma-nm-0.9.3.4.tar.xz


More information about the scm-commits mailing list