[kdebase-workspace] 4.6.5

[Jaroslav Reznik]

commit 6d51365b1116f6fedffce3ec876e105f18d4a7d6
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Jul 8 17:34:16 2011 +0200

    4.6.5

 .gitignore                                     |    6 +-
 kdebase-workspace-4.6.80-redhat_startkde.patch |  116 ------------------------
 kdebase-workspace-4.6.90-no_malloc_check.patch |   22 -----
 kdebase-workspace.spec                         |   11 ++-
 sources                                        |    4 +-
 5 files changed, 10 insertions(+), 149 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2b5aaae..0cc8ee9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-/kde-workspace-4.6.80.tar.bz2
-/kde-wallpapers-4.6.80.tar.bz2
-/kde-wallpapers-4.6.90.tar.bz2
-/kde-workspace-4.6.90.tar.bz2
+/kde-workspace-4.6.95.tar.bz2
+/kde-wallpapers-4.6.95.tar.bz2
diff --git a/kdebase-workspace-4.6.95-redhat_startkde.patch b/kdebase-workspace-4.6.95-redhat_startkde.patch
new file mode 100644
index 0000000..e69de29
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 0404a5c..178f5ec 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -3,12 +3,12 @@
 
 Summary: KDE Workspace
 Name:    kdebase-workspace
-Version: 4.6.90
+Version: 4.6.95
 
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version %{version} 
 
-Release: 4%{?dist}
+Release: 1%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -18,7 +18,7 @@ Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kde-wallpapers-%{versio
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # RH/Fedora-specific startkde changes
-Patch1: kdebase-workspace-4.6.80-redhat_startkde.patch
+Patch1: kdebase-workspace-4.6.95-redhat_startkde.patch
 
 # add konsole menuitem
 Patch2: kdebase-workspace-4.5.0-plasma-konsole.patch
@@ -70,7 +70,6 @@ Patch24: kdebase-workspace-4.6.90-multilib_qt_plugin_path.patch
 Patch50: kdebase-workspace-4.6.80-kde#171685.patch
 
 ## upstream patches
-Patch100: kdebase-workspace-4.6.90-no_malloc_check.patch
 
 ## Fedora specific patches
 ## HAL-ectomy
@@ -317,7 +316,6 @@ pushd %{name}-%{version}
 %patch50 -p1 -b .kde#171685
 
 # upstream patches
-%patch100 -p1 -b .no_malloc_check
 
 # Fedora patches
 %patch200 -p0 -b .no_HAL
@@ -752,6 +750,9 @@ fi
 
 
 %changelog
+* Fri Jul 08 2011 Jaroslav Reznik <jreznik at redhat.com> 4.6.95-1
+- 4.6.95 (rc2)
+
 * Wed Jul 06 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.90-4
 - move kgreet_* plugins to main pkg, needed by kscreenlocker (#711234)
 
diff --git a/sources b/sources
index b707fb6..976b60e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-58caae456cb24801647a0c6844bc0059  kde-wallpapers-4.6.90.tar.bz2
-217bdf23019c5df3eb7e2e07b00385e9  kde-workspace-4.6.90.tar.bz2
+6fdbe5d4ac5c53a8b96a294ae3234e1e  kde-workspace-4.6.95.tar.bz2
+45657ede208bdc14f4141746e1dbea24  kde-wallpapers-4.6.95.tar.bz2