Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2014-10-22 16:23:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2014-10-15 08:51:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2014-10-22 16:23:19.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Oct 20 16:57:28 UTC 2014 - hrvoje.sen...@gmail.com + +- Move default layouts for desktop and panel to upstream branding + subpackage, as we'll provide the equivalents in openSUSE branding +- Make sure that upstream branding requires plasma5-workspace + upstream branding + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.G5vsCX/_old 2014-10-22 16:23:20.000000000 +0200 +++ /var/tmp/diff_new_pack.G5vsCX/_new 2014-10-22 16:23:20.000000000 +0200 @@ -96,6 +96,7 @@ Provides: %{name}-branding = %{_plasma5_branding_version} Supplements: packageand(plasma5-desktop:branding-upstream) Conflicts: otherproviders(%{name}-branding) +Requires: plasma5-workspace-branding-upstream %description branding-upstream This package contains the basic packages for a Plasma workspace. @@ -176,10 +177,21 @@ %{_kf5_sharedir}/kcminput/ %{_kf5_sharedir}/solid/ %{_kf5_plasmadir}/ +%exclude %{_kf5_plasmadir}/shells/org.kde.plasma.desktop/contents/layout.js +%exclude %{_kf5_plasmadir}/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js %files branding-upstream %defattr(-,root,root) %doc COPYING* +%dir %{_kf5_plasmadir}/layout-templates/org.kde.plasma.desktop.defaultPanel/contents +%dir %{_kf5_plasmadir}/layout-templates/org.kde.plasma.desktop.defaultPanel +%dir %{_kf5_plasmadir}/layout-templates +%dir %{_kf5_plasmadir}/shells/org.kde.plasma.desktop/contents +%dir %{_kf5_plasmadir}/shells/org.kde.plasma.desktop +%dir %{_kf5_plasmadir}/shells +%dir %{_kf5_plasmadir} +%{_kf5_plasmadir}/shells/org.kde.plasma.desktop/contents/layout.js +%{_kf5_plasmadir}/layout-templates/org.kde.plasma.desktop.defaultPanel/contents/layout.js %files lang %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org