From 46071f8fd086209837859ada63c04fbb97337740 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Feb 27 2009 12:26:07 +0000
Subject: 4.2.1


---

diff --git a/.cvsignore b/.cvsignore
index 801c793..4ac95ad 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ kdemultimedia-4.1.80.tar.bz2
 kdemultimedia-4.1.85.tar.bz2
 kdemultimedia-4.1.96.tar.bz2
 kdemultimedia-4.2.0.tar.bz2
+kdemultimedia-4.2.1.tar.bz2
diff --git a/kdemultimedia-4.2.0-dragon-second-sound.patch b/kdemultimedia-4.2.0-dragon-second-sound.patch
deleted file mode 100644
index 10aefd3..0000000
--- a/kdemultimedia-4.2.0-dragon-second-sound.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- trunk/KDE/kdemultimedia/dragonplayer/src/app/videoWindow.cpp	2009/01/21 21:22:50	914835
-+++ trunk/KDE/kdemultimedia/dragonplayer/src/app/videoWindow.cpp	2009/01/21 21:24:33	914836
-@@ -610,7 +610,8 @@
-     DEBUG_BLOCK
-     Phonon::SubtitleDescription desc = Phonon::SubtitleDescription::fromIndex( channel );
-     debug() << "using index: " << channel << " returned desc has index: " << desc.index();
--    m_controller->setCurrentSubtitle( desc );
-+    if(desc.isValid())  
-+      m_controller->setCurrentSubtitle( desc );
- }
- 
- void
-@@ -627,7 +628,8 @@
-     DEBUG_BLOCK
-     Phonon::AudioChannelDescription desc = Phonon::AudioChannelDescription::fromIndex( channel );
-     debug() << "using index: " << channel << " returned desc has index: " << desc.index();
--    m_controller->setCurrentAudioChannel( desc );
-+    if(desc.isValid())
-+      m_controller->setCurrentAudioChannel( desc );
- }
- 
- void
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 337dbbe..6eccabb 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -1,17 +1,15 @@
 Name: kdemultimedia
 Epoch: 6
-Version: 4.2.0
-Release: 3%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
 Summary: K Desktop Environment - Multimedia applications
 
-Group:     Applications/Multimedia
+Group:   Applications/Multimedia
 # see also: http://techbase.kde.org/Policies/Licensing_Policy
-License:   GPLv2+
-URL:       http://www.kde.org/
-Source0:   ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
+License: GPLv2+
+URL:     http://www.kde.org/
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 # upstream patches
-# from 4.2.1
-Patch100:  kdemultimedia-4.2.0-dragon-second-sound.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway:
@@ -69,8 +67,6 @@ Requires: kdelibs4-devel
 
 %prep
 %setup -q -n kdemultimedia-%{version}
-%patch100 -p3 -b .dragon-second-sound
-
 
 %build
 
@@ -148,6 +144,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Feb 27 2009 Than Ngo <than@redhat.com> - 4.2.1-1
+- 4.2.1
+
 * Sun Feb 22 2009 Tejas Dinkar <tejas@gja.in> - 4.2.0-3
 - fix kde#165249 No sound after second video file in Dragon Player (from 4.2.1)
 
diff --git a/sources b/sources
index 9f71e56..c21e03e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e944c87888ac1ac5b11d3722dd31f88  kdemultimedia-4.2.0.tar.bz2
+d3916cb7a0dd5cb4e230e5c19d99563b  kdemultimedia-4.2.1.tar.bz2