[kde-workspace] 4.8.3

[Jaroslav Reznik]

commit 2960109ce6fa41d63758ea726601f2ad11e83c22
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Apr 30 14:48:11 2012 +0200

    4.8.3
    
    - kdm grub2 integration upstreamed

 .gitignore                          |    2 +-
 kde-workspace-4.8.0-kdm_grub2.patch |   14 --------------
 kde-workspace.spec                  |   14 ++++++--------
 sources                             |    2 +-
 4 files changed, 8 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f9dbf0c..3a8d1aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kde-workspace-4.8.2.tar.xz
+/kde-workspace-4.8.3.tar.xz
diff --git a/kde-workspace.spec b/kde-workspace.spec
index f0c1653..28c0290 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -13,8 +13,8 @@
 
 Summary: KDE Workspace
 Name:    kde-workspace
-Version: 4.8.2
-Release: 3%{?dist}
+Version: 4.8.3
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -93,11 +93,6 @@ Patch52: kde-workspace-4.8.2-bz#732830-login.patch
 # http://bugs.kde.org/242065
 Patch53: kde-workspace-4.7.95-kdm_xauth.patch
 
-# grub2 integration
-# https://bugzilla.redhat.com/785849 
-# FIXME/TODO: make this configurable somehow, either at build or runtime
-Patch55: kde-workspace-4.8.0-kdm_grub2.patch
-
 # kwin/llvmpipe whitelist
 Patch56: kde-workspace-4.8.0-kwin_llvmpipe_whitelist.patch
 
@@ -427,7 +422,6 @@ Requires: akonadi
 %patch50 -p1 -b .kde#171685
 %patch52 -p1 -b .bz#732830-login
 %patch53 -p1 -b .kdm_xauth
-%patch55 -p1 -b .kdm_grub2
 ## omit for now, llvmpipe is not ready (http://bugzilla.redhat.com/794835)
 #patch56 -p1 -b .kwin_llvmpipe_whitelist
 %patch57 -p1 -b .bug796969
@@ -974,6 +968,10 @@ fi
 
 
 %changelog
+* Mon Apr 30 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.3-1
+- 4.8.3
+- kdm grub2 integration upstreamed
+
 * Tue Apr 3 2012 Lukas Tinkl <ltinkl at redhat.com> 4.8.2-3
 - respin 4.8.2 tarball
 
diff --git a/sources b/sources
index b6f3915..49eef10 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a725122bc968cce959fd2dfe3ef552ff  kde-workspace-4.8.2.tar.xz
+615a05d12337a0cba749951891e60513  kde-workspace-4.8.3.tar.xz