Hello community,
here is the log from the commit of package libKF5NetworkManagerQt for
openSUSE:Factory checked in at 2016-01-20 09:49:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libKF5NetworkManagerQt (Old)
and /work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libKF5NetworkManagerQt"
Changes:
--------
---
/work/SRC/openSUSE:Factory/libKF5NetworkManagerQt/libKF5NetworkManagerQt.changes
2015-12-29 12:58:13.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libKF5NetworkManagerQt.new/libKF5NetworkManagerQt.changes
2016-01-20 09:49:08.000000000 +0100
@@ -1,0 +2,9 @@
+Sat Jan 2 17:46:05 UTC 2016 - [email protected]
+
+- Update to 5.18.0
+ * Make it work with older NM versions
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.18.0.php
+- Drop upstreamed 0001-make-it-work-with-older-NM-versions.patch
+
+-------------------------------------------------------------------
Old:
----
0001-make-it-work-with-older-NM-versions.patch
networkmanager-qt-5.17.0.tar.xz
New:
----
networkmanager-qt-5.18.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libKF5NetworkManagerQt.spec ++++++
--- /var/tmp/diff_new_pack.uN1Tel/_old 2016-01-20 09:49:09.000000000 +0100
+++ /var/tmp/diff_new_pack.uN1Tel/_new 2016-01-20 09:49:09.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libKF5NetworkManagerQt
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,9 @@
%define soversion 6
-%define _tar_path 5.17
+%define _tar_path 5.18
Name: libKF5NetworkManagerQt
-Version: 5.17.0
+Version: 5.18.0
Release: 0
Summary: A Qt wrapper for NetworkManager DBus API
License: LGPL-2.1 or LGPL-3.0
@@ -27,8 +27,6 @@
Url: http://www.kde.org
Source:
http://download.kde.org/stable/frameworks/%{_tar_path}/networkmanager-qt-%{version}.tar.xz
Source1: baselibs.conf
-# PATCH-FIX-UPSTREAM 0001-make-it-work-with-older-NM-versions.patch -- Some
missing #ifdefs to build with NM >= 0.9.8
-Patch0: 0001-make-it-work-with-older-NM-versions.patch
BuildRequires: cmake
BuildRequires: extra-cmake-modules >= %{_tar_path}
BuildRequires: kf5-filesystem
@@ -75,7 +73,6 @@
%prep
%setup -q -n networkmanager-qt-%{version}
-%patch0 -p1
%build
%cmake_kf5 -d build
++++++ networkmanager-qt-5.17.0.tar.xz -> networkmanager-qt-5.18.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.17.0/CMakeLists.txt
new/networkmanager-qt-5.18.0/CMakeLists.txt
--- old/networkmanager-qt-5.17.0/CMakeLists.txt 2015-12-06 15:59:59.000000000
+0100
+++ new/networkmanager-qt-5.18.0/CMakeLists.txt 2016-01-01 21:08:45.000000000
+0100
@@ -3,7 +3,7 @@
project(NetworkManagerQt)
include(FeatureSummary)
-find_package(ECM 5.17.0 NO_MODULE)
+find_package(ECM 5.18.0 NO_MODULE)
set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake
Modules." URL
"https://projects.kde.org/projects/kdesupport/extra-cmake-modules";)
feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND
FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -32,7 +32,7 @@
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-set(KF5_VERSION "5.17.0") # handled by release scripts
+set(KF5_VERSION "5.18.0") # handled by release scripts
ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX NETWORKMANAGERQT
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/networkmanagerqt_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/networkmanager-qt-5.17.0/src/activeconnection.cpp
new/networkmanager-qt-5.18.0/src/activeconnection.cpp
--- old/networkmanager-qt-5.17.0/src/activeconnection.cpp 2015-12-06
15:59:59.000000000 +0100
+++ new/networkmanager-qt-5.18.0/src/activeconnection.cpp 2016-01-01
21:08:45.000000000 +0100
@@ -113,6 +113,7 @@
Q_EMIT stateChanged(d->state);
}
+#if NM_CHECK_VERSION(0, 9, 10)
QDBusObjectPath ip4ConfigObjectPath = d->iface.ip4Config();
if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() !=
d->ipV4ConfigPath) {
d->ipV4ConfigPath = ip4ConfigObjectPath.path();
@@ -136,6 +137,7 @@
d->dhcp6ConfigPath = dhcp6ConfigObjectPath.path();
Q_EMIT dhcp6ConfigChanged();
}
+#endif
}
NetworkManager::ActiveConnection::ActiveConnection(ActiveConnectionPrivate
&dd, QObject *parent)
@@ -154,6 +156,7 @@
Q_EMIT stateChanged(d->state);
}
+#if NM_CHECK_VERSION(0, 9, 10)
QDBusObjectPath ip4ConfigObjectPath = d->iface.ip4Config();
if (!ip4ConfigObjectPath.path().isNull() && ip4ConfigObjectPath.path() !=
d->ipV4ConfigPath) {
d->ipV4ConfigPath = ip4ConfigObjectPath.path();
@@ -177,6 +180,7 @@
d->dhcp6ConfigPath = dhcp6ConfigObjectPath.path();
Q_EMIT dhcp6ConfigChanged();
}
+#endif
}
NetworkManager::ActiveConnection::~ActiveConnection()
