diff --git a/.gitignore b/.gitignore index 7a1b8a5..ed2aca0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1 @@ -/networkmanager-qt-5.18.0.tar.xz -/networkmanager-qt-5.19.0.tar.xz -/networkmanager-qt-5.20.0.tar.xz -/networkmanager-qt-5.21.0.tar.xz -/networkmanager-qt-5.22.0.tar.xz -/networkmanager-qt-5.23.0.tar.xz -/networkmanager-qt-5.24.0.tar.xz -/networkmanager-qt-5.25.0.tar.xz -/networkmanager-qt-5.26.0.tar.xz -/networkmanager-qt-5.27.0.tar.xz -/networkmanager-qt-5.29.0.tar.xz -/networkmanager-qt-5.31.0.tar.xz -/networkmanager-qt-5.32.0.tar.xz -/networkmanager-qt-5.33.0.tar.xz +/networkmanager-qt-5.34.0.tar.xz diff --git a/kf5-networkmanager-qt.spec b/kf5-networkmanager-qt.spec index 2875cef..70f716b 100644 --- a/kf5-networkmanager-qt.spec +++ b/kf5-networkmanager-qt.spec @@ -1,8 +1,8 @@ %global framework networkmanager-qt Name: kf5-%{framework} -Version: 5.33.0 -Release: 2%{?dist} +Version: 5.34.0 +Release: 1%{?dist} Summary: A Tier 1 KDE Frameworks 5 module that wraps NetworkManager DBus API License: LGPLv2+ @@ -17,8 +17,6 @@ URL: https://cgit.kde.org/%{framework}.git %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz -Patch0: nm-qt-set-auto-negotiation-based-on-nm-version.patch - BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-devel @@ -97,6 +95,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon May 15 2017 Rex Dieter - 5.34.0-1 +- 5.34.0 + * Wed Apr 12 2017 Jan Grulich - 5.33.0-2 - Set auto-negotiation based on NM version diff --git a/nm-qt-set-auto-negotiation-based-on-nm-version.patch b/nm-qt-set-auto-negotiation-based-on-nm-version.patch deleted file mode 100644 index bf7f0a3..0000000 --- a/nm-qt-set-auto-negotiation-based-on-nm-version.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d039943788dd08a5e2b1611732e3cfb6c2f64f26 Mon Sep 17 00:00:00 2001 -From: Jan Grulich -Date: Wed, 12 Apr 2017 14:02:19 +0200 -Subject: Set default value for auto-negotiation based on running NM version - -When running NM 1.6.0 and newer the default value is false, while previous -versions used to set it to true. ---- - src/settings/wiredsetting.cpp | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/src/settings/wiredsetting.cpp b/src/settings/wiredsetting.cpp -index d366f31..8fb3659 100644 ---- a/src/settings/wiredsetting.cpp -+++ b/src/settings/wiredsetting.cpp -@@ -20,6 +20,7 @@ - - #include "wiredsetting.h" - #include "wiredsetting_p.h" -+#include "manager.h" - - #if !NM_CHECK_VERSION(1, 0, 0) - #include -@@ -32,10 +33,16 @@ NetworkManager::WiredSettingPrivate::WiredSettingPrivate() - , port(NetworkManager::WiredSetting::UnknownPort) - , speed(0) - , duplex(NetworkManager::WiredSetting::UnknownDuplexType) -- , autoNegotiate(false) -+ // , autonegotiate(false) - , mtu(0) - , s390NetType(NetworkManager::WiredSetting::Undefined) --{ } -+{ -+ if (NetworkManager::checkVersion(1, 6, 0)) { -+ autoNegotiate = false; -+ } else { -+ autoNegotiate = true; -+ } -+} - - NetworkManager::WiredSetting::WiredSetting() - : Setting(Setting::Wired) --- -cgit v0.11.2 diff --git a/sources b/sources index 3161160..5344fcb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (networkmanager-qt-5.33.0.tar.xz) = 4e488838d7464ed3a81203d257f0af23759540931ef648e38f0aa985d2958fa170b35ad51821fb5cb10f9def3171be9d879f626bea00b7d473cfd0a338b8d5a3 +SHA512 (networkmanager-qt-5.34.0.tar.xz) = debd4a2e994c9774149c9c9f09f249f9710aaef3356b05d3ce9e31c0630f1c10e384d7b90ecf5e722e18d4416fb3bc970e2f19614e16aa6432eecddd14b4f800