[kde-workspace] 4.8.80 remove remaining time patch, should be enabled in kde-settings

[Jaroslav Reznik]

commit b9f9fe6c7e3eb2f0c22f431536229e1d19e19dec
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Sat May 26 15:35:56 2012 +0200

    4.8.80
    remove remaining time patch, should be enabled in kde-settings

 .gitignore                                         |    1 +
 calendartable-locale-crash.patch                   |   50 --------------------
 ...orkspace-4.8.3-plasma_clock_widget_locale.patch |   27 -----------
 kde-workspace.spec                                 |   18 ++-----
 ...4.5.80-battery-plasmoid-showremainingtime.patch |   16 ------
 sources                                            |    2 +-
 6 files changed, 8 insertions(+), 106 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3a8d1aa..df580b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kde-workspace-4.8.3.tar.xz
+/kde-workspace-4.8.80.tar.xz
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 9139ea4..0f3c595 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -11,8 +11,8 @@
 
 Summary: KDE Workspace
 Name:    kde-workspace
-Version: 4.8.3
-Release: 4%{?dist}
+Version: 4.8.80
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -49,9 +49,6 @@ 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)
-Patch16: kdebase-workspace-4.5.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
@@ -102,10 +99,6 @@ Patch57: kde-workspace-4.8.0-bug796969.patch
 Patch58: kde-workspace-4.8.0-systemd-shutdown.patch
 
 ## upstream patches
-# clock-widget/locale crasher
-# https://projects.kde.org/projects/kde/kde-workspace/repository/revisions/9f3612f9adc290ab7c242d03c496afeed6be89d7
-Patch100: kde-workspace-4.8.3-plasma_clock_widget_locale.patch
-Patch101: calendartable-locale-crash.patch
 
 ## plasma active patches
 # adapted version of wac-html-widgets.patch
@@ -413,7 +406,6 @@ 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
@@ -433,8 +425,6 @@ Requires: akonadi
 %patch58 -p1 -b .systemd-shutdown
 
 # upstream patches
-%patch100 -p1 -b .plasma_clock_widget_locale
-%patch101 -p1 -b .calendartable-locale-crash
 
 # plasma-active
 %patch153 -p1 -b .wac-html-widgets
@@ -982,6 +972,10 @@ fi
 
 
 %changelog
+* 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
+
 * Tue May 08 2012 Than Ngo <than at redhat.com> - 4.8.3-4
 - add rhel/fedora conditions
 
diff --git a/sources b/sources
index 49eef10..34ef740 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-615a05d12337a0cba749951891e60513  kde-workspace-4.8.3.tar.xz
+09c93f786316975f1dea84d3d8e7917f  kde-workspace-4.8.80.tar.xz