-%define kdeplasmaver 5.11.2
-%define qtver 5.5.1
+%define kdeplasmaver 5.24.0
+%define qtver 5.9.0
%define kpname plasma-nm
%define kf5ver 5.39.0
Summary: plasma-nm
Name: kp5-%{kpname}
-Version: 5.11.2
+Version: 5.24.0
Release: 1
License: LGPL v2.1+
Group: X11/Libraries
Source0: http://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
-# Source0-md5: c9ec6ede05e4e4da18c18d197b43a878
+# Source0-md5: b6e7be0be859d21947284e233d6e2931
URL: http://www.kde.org/
BuildRequires: Qt5Core-devel >= %{qtver}
BuildRequires: cmake >= 2.8.12
+BuildRequires: NetworkManager-devel
BuildRequires: Qt5DBus-devel >= %{qtver}
BuildRequires: Qt5Gui-devel >= %{qtver}
BuildRequires: Qt5Network-devel >= %{qtver}
BuildRequires: Qt5Qml-devel >= %{qtver}
BuildRequires: Qt5Quick-devel >= %{qtver}
BuildRequires: Qt5Test-devel >= %{qtver}
-BuildRequires: Qt5Xml-devel >= %{qtver}
-
-BuildRequires: NetworkManager-devel
BuildRequires: Qt5Widgets-devel >= %{qtver}
+BuildRequires: Qt5Xml-devel >= %{qtver}
BuildRequires: gettext-devel
BuildRequires: kf5-kcompletion-devel
BuildRequires: kf5-kconfigwidgets-devel
BuildRequires: kf5-networkmanager-qt-devel
BuildRequires: kf5-plasma-framework-devel
BuildRequires: kf5-solid-devel
+BuildRequires: ninja
BuildRequires: openconnect-devel >= 3.99
BuildRequires: pkgconfig
BuildRequires: qca-qt5-devel >= 2.1.1
%define qt5dir %{_libdir}/qt5
%description
-KDE Plasma Nm.
+Plasma applet written in QML for managing network connections.
%prep
%setup -q -n %{kpname}-%{version}
%build
install -d build
cd build
-%cmake \
+%cmake -G Ninja \
-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DHTML_INSTALL_DIR=%{_kdedocdir} \
../
-%{__make}
+%ninja_build
%install
rm -rf $RPM_BUILD_ROOT
-
-%{__make} -C build/ install \
- DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
%find_lang %{kpname} --all-name --with-kde
%attr(755,root,root) %{_libdir}/libplasmanm_editor.so
%attr(755,root,root) %{_libdir}/libplasmanm_internal.so
%attr(755,root,root) %{_libdir}/qt5/plugins/kf5/kded/networkmanagement.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/libplasmanetworkmanagement_l2tpui.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/libplasmanetworkmanagement_openconnectui.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/libplasmanetworkmanagement_openswanui.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/libplasmanetworkmanagement_openvpnui.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/libplasmanetworkmanagement_pptpui.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/libplasmanetworkmanagement_sshui.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/libplasmanetworkmanagement_sstpui.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/libplasmanetworkmanagement_strongswanui.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/libplasmanetworkmanagement_vpncui.so
%dir %{_libdir}/qt5/qml/org/kde/plasma/networkmanagement
%attr(755,root,root) %{_libdir}/qt5/qml/org/kde/plasma/networkmanagement/libplasmanm_qmlplugins.so
%{_libdir}/qt5/qml/org/kde/plasma/networkmanagement/qmldir
%{_datadir}/knotifications5/networkmanagement.notifyrc
-%{_datadir}/kservices5/plasma-applet-org.kde.plasma.networkmanagement.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_l2tpui.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_openconnectui.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_openswanui.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_openvpnui.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_pptpui.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_sshui.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_sstpui.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_strongswanui.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_vpncui.desktop
-%{_datadir}/kservicetypes5/plasma-networkmanagement-vpnuiplugin.desktop
-%dir %{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement
-%dir %{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents
-%dir %{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/CompactRepresentation.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/ConnectionItem.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/Header.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/PopupDialog.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/SwitchButton.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/Toolbar.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/main.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/metadata.desktop
-
-%{_libdir}/qt5/plugins/kcm_networkmanagement.so
-%{_libdir}/qt5/plugins/libplasmanetworkmanagement_fortisslvpnui.so
-%{_libdir}/qt5/plugins/libplasmanetworkmanagement_iodineui.so
+%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement
+%attr(755,root,root) %{_libdir}/qt5/plugins/kcm_networkmanagement.so
%dir %{_datadir}/kcm_networkmanagement
%dir %{_datadir}/kcm_networkmanagement/qml
%{_datadir}/kcm_networkmanagement/qml/ConnectionItem.qml
-%{_datadir}/kcm_networkmanagement/qml/Dialog.qml
-%{_datadir}/kcm_networkmanagement/qml/Header.qml
%{_datadir}/kcm_networkmanagement/qml/ListItem.qml
%{_datadir}/kcm_networkmanagement/qml/main.qml
%{_datadir}/kservices5/kcm_networkmanagement.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_fortisslvpnui.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_iodineui.desktop
-%{_datadir}/kservices5/plasmanetworkmanagement_openconnect_juniperui.desktop
%{_datadir}/metainfo/org.kde.plasma.networkmanagement.appdata.xml
-%dir %{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/config
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/config/config.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/config/main.xml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/DetailsText.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/PasswordField.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/Separator.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/TrafficMonitor.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents/ui/configGeneral.qml
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/metadata.json
+%{_datadir}/kcm_networkmanagement/qml/AddConnectionDialog.qml
+%{_datadir}/kcm_networkmanagement/qml/ConfigurationDialog.qml
+%dir %{_libdir}/qt5/plugins/plasma/network
+%dir %{_libdir}/qt5/plugins/plasma/network/vpn
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_fortisslvpnui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_iodineui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_l2tpui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_openconnect_anyconnect.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_openconnect_globalprotectui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_openconnect_juniperui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_openconnect_pulseui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_openswanui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_openvpnui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_pptpui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_sshui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_sstpui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_strongswanui.so
+%{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_vpncui.so
+%{_datadir}/kservices5/plasma-applet-org.kde.plasma.networkmanagement.desktop
+%{_datadir}/qlogging-categories5/plasma-nm.categories