[kde-workspace] new showremainingtime patch, now just defaults the option to true

[Kevin Kofler]

commit c12ef705e0d1b31fff218e34a0ddf4a439b44195
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat May 26 22:16:07 2012 +0200

    new showremainingtime patch, now just defaults the option to true
    
    * Sat May 26 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.8.80-2
    - new showremainingtime patch, now just defaults the option to true
      (It doesn't have ugly side effects anymore with the rewritten plasmoid.)

 ...4.8.80-battery-plasmoid-showremainingtime.patch |   12 ++++++++++++
 kde-workspace.spec                                 |   11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/kde-workspace-4.8.80-battery-plasmoid-showremainingtime.patch b/kde-workspace-4.8.80-battery-plasmoid-showremainingtime.patch
new file mode 100644
index 0000000..74a4e57
--- /dev/null
+++ b/kde-workspace-4.8.80-battery-plasmoid-showremainingtime.patch
@@ -0,0 +1,12 @@
+diff -ur kde-workspace-4.8.80/plasma/generic/applets/batterymonitor/contents/config/main.xml kde-workspace-4.8.80-battery-plasmoid-showremainingtime/plasma/generic/applets/batterymonitor/contents/config/main.xml
+--- kde-workspace-4.8.80/plasma/generic/applets/batterymonitor/contents/config/main.xml	2012-05-23 01:55:18.000000000 +0200
++++ kde-workspace-4.8.80-battery-plasmoid-showremainingtime/plasma/generic/applets/batterymonitor/contents/config/main.xml	2012-05-26 22:09:44.000000000 +0200
+@@ -10,7 +10,7 @@
+       <default>false</default>
+     </entry>
+     <entry name="showRemainingTime" type="Bool">
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+   </group>
+ 
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 79f3141..7b99669 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -12,7 +12,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.8.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -49,6 +49,10 @@ Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 # kio_sysinfo based on OpenSUSE's patch
 Patch15: kdebase-workspace-4.3.75-kio_sysinfo.patch
 
+# show the remaining time in the battery plasmoid's popup (#515166)
+# TODO: Can/should we do this with Plasma init/update scripts in kde-settings?
+Patch16: kde-workspace-4.8.80-battery-plasmoid-showremainingtime.patch
+
 # allow adding a "Leave..." button which brings up the complete shutdown dialog
 # to the classic menu (as in KDE <= 4.2.x); the default is still the upstream
 # default Leave submenu
@@ -406,6 +410,7 @@ Requires: akonadi
 %patch9 -p1 -b .rootprivs
 %patch11 -p1 -b .font
 %patch15 -p1 -b .kio_sysinfo
+%patch16 -p1 -b .showremainingtime
 %patch17 -p1 -b .classicmenu-logout
 %patch19 -p1 -b .kdm_plymouth
 %patch20 -p1 -b .xsession_errors_O_APPEND
@@ -975,6 +980,10 @@ fi
 
 
 %changelog
+* Sat May 26 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.8.80-2
+- new showremainingtime patch, now just defaults the option to true
+  (It doesn't have ugly side effects anymore with the rewritten plasmoid.)
+
 * Sat May 26 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.80-1
 - 4.8.80
 - remove remaining time patch, should be enabled in kde-settings