Hello community, here is the log from the commit of package plasma-nm5 for openSUSE:Factory checked in at 2014-10-22 16:22:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-nm5 (Old) and /work/SRC/openSUSE:Factory/.plasma-nm5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-nm5" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-nm5/plasma-nm5.changes 2014-10-15 08:51:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-nm5.new/plasma-nm5.changes 2014-10-22 16:22:48.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Oct 21 12:25:37 UTC 2014 - [email protected] + +- Fix obsoletes/provides warning +- Cleanup with spec-cleaner +- Fix plasma-nm5-openvpn loosing its configuration on first setup: + * plasma-nm-5.1.0.1-openvpn.patch + +------------------------------------------------------------------- New: ---- plasma-nm-5.1.0.1-openvpn.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-nm5.spec ++++++ --- /var/tmp/diff_new_pack.VGPUE4/_old 2014-10-22 16:22:49.000000000 +0200 +++ /var/tmp/diff_new_pack.VGPUE4/_new 2014-10-22 16:22:49.000000000 +0200 @@ -17,7 +17,6 @@ %define mm_support 1 - Name: plasma-nm5 Version: 5.1.0.1 Release: 0 @@ -27,6 +26,8 @@ Url: https://projects.kde.org/projects/playground/network/plasma-nm Source: plasma-nm-%{version}.tar.xz Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM [email protected] openvpn patch taken from GIT remove with bump +Patch0: plasma-nm-5.1.0.1-openvpn.patch BuildRequires: NetworkManager-devel >= 0.9.8.0 BuildRequires: extra-cmake-modules BuildRequires: fdupes @@ -47,9 +48,9 @@ BuildRequires: kwidgetsaddons-devel BuildRequires: kwindowsystem-devel BuildRequires: kxmlgui-devel +BuildRequires: libKF5NetworkManagerQt-devel BuildRequires: mobile-broadband-provider-info BuildRequires: plasma-framework-devel -BuildRequires: plasma-framework-devel BuildRequires: solid-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Concurrent) @@ -69,17 +70,16 @@ BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) -%if 0%{?mm_support} -BuildRequires: libKF5ModemManagerQt-devel -%endif -BuildRequires: libKF5NetworkManagerQt-devel BuildRequires: pkgconfig(openconnect) >= 4.00 -Requires: kwalletd5 -Provides: NetworkManager-client -Provides: plasma-nm-kf5 -Obsoletes: plasma-nm-kf5 Requires: kded +Requires: kwalletd5 Requires: mobile-broadband-provider-info +Provides: NetworkManager-client +Provides: plasma-nm-kf5 = %{version} +Obsoletes: plasma-nm-kf5 < %{version} +%if 0%{?mm_support} +BuildRequires: libKF5ModemManagerQt-devel +%endif %description Plasma applet for controlling network connections on systems @@ -90,8 +90,8 @@ Group: System/GUI/KDE Requires: %{name} = %{version} Requires: NetworkManager-openvpn -Provides: NetworkManager-openvpn-frontend Supplements: packageand(%{name};NetworkManager-openvpn) +Provides: NetworkManager-openvpn-frontend %description openvpn OpenVPN VPN plugin for plasma-nm components. @@ -101,8 +101,8 @@ Group: System/GUI/KDE Requires: %{name} = %{version} Requires: NetworkManager-vpnc -Provides: NetworkManager-vpnc-frontend Supplements: packageand(%{name};NetworkManager-vpnc) +Provides: NetworkManager-vpnc-frontend %description vpnc Vpnc plugin for plasma-nm components. @@ -113,8 +113,8 @@ Requires: %{name} = %{version} Requires: NetworkManager-openconnect Requires: openconnect -Provides: NetworkManager-openconnect-frontend Supplements: packageand(%{name};NetworkManager-openconnect;openconnect) +Provides: NetworkManager-openconnect-frontend %description openconnect OpenConnect plugin for plasma-nm components. @@ -159,22 +159,24 @@ Group: System/GUI/KDE Requires: %{name} = %{version} Requires: NetworkManager-pptp -Provides: NetworkManager-pptp-frontend Supplements: packageand(%{name};NetworkManager-pptp) +Provides: NetworkManager-pptp-frontend %description pptp pptp plugin for plasma-nm components. %lang_package + %prep -%setup -qn plasma-nm-%{version} +%setup -q -n plasma-nm-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 %make_jobs %install - %kf5_makeinstall -C build + %{kf5_makeinstall} -C build %suse_update_desktop_file -r kde5-nm-connection-editor KDE System X-SuSE-ServiceConfiguration %fdupes -s %{buildroot} ++++++ plasma-nm-5.1.0.1-openvpn.patch ++++++ --- a/vpn/openvpn/openvpn.ui +++ b/vpn/openvpn/openvpn.ui @@ -104,7 +104,7 @@ <item row="1" column="0" colspan="3"> <widget class="QStackedWidget" name="stackedWidget"> <property name="currentIndex"> - <number>3</number> + <number>0</number> </property> <widget class="QWidget" name="page"> <layout class="QVBoxLayout" name="verticalLayout"> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
