[kde-plasma-nm] Update spec file

[Jan Grulich]

commit 6c313963227c68a891faa4719fc4ac4f4a26018d
Author: Jan Grulich <jgrulich at redhat.com>
Date:   Wed Oct 9 20:01:35 2013 +0200

    Update spec file

 kde-plasma-nm.spec |  104 ++++++++++++++++++++++++++++++----------------------
 1 files changed, 60 insertions(+), 44 deletions(-)
---
diff --git a/kde-plasma-nm.spec b/kde-plasma-nm.spec
index 9df9a46..862e3ea 100644
--- a/kde-plasma-nm.spec
+++ b/kde-plasma-nm.spec
@@ -7,7 +7,7 @@ License:        LGPLv2+ and GPLv2+
 URL:            https://projects.kde.org/projects/playground/network/plasma-nm
 # Source0:        http://download.kde.org/unstable/plasma-nm//plasma-nm-%{version}.tar.xz
 # Package from git snapshots using releaseme scripts
-Source0:        %{name}-%{version}-git%{git_commit}.tar.bz2
+Source0:        plasma-nm-%{version}-git%{git_commit}.tar.bz2
 
 # Add plasma-nm to default systray if needed, for upgraders...
 Source10: 00-fedora-plasma-nm.js
@@ -18,7 +18,6 @@ BuildRequires:  kde-workspace-devel
 BuildRequires:  libmm-qt-devel >= 1.0.0
 BuildRequires:  libnm-qt-devel >= 0.9.1
 BuildRequires:  pkgconfig(NetworkManager) >= 0.9.8
-BuildRequires:  pkgconfig(ModemManager) >= 1.0.0
 BuildRequires:  pkgconfig(libnm-glib) pkgconfig(libnm-util)
 %if 0%{?fedora} || 0%{?epel}
 BuildRequires:  pkgconfig(openconnect) >= 4.00
@@ -27,6 +26,8 @@ BuildRequires:  pkgconfig(openconnect) >= 4.00
 Requires:  NetworkManager >= 0.9.8
 Requires:  libnm-qt >= 0.9.1
 
+Conflicts: kde-plasma-networkmanagement
+
 %description
 Plasma applet and editor for managing your network connections in KDE 4 using
 the default NetworkManager service.
@@ -69,6 +70,13 @@ Requires:       NetworkManager-openswan
 %description openswan
 %{summary}.
 
+%package strongswan
+Summary:        Strongswan support for %{name} 
+Requires:       %{name}%{?_isa} = %{version}-%{release} 
+Requires:       strongswan
+%description strongswan
+%{summary}.
+
 %package l2tp
 Summary:        L2TP support for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release} 
@@ -85,7 +93,7 @@ Requires:       NetworkManager-pptp
 %endif
 
 %prep
-%setup -qn %{name}-%{version}-git%{git_commit}
+%setup -qn plasma-nm-%{version}-git%{git_commit}
 
 %build
 mkdir -p %{_target_platform}
@@ -104,15 +112,17 @@ make install/fast  DESTDIR=%{buildroot} -C %{_target_platform}
 find %{buildroot}%{_kde4_datadir} -name "kcm_network.mo" -exec rm -f {} \;
 
 %find_lang plasma_applet_org.kde.networkmanagement
-%find_lang networkmanagement-kded
+%find_lang plasmanetworkmanagement-kded
 %find_lang kde-nm-connection-editor
-%find_lang libnetworkmanagement-editor
-%find_lang networkmanagement_vpncui
-%find_lang networkmanagement_openvpnui
-%find_lang networkmanagement_openconnectui
-%find_lang networkmanagement_openswanui
-%find_lang networkmanagement_l2tpui
-%find_lang networkmanagement_pptpui
+%find_lang libplasmanetworkmanagement-editor
+%find_lang plasmanetworkmanagement_vpncui
+%find_lang plasmanetworkmanagement_openvpnui
+%find_lang plasmanetworkmanagement_openconnectui
+%find_lang plasmanetworkmanagement_openswanui
+# Enable for the next build
+# %find_lang plasmanetworkmanagement_strongswanui
+%find_lang plasmanetworkmanagement_l2tpui
+%find_lang plasmanetworkmanagement_pptpui
 
 # migrate to nm plasmoid
 install -m644 -p -D %{SOURCE10} %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/00-fedora-plasma-nm.js
@@ -130,61 +140,67 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_pptp*
 %endif
 
 
-%files -f plasma_applet_org.kde.networkmanagement.lang -f networkmanagement-kded.lang -f kde-nm-connection-editor.lang -f libnetworkmanagement-editor.lang
+%files -f plasma_applet_org.kde.networkmanagement.lang -f plasmanetworkmanagement-kded.lang -f kde-nm-connection-editor.lang -f libplasmanetworkmanagement-editor.lang
 %defattr(-,root,root,-)
 # kde-nm-connection-editor
 %{_kde4_bindir}/kde-nm-connection-editor
-%{_kde4_libdir}/libnetworkmanagement-editor.so
+%{_kde4_libdir}/libplasmanetworkmanagement-editor.so
 %{_kde4_datadir}/kde4/apps/kde-nm-connection-editor/kde-nm-connection-editorui.rc
 %{_kde4_datadir}/applications/kde4/kde-nm-connection-editor.desktop
 # plasma-nm applet
-%{_kde4_libdir}/kde4/imports/org/kde/networkmanagement/libnetworkmanagementplugins.so
+%{_kde4_libdir}/kde4/imports/org/kde/networkmanagement/libplasmanetworkmanagementplugins.so
 %{_kde4_libdir}/kde4/imports/org/kde/networkmanagement/qmldir
 %dir %{_kde4_datadir}/kde4/apps/plasma/plasmoids/org.kde.networkmanagement/
 %{_kde4_datadir}/kde4/apps/plasma/plasmoids/org.kde.networkmanagement/contents
 %{_kde4_datadir}/kde4/apps/plasma/plasmoids/org.kde.networkmanagement/metadata.desktop
-%{_kde4_datadir}/kde4/services/plasma-applet-nm.desktop
-%{_kde4_libdir}/kde4/plugins/designer/networkmanagementwidgets.so
-%{_kde4_appsdir}/desktoptheme/default/icons/networkmanagement.svgz
+%{_kde4_datadir}/kde4/services/plasma-applet-networkmanagement.desktop
+%{_kde4_libdir}/kde4/plugins/designer/plasmanetworkmanagementwidgets.so
+%{_kde4_appsdir}/desktoptheme/default/icons/plasma-networkmanagement.svgz
+%{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_appsdir}/plasma-desktop/updates/*.js
 # plasma-nm notifications
-%{_kde4_datadir}/kde4/services/plasma_nm_notifications.desktop
-%{_kde4_libdir}/kde4/plasma_nm_notifications.so
+%{_kde4_datadir}/kde4/services/networkmanagement_notifications.desktop
+%{_kde4_libdir}/kde4/networkmanagement_notifications.so
 %{_kde4_datadir}/kde4/apps/networkmanagement/networkmanagement.notifyrc
 # plasma-nm kded
 %{_kde4_libdir}/kde4/kded_networkmanagement.so
 %{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
 # plasma-nm other
-%{_kde4_libdir}/libnetworkmanagement-internal.so
-%{_kde4_datadir}/kde4/servicetypes/networkmanagement-vpnuiplugin.desktop
+%{_kde4_libdir}/libplasmanetworkmanagement-internal.so
+%{_kde4_datadir}/kde4/servicetypes/plasma-networkmanagement-vpnuiplugin.desktop
 
 
 %files mobile
 
 %if 0%{?fedora} || 0%{?epel}
-%files openvpn -f networkmanagement_openvpnui.lang
-%{_kde4_libdir}/kde4/networkmanagement_openvpnui.so
-%{_kde4_datadir}/kde4/services/networkmanagement_openvpnui.desktop
-
-%files vpnc -f networkmanagement_vpncui.lang
-%{_kde4_libdir}/kde4/networkmanagement_vpncui.so
-%{_kde4_datadir}/kde4/services/networkmanagement_vpncui.desktop
-
-%files openconnect -f networkmanagement_openconnectui.lang
-%{_kde4_libdir}/kde4/networkmanagement_openconnectui.so
-%{_kde4_datadir}/kde4/services/networkmanagement_openconnectui.desktop
-
-%files openswan -f networkmanagement_openswanui.lang
-%{_kde4_libdir}/kde4/networkmanagement_openswanui.so
-%{_kde4_datadir}/kde4/services/networkmanagement_openswanui.desktop
-
-%files l2tp -f networkmanagement_l2tpui.lang
-%{_kde4_libdir}/kde4/networkmanagement_l2tpui.so
-%{_kde4_datadir}/kde4/services/networkmanagement_l2tpui.desktop
-
-%files pptp -f networkmanagement_pptpui.lang
-%{_kde4_libdir}/kde4/networkmanagement_pptpui.so
-%{_kde4_datadir}/kde4/services/networkmanagement_pptpui.desktop
+%files openvpn -f plasmanetworkmanagement_openvpnui.lang
+%{_kde4_libdir}/kde4/plasmanetworkmanagement_openvpnui.so
+%{_kde4_datadir}/kde4/services/plasmanetworkmanagement_openvpnui.desktop
+
+%files vpnc -f plasmanetworkmanagement_vpncui.lang
+%{_kde4_libdir}/kde4/plasmanetworkmanagement_vpncui.so
+%{_kde4_datadir}/kde4/services/plasmanetworkmanagement_vpncui.desktop
+
+%files openconnect -f plasmanetworkmanagement_openconnectui.lang
+%{_kde4_libdir}/kde4/plasmanetworkmanagement_openconnectui.so
+%{_kde4_datadir}/kde4/services/plasmanetworkmanagement_openconnectui.desktop
+
+%files openswan -f plasmanetworkmanagement_openswanui.lang
+%{_kde4_libdir}/kde4/plasmanetworkmanagement_openswanui.so
+%{_kde4_datadir}/kde4/services/plasmanetworkmanagement_openswanui.desktop
+
+# %files strongswan -f plasmanetworkmanagement_strongswanui.lang
+%files strongswan
+%{_kde4_libdir}/kde4/plasmanetworkmanagement_strongswanui.so
+%{_kde4_datadir}/kde4/services/plasmanetworkmanagement_strongswanui.desktop
+
+%files l2tp -f plasmanetworkmanagement_l2tpui.lang
+%{_kde4_libdir}/kde4/plasmanetworkmanagement_l2tpui.so
+%{_kde4_datadir}/kde4/services/plasmanetworkmanagement_l2tpui.desktop
+
+%files pptp -f plasmanetworkmanagement_pptpui.lang
+%{_kde4_libdir}/kde4/plasmanetworkmanagement_pptpui.so
+%{_kde4_datadir}/kde4/services/plasmanetworkmanagement_pptpui.desktop
 %endif
 
 %changelog