Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at 2013-08-27 20:49:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-openSUSE/kdebase4-openSUSE.changes 2013-07-22 17:16:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new/kdebase4-openSUSE.changes 2013-08-27 20:49:26.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Aug 26 15:37:51 UTC 2013 - [email protected] + +- Restore launchers to default panel, now that bnc#829298 is resolved +- Copy files which are patched to buildroot, instead of patching them + on filesystem + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.HMUhPm/_old 2013-08-27 20:49:27.000000000 +0200 +++ /var/tmp/diff_new_pack.HMUhPm/_new 2013-08-27 20:49:27.000000000 +0200 @@ -114,8 +114,11 @@ %suse_update_desktop_file -u SUSEgreeter System Documentation %fdupes -s %{buildroot}%{_kde4_configdir}/SuSE/default/ %kde_post_install - cd %{buildroot} + pushd %{buildroot}/%{_kde4_appsdir} + cp %{_kde4_appsdir}/plasma-desktop/init/00-defaultLayout.js %{buildroot}/%{_kde4_appsdir}/plasma-desktop/init/ + cp %{_kde4_appsdir}/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js %{buildroot}/%{_kde4_appsdir}/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/ patch -p0 < %{SOURCE2} + popd #Make the "rpm:"-search default to to the correct version of openSUSE (see bnc#695417) sed -i s/12.1/%{version}/ %{buildroot}%{_kde4_servicesdir}/searchproviders/rpm.desktop ++++++ plasma-change-defaults.diff ++++++ --- /var/tmp/diff_new_pack.HMUhPm/_old 2013-08-27 20:49:28.000000000 +0200 +++ /var/tmp/diff_new_pack.HMUhPm/_new 2013-08-27 20:49:28.000000000 +0200 @@ -1,9 +1,9 @@ ---- ./usr/share/kde4/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js 2011-05-20 22:32:08.000000000 +0200 -+++ ./usr/share/kde4/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js 2011-10-13 13:12:19.877173319 +0200 -@@ -4,15 +4,19 @@ if (panelIds.length == 1) { +--- ./plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js 2011-05-20 22:32:08.000000000 +0200 ++++ ./plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js 2011-10-13 13:12:19.877173319 +0200 +@@ -4,14 +4,17 @@ if (panelIds.length == 1) { panel.location = 'bottom' } - + -panel.height = screenGeometry(panel.screen).height > 1024 ? 35 : 27 -panel.addWidget("launcher") +panel.height = screenGeometry(panel.screen).height > 899 ? 35 : 27 @@ -18,16 +18,11 @@ +var clock = panel.addWidget("digital-clock") +// avoid akonadi unless akonadi is started +clock.writeConfig("displayEvents", "false") - --tasks.currentConfigGroup = new Array("Launchers") --tasks.writeConfig("browser", "preferred://browser, , , ") --tasks.writeConfig("filemanager", "preferred://filemanager, , , ") -+// Comment out the launchers, until bnc#829298 and kde#322283 are resolved. Also, they are ugly -+//tasks.currentConfigGroup = new Array("Launchers") -+//tasks.writeConfig("browser", "preferred://browser, , , ") -+//tasks.writeConfig("filemanager", "preferred://filemanager, , , ") ---- ./usr/share/kde4/apps/plasma-desktop/init/00-defaultLayout.js 2011-05-20 22:32:08.000000000 +0200 -+++ ./usr/share/kde4/apps/plasma-desktop/init/00-defaultLayout.js 2011-10-13 13:03:13.251007088 +0200 + + tasks.currentConfigGroup = new Array("Launchers") + tasks.writeConfig("browser", "preferred://browser, , , ") +--- ./plasma-desktop/init/00-defaultLayout.js 2011-05-20 22:32:08.000000000 +0200 ++++ ./plasma-desktop/init/00-defaultLayout.js 2011-10-13 13:03:13.251007088 +0200 @@ -1,3 +1,30 @@ +function widgetExists(name) +{ @@ -55,14 +50,14 @@ +} + +var hasFolderview = widgetExists("folderview"); -+ ++ loadTemplate("org.kde.plasma-desktop.defaultPanel") - + for (var i = 0; i < screenCount; ++i) { -@@ -7,6 +34,11 @@ +@@ -7,6 +34,11 @@ for (var i = 0; i < screenCount; ++i) { desktop.wallpaperPlugin = 'image' desktop.wallpaperMode = 'SingleImage' - + + if (hasFolderview && i == topLeftScreen) { + var folderview = desktop.addWidget("folderview") + folderview.writeConfig("url", "desktop:/") @@ -71,4 +66,3 @@ //Create more panels for other screens if (i > 0){ var panel = new Panel - -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
