Hello community, here is the log from the commit of package plasma-nm for openSUSE:Factory checked in at 2013-10-17 14:25:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-nm (Old) and /work/SRC/openSUSE:Factory/.plasma-nm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-nm" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-nm/plasma-nm.changes 2013-10-06 19:37:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-nm.new/plasma-nm.changes 2013-10-17 17:45:04.000000000 +0200 @@ -1,0 +2,25 @@ +Tue Oct 15 13:09:15 UTC 2013 - tittiatc...@gmail.com + +- Update to 0.9.3.1 + - plasma-nm is renamed to match the names from the old + networkmanagement applet (kded module, applet name etc.) + - visual changes + - different icons + - improved speed of animations + - applet is a little bit smaller + - improved notifications + - ModemManager support is optional + - StrongSwan VPN plugin + - closed bugs: + - plasma-nm doesn't install icon network-defaultroute, which + is need by kde-nm-connection-editor.desktop (bko#325783) + - plasma crashes when a vpn connection is activated (bko#324016) + - Crash when launching second user desktop (bko#324708) + - Cannot add static routes on OpenVPN connections using the + latest plasma-nm in Kubuntu Saucy (bko#325290) + - WPA2 dialog blocks Plasma (bko#322192) + - and a lot of unreported bugs and improvements + +- Added 01-plasma-nm.js to add the plasmoid to the systray + automatically. This is required due to the renaming +------------------------------------------------------------------- Old: ---- plasma-nm-0.9.3.0.tar.xz New: ---- 01-plasma-nm.js plasma-nm-0.9.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-nm.spec ++++++ --- /var/tmp/diff_new_pack.Xb02FK/_old 2013-10-17 17:45:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Xb02FK/_new 2013-10-17 17:45:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: plasma-nm -Version: 0.9.3.0 +Version: 0.9.3.1 Release: 0 Summary: Plasma applet written in QML for managing network connections License: GPL-2.0 or GPL-3.0 @@ -25,6 +25,7 @@ Url: https://projects.kde.org/projects/playground/network/plasma-nm Source0: http://download.kde.org/unstable/plasma-nm/%{name}-%{version}.tar.xz Source1: icon.tar.bz2 +Source2: 01-plasma-nm.js BuildRequires: NetworkManager-devel >= 0.9.8.0 BuildRequires: fdupes BuildRequires: libModemManagerQt-devel >= 0.5.0 @@ -35,10 +36,17 @@ %endif Provides: NetworkManager-client Recommends: %{name}-pptp +%if 0%{?suse_version} > 1310 Obsoletes: NetworkManager-kde4-devel Obsoletes: NetworkManager-kde4-libs Obsoletes: NetworkManager-novellvpn-kde4 Obsoletes: plasmoid-networkmanagement +%else +Conflicts: NetworkManager-kde4-devel +Conflicts: NetworkManager-kde4-libs +Conflicts: NetworkManager-novellvpn-kde4 +Conflicts: plasmoid-networkmanagement +%endif %kde4_runtime_requires %description @@ -51,8 +59,12 @@ Requires: %{name} = %{version} Requires: NetworkManager-openvpn Provides: NetworkManager-openvpn-frontend +%if 0%{?suse_version} > 1310 Supplements: packageand(%{name};NetworkManager-openvpn) Obsoletes: NetworkManager-openvpn-kde4 +%else +Conflicts: NetworkManager-openvpn-kde4 +%endif %kde4_runtime_requires %description openvpn @@ -64,8 +76,12 @@ Requires: %{name} = %{version} Requires: NetworkManager-vpnc Provides: NetworkManager-vpnc-frontend +%if 0%{?suse_version} > 1310 Supplements: packageand(%{name};NetworkManager-vpnc) Obsoletes: NetworkManager-vpnc-kde4 +%else +Conflicts: NetworkManager-vpnc-kde4 +%endif %kde4_runtime_requires %description vpnc @@ -78,8 +94,12 @@ Requires: %{name} = %{version} Requires: openconnect Provides: NetworkManager-openconnect-frontend +%if 0%{?suse_version} > 1310 Supplements: packageand(%{name};openconnect) Obsoletes: NetworkManager-openconnect-kde4 +%else +Conflicts: NetworkManager-openconnect-kde4 +%endif %kde4_runtime_requires %description openconnect @@ -118,8 +138,12 @@ Requires: %{name} = %{version} Requires: NetworkManager-pptp Provides: NetworkManager-pptp-frontend +%if 0%{?suse_version} > 1310 Supplements: packageand(%{name};NetworkManager-pptp) Obsoletes: NetworkManager-pptp-kde4 +%else +Conflicts: NetworkManager-pptp-kde4 +%endif %kde4_runtime_requires %description pptp @@ -140,9 +164,15 @@ %fdupes -s %{buildroot} mkdir -p %{buildroot}%{_kde4_iconsdir}/hicolor/32x32/apps/ cp -r $RPM_BUILD_DIR/plasma-nm-%{version}/ox32-device-network-defaultroute.png %{buildroot}%{_kde4_iconsdir}/hicolor/32x32/apps/network-defaultroute.png - for translation in kcm_network kde-nm-connection-editor libplasmanm-editor plasma_applet_org.kde.plasma-nm plasmanm-kded plasmanm_l2tpui plasmanm_openconnectui plasmanm_openswanui plasmanm_openvpnui plasmanm_pptpui plasmanm_vpncui; do + for translation in kcm_network kde-nm-connection-editor libplasmanetworkmanagement-editor plasma_applet_org.kde.networkmanagement plasmanetworkmanagement-kded; do %find_lang $translation %{name}.lang done + for translation in l2tpui openconnectui openswanui openvpnui pptpui strongswanui vpncui; do + %find_lang plasmanetworkmanagement_$translation %{name}.lang + done + mkdir -p %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/ + install -m 0644 %{SOURCE2} %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/01-plasma-nm.js + %files lang -f %{name}.lang @@ -150,71 +180,74 @@ %defattr(-,root,root) %doc COPYING.LIB COPYING %{_kde4_bindir}/kde-nm-connection-editor -%{_kde4_libdir}/libplasmanm-editor.so -%{_kde4_libdir}/libplasmanm-internal.so +%{_kde4_libdir}/libplasmanetworkmanagement-editor.so +%{_kde4_libdir}/libplasmanetworkmanagement-internal.so %{_kde4_appsdir}/kde-nm-connection-editor/kde-nm-connection-editorui.rc %{_kde4_datadir}/applications/kde4/kde-nm-connection-editor.desktop -%{_kde4_modulesdir}/imports/org/kde/plasmanm/libplasmanmplugins.so -%{_kde4_modulesdir}/imports/org/kde/plasmanm/qmldir -%dir %{_kde4_appsdir}/plasma/plasmoids/org.kde.plasma-nm/ +%{_kde4_modulesdir}/imports/org/kde/networkmanagement/ %dir %{_kde4_modulesdir}/imports %dir %{_kde4_modulesdir}/imports/* %dir %{_kde4_modulesdir}/imports/*/* %dir %{_kde4_modulesdir}/imports/*/*/* %dir %{_kde4_appsdir}/kde-nm-connection-editor -%dir %{_kde4_appsdir}/plasma-nm %dir %{_kde4_appsdir}/plasma/plasmoids +%{_kde4_appsdir}/networkmanagement/ %{_kde4_appsdir}/desktoptheme %{_kde4_appsdir}/desktoptheme/* %{_kde4_appsdir}/desktoptheme/*/* -%{_kde4_appsdir}/plasma/plasmoids/org.kde.plasma-nm/ -%{_kde4_servicesdir}/plasma-applet-nm.desktop -%{_kde4_modulesdir}/plugins/designer/plasmanmwidgets.so -%{_kde4_appsdir}/desktoptheme/default/icons/plasma-nm.svgz -%{_kde4_servicesdir}/plasma_nm_notifications.desktop -%{_kde4_modulesdir}/plasma_nm_notifications.so +%{_kde4_appsdir}/plasma/plasmoids/org.kde.networkmanagement/ +%{_kde4_servicesdir}/plasma-applet-networkmanagement.desktop +%{_kde4_modulesdir}/plugins/designer/plasmanetworkmanagementwidgets.so +%{_kde4_appsdir}/desktoptheme/default/icons/plasma-networkmanagement.svgz +%{_kde4_servicesdir}/networkmanagement_notifications.desktop +%{_kde4_modulesdir}/networkmanagement_notifications.so %{_kde4_iconsdir}/hicolor/*/apps/*png -%{_kde4_appsdir}/plasma-nm/plasma-nm.notifyrc -%{_kde4_modulesdir}/kded_plasmanm.so -%{_kde4_servicesdir}/kded/plasmanm.desktop -%{_kde4_servicetypesdir}/plasma-nm-vpnuiplugin.desktop +%{_kde4_iconsdir}/oxygen/32x32/devices/network-defaultroute.png +%{_kde4_modulesdir}/kded_networkmanagement.so +%{_kde4_servicesdir}/kded/networkmanagement.desktop +%{_kde4_servicetypesdir}/plasma-networkmanagement-vpnuiplugin.desktop +%dir %{_kde4_appsdir}/plasma-desktop +%dir %{_kde4_appsdir}/plasma-desktop/updates +%{_kde4_appsdir}/plasma-desktop/updates/01-plasma-nm.js %files openvpn %defattr(-,root,root) %doc COPYING.LIB COPYING -%{_kde4_modulesdir}/plasmanm_openvpnui.so -%{_kde4_servicesdir}/plasmanm_openvpnui.desktop +%{_kde4_modulesdir}/plasmanetworkmanagement_openvpnui.so +%{_kde4_servicesdir}/plasmanetworkmanagement_openvpnui.desktop %files vpnc %defattr(-,root,root) %doc COPYING.LIB COPYING -%{_kde4_modulesdir}/plasmanm_vpncui.so -%{_kde4_servicesdir}/plasmanm_vpncui.desktop +%{_kde4_modulesdir}/plasmanetworkmanagement_vpncui.so +%{_kde4_servicesdir}/plasmanetworkmanagement_vpncui.desktop %if 0%{?suse_version} > 1230 %files openconnect %defattr(-,root,root) %doc COPYING.LIB COPYING -%{_kde4_modulesdir}/plasmanm_openconnectui.so -%{_kde4_servicesdir}/plasmanm_openconnectui.desktop +%{_kde4_modulesdir}/plasmanetworkmanagement_openconnectui.so +%{_kde4_servicesdir}/plasmanetworkmanagement_openconnectui.desktop %endif %files openswan %defattr(-,root,root) %doc COPYING.LIB COPYING -%{_kde4_modulesdir}/plasmanm_openswanui.so -%{_kde4_servicesdir}/plasmanm_openswanui.desktop +%{_kde4_modulesdir}/plasmanetworkmanagement_openswanui.so +%{_kde4_servicesdir}/plasmanetworkmanagement_openswanui.desktop +%{_kde4_modulesdir}/plasmanetworkmanagement_strongswanui.so +%{_kde4_servicesdir}/plasmanetworkmanagement_strongswanui.desktop %files l2tp %defattr(-,root,root) %doc COPYING.LIB COPYING -%{_kde4_modulesdir}/plasmanm_l2tpui.so -%{_kde4_servicesdir}/plasmanm_l2tpui.desktop +%{_kde4_modulesdir}/plasmanetworkmanagement_l2tpui.so +%{_kde4_servicesdir}/plasmanetworkmanagement_l2tpui.desktop %files pptp %defattr(-,root,root) %doc COPYING.LIB COPYING -%{_kde4_modulesdir}/plasmanm_pptpui.so -%{_kde4_servicesdir}/plasmanm_pptpui.desktop +%{_kde4_modulesdir}/plasmanetworkmanagement_pptpui.so +%{_kde4_servicesdir}/plasmanetworkmanagement_pptpui.desktop %changelog ++++++ 01-plasma-nm.js ++++++ /* 01-plasma-nm.js - Add NM plasmoid to the systray Copyright (C) 2010 Kevin Kofler <kevin.kof...@chello.at> Copyright (C) 2013 Jan Grulich <jgrul...@redhat.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. Portions lifted from 06-delete-networkmanagement.js: Copyright Jonathan Riddell, jridd...@ubuntu.com 2013-09-13 may be copied under the GNU GPL 2 or later */ nmAppletFound = false pids = panelIds; for (i = 0; i < pids.length; ++i) { //search through the panels panel = panelById(pids[i]); if (!panel) continue; ids = panel.widgetIds; for (j = 0; j < ids.length; ++j) { //search through the widgets for systray widget = panel.widgetById(ids[j]); if (!widget || widget.type != "systemtray") { continue; } //widget var is now the systray widget.currentConfigGroup = Array("Applets"); noOfApplets = widget.configGroups.length; var groups = new Array(); for (k = 0; k < noOfApplets; ++k) { groups.push(widget.configGroups[k]) } for (k = 0; k < noOfApplets; ++k) { widget.currentConfigGroup = new Array("Applets", groups[k]); if (widget.readConfig("plugin") == "org.kde.plasma-nm") { nmAppletFound = true; widget.writeConfig("plugin","org.kde.networkmanagement"); //found it at last break; } else if (widget.readConfig("plugin") == "org.kde.networkmanagement") { nmAppletFound = true; break; } } } } if (!nmAppletFound) { systrayFound = false; for (i = 0; i < pids.length; ++i) { //search through the panels panel = panelById(pids[i]); if (!panel) continue; ids = panel.widgetIds; for (j = 0; j < ids.length; ++j) { //search through the widgets for systray widget = panel.widgetById(ids[j]); if (!widget || widget.type != "systemtray") { continue; } systrayFound = true; //widget var is now the systray widget.currentConfigGroup = Array("Applets"); noOfApplets = widget.configGroups.length; widget.currentConfigGroup = new Array("Applets", noOfApplets + 1); widget.writeConfig("plugin", "org.kde.networkmanagement"); print("Network management plasmoid added to the systray"); break; } if (systrayFound) break; } } ++++++ plasma-nm-0.9.3.0.tar.xz -> plasma-nm-0.9.3.1.tar.xz ++++++ ++++ 408032 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
