[kdemultimedia] 4.7.97 drop kmix patch (upstreamed)

[Radek Novacek]

commit aa8518e56f2135624a1e80da837c7d0a1054130d
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Wed Jan 4 16:30:11 2012 +0100

    4.7.97
    drop kmix patch (upstreamed)

 .gitignore                      |    1 +
 kdemultimedia-4.7.95-kmix.patch |  355 ---------------------------------------
 kdemultimedia.spec              |   12 +-
 sources                         |    2 +-
 4 files changed, 8 insertions(+), 362 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 450c9a7..9fac7d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /kdemultimedia-4.7.80.tar.bz2
 /kdemultimedia-4.7.90.tar.bz2
 /kdemultimedia-4.7.95.tar.bz2
+/kdemultimedia-4.7.97.tar.bz2
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index d06d545..3168f84 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -5,8 +5,8 @@
 
 Name:    kdemultimedia
 Epoch:   6
-Version: 4.7.95
-Release: 2%{?dist}
+Version: 4.7.97
+Release: 1%{?dist}
 Summary: KDE Multimedia applications
 
 Group:   Applications/Multimedia
@@ -19,8 +19,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1: kdemultimedia-4.6.2-no_thumbs.patch 
 
 ## upstream patches
-# fix cpu/mem issue, https://bugs.kde.org/show_bug.cgi?id=288675
-Patch100: kdemultimedia-4.7.95-kmix.patch
 
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -135,8 +133,6 @@ Requires: %{name}-kio_audiocd = %{?epoch:%{epoch}:}%{version}-%{release}
 # no mplayerthumbs/ffmpegthumbs
 %patch1 -p1 -b .no_thumbs
 
-%patch100 -p0 -b .kmix
-
 
 %build
 
@@ -327,6 +323,10 @@ fi
 
 
 %changelog
+* Wed Jan 04 2012 Radek Novacek <rnovacek at redhat.com> - 6:4.7.97-1
+- 4.7.97
+- drop kmix patch (upstreamed)
+
 * Fri Dec 30 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.7.95-2
 - kmix chewing up cpu and memory (#766678,kde#288675)
 
diff --git a/sources b/sources
index c2e9a85..c4785b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1251d84f505fa639e502f9b88ae03000  kdemultimedia-4.7.95.tar.bz2
+a1ea81451ff06d8e32a4acb5697e30b3  kdemultimedia-4.7.97.tar.bz2