[kdemultimedia] 4.8.3

[Jaroslav Reznik]

commit aea23639aee8adad842175834278fab407e84153
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Apr 30 16:38:23 2012 +0200

    4.8.3

 .gitignore                                         |    3 +-
 ...-Prevent-kmixctrl-running-with-PulseAudio.patch |   32 -
 kdemultimedia-4.8.2-kmix_backport.patch            | 4445 --------------------
 kdemultimedia.spec                                 |   18 +-
 sources                                            |    2 +-
 5 files changed, 7 insertions(+), 4493 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e1944fb..72040e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/kdemultimedia-4.8.1.tar.xz
-/kdemultimedia-4.8.2.tar.xz
+/kdemultimedia-4.8.3.tar.xz
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 4243caf..9743ea1 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -5,8 +5,8 @@
 
 Name:    kdemultimedia
 Epoch:   6
-Version: 4.8.2
-Release: 4%{?dist}
+Version: 4.8.3
+Release: 1%{?dist}
 Summary: KDE Multimedia applications
 
 Group:   Applications/Multimedia
@@ -24,12 +24,6 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 Patch1: kdemultimedia-4.6.2-no_thumbs.patch 
 
 ## upstream patches
-# http://svnweb.mageia.org/packages/cauldron/kdemultimedia4/current/SOURCES/0100-Prevent-kmixctrl-running-with-PulseAudio.patch
-Patch100: 0100-Prevent-kmixctrl-running-with-PulseAudio.patch
-# svn diff \
-#   svn+ssh://anonsvn.kde.org/home/kde/tags/KDE/4.8.2/kdemultimedia/kmix/ \
-#   svn+ssh://anonsvn.kde.org/home/kde/branches/KDE/4.8/kdemultimedia/kmix 
-Patch101: kdemultimedia-4.8.2-kmix_backport.patch
 
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -145,11 +139,6 @@ Requires: %{name}-kio_audiocd = %{?epoch:%{epoch}:}%{version}-%{release}
 # no mplayerthumbs/ffmpegthumbs
 %patch1 -p1 -b .no_thumbs
 
-%patch100 -p1 -b .kmixctrl-running-with-PulseAudio
-pushd kmix
-%patch101 -p0 -b .kmix_backport
-popd
-
 
 %build
 
@@ -340,6 +329,9 @@ fi
 
 
 %changelog
+* Mon Apr 30 2012 Jaroslav Reznik <jreznik at redhat.com> - 6:4.8.3-1
+- 4.8.3
+
 * Tue Apr 24 2012 Rex Dieter <rdieter at fedoraproject.org> 6:4.8.2-4
 - kmix crashes when pulseaudio exits (#804363)
 - kmix is crashing after multiple volume changes (kde#290742)
diff --git a/sources b/sources
index 2dcc733..3a61a5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d95dadbe405d551ffe6458a4b266d1f  kdemultimedia-4.8.2.tar.xz
+d31072ec8fafef89dc469bf6c09ba836  kdemultimedia-4.8.3.tar.xz