- updated to 5.25.1

[packages/kp5-plasma-nm.git] / kp5-plasma-nm.spec

diff --git a/kp5-plasma-nm.spec b/kp5-plasma-nm.spec
index b5869308be5d81d0c7543ccc03f4683107d1e5b6..f4d40a590f1b90e9385870309f4d9695253400d5 100644 (file)
--- a/kp5-plasma-nm.spec
+++ b/kp5-plasma-nm.spec
@@ -1,21 +1,23 @@
-%define                kdeplasmaver    5.21.5
+#
+# Conditional build:
+%bcond_with    tests           # build with tests
+%define                kdeplasmaver    5.25.1
 %define                qtver           5.9.0
 %define                kpname          plasma-nm
 %define                kf5ver          5.39.0
 
 Summary:       plasma-nm
 Name:          kp5-%{kpname}
-Version:       5.21.5
+Version:       5.25.1
 Release:       1
 License:       LGPL v2.1+
 Group:         X11/Libraries
-Source0:       http://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
-# Source0-md5: 36a7c2c7c8b34ddbf9222d4cd4d39d35
+Source0:       https://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
+# Source0-md5: 8d67353df8b25b556950bb2afd83e2e3
 URL:           http://www.kde.org/
-BuildRequires: Qt5Core-devel >= %{qtver}
-BuildRequires: cmake >= 2.8.12
-
+BuildRequires: ModemManager-devel
 BuildRequires: NetworkManager-devel
+BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5DBus-devel >= %{qtver}
 BuildRequires: Qt5Gui-devel >= %{qtver}
 BuildRequires: Qt5Network-devel >= %{qtver}
@@ -24,6 +26,7 @@ BuildRequires:        Qt5Quick-devel >= %{qtver}
 BuildRequires: Qt5Test-devel >= %{qtver}
 BuildRequires: Qt5Widgets-devel >= %{qtver}
 BuildRequires: Qt5Xml-devel >= %{qtver}
+BuildRequires: cmake >= 2.8.12
 BuildRequires: gettext-devel
 BuildRequires: kf5-kcompletion-devel
 BuildRequires: kf5-kconfigwidgets-devel
@@ -66,11 +69,16 @@ Plasma applet written in QML for managing network connections.
 install -d build
 cd build
 %cmake -G Ninja \
+       %{!?with_tests:-DBUILD_TESTING=OFF} \
        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
        -DHTML_INSTALL_DIR=%{_kdedocdir} \
        ../
 %ninja_build
 
+%if %{with tests}
+ctest
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %ninja_install -C build
@@ -88,49 +96,35 @@ rm -rf $RPM_BUILD_ROOT
 %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
-%attr(755,root,root) %{_libdir}/qt5/plugins/kcm_networkmanagement.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/libplasmanetworkmanagement_fortisslvpnui.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/libplasmanetworkmanagement_iodineui.so
+%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement
 %dir %{_datadir}/kcm_networkmanagement
 %dir %{_datadir}/kcm_networkmanagement/qml
 %{_datadir}/kcm_networkmanagement/qml/ConnectionItem.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
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/contents.rcc
-%{_datadir}/plasma/plasmoids/org.kde.plasma.networkmanagement/metadata.json
-%{_datadir}/kservices5/plasmanetworkmanagement_openconnect_globalprotectui.desktop
 %{_datadir}/kcm_networkmanagement/qml/AddConnectionDialog.qml
 %{_datadir}/kcm_networkmanagement/qml/ConfigurationDialog.qml
-%{_datadir}/kservices5/plasmanetworkmanagement_openconnect_pulseui.desktop
+%dir %{_libdir}/qt5/plugins/plasma/network
+%dir %{_libdir}/qt5/plugins/plasma/network/vpn
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_fortisslvpnui.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_iodineui.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_l2tpui.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_openconnect_anyconnect.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_openconnect_globalprotectui.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_openconnect_juniperui.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_openconnect_pulseui.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_openvpnui.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_pptpui.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_sshui.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_sstpui.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_strongswanui.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_vpncui.so
+%{_datadir}/qlogging-categories5/plasma-nm.categories
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/kcms/systemsettings_qwidgets/kcm_networkmanagement.so
+%attr(755,root,root) %{_libdir}/qt5/plugins/plasma/network/vpn/plasmanetworkmanagement_libreswanui.so
+%{_desktopdir}/kcm_networkmanagement.desktop