diff --git a/kf5-networkmanager-qt.spec b/kf5-networkmanager-qt.spec index f85e5de..020ccab 100644 --- a/kf5-networkmanager-qt.spec +++ b/kf5-networkmanager-qt.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.23.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Tier 1 KDE Frameworks 5 module that wraps NetworkManager DBus API License: LGPLv2+ @@ -17,6 +17,8 @@ URL: https://quickgit.kde.org/?p=%{framework}.git %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +Patch0: nm-qt-do-not-set-peap-label-based-on-peap-version + BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-devel @@ -59,8 +61,7 @@ that use NetworkManager. %prep -%autosetup -n %{framework}-%{version} - +%autosetup -p1 -n %{framework}-%{version} %build mkdir %{_target_platform} @@ -92,6 +93,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Jun 28 2016 Jan Grulich - 5.23.0-2 +- Do not set peap label based on peap version + * Tue Jun 07 2016 Daniel Vrátil - 5.23.0-1 - KDE Frameworks 5.23.0 diff --git a/nm-qt-do-not-set-peap-label-based-on-peap-version.patch b/nm-qt-do-not-set-peap-label-based-on-peap-version.patch new file mode 100644 index 0000000..6cef767 --- /dev/null +++ b/nm-qt-do-not-set-peap-label-based-on-peap-version.patch @@ -0,0 +1,31 @@ +From 555b144a330f62c00813226d41be5f1ddfd32b03 Mon Sep 17 00:00:00 2001 +From: Jan Grulich +Date: Tue, 28 Jun 2016 14:57:21 +0200 +Subject: Do not set peap label based on peap version + + +diff --git a/src/settings/security8021xsetting.cpp b/src/settings/security8021xsetting.cpp +index 8be37e7..888fc94 100644 +--- a/src/settings/security8021xsetting.cpp ++++ b/src/settings/security8021xsetting.cpp +@@ -891,7 +891,19 @@ QVariantMap NetworkManager::Security8021xSetting::toMap() const + + if (!version.isEmpty()) { + setting.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPVER), version); +- setting.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPLABEL), "1"); ++ } ++ ++ QString peapLabel; ++ switch (phase1PeapLabel()) { ++ case PeapLabelForce: ++ peapLabel = '1'; ++ break; ++ case PeapLabelUnknown: ++ break; ++ } ++ ++ if (!peapLabel.isEmpty()) { ++ setting.insert(QLatin1String(NM_SETTING_802_1X_PHASE1_PEAPLABEL), peapLabel); + } + + QString provisioning;