[kdemultimedia] 4.7.80 (beta 1), remove dragon player dvd patch

Jaroslav Reznik jreznik at fedoraproject.org
Mon Nov 28 12:58:00 UTC 2011


commit 220c091b2f54a11515de437da446a2c7d1ceddf8
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Nov 28 13:57:50 2011 +0100

    4.7.80 (beta 1), remove dragon player dvd patch

 .gitignore                                         |    3 +-
 ...imedia-4.7.1-dragonplayer-phonon-dvd-menu.patch |  258 --------------------
 kdemultimedia.spec                                 |   13 +-
 sources                                            |    2 +-
 4 files changed, 6 insertions(+), 270 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7ff2c85..f79ae9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/kdemultimedia-4.7.2.tar.bz2
-/kdemultimedia-4.7.3.tar.bz2
+/kdemultimedia-4.7.80.tar.bz2
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 31b4349..39a4da8 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -5,7 +5,7 @@
 
 Name:    kdemultimedia
 Epoch:   6
-Version: 4.7.3
+Version: 4.7.80
 Release: 1%{?dist}
 Summary: KDE Multimedia applications
 
@@ -19,10 +19,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch1: kdemultimedia-4.6.2-no_thumbs.patch 
 
 ## upstream patches
-# make Dragon Player use Phonon instead of xine-lib for DVD menus
-# https://svn.reviewboard.kde.org/r/6794/
-# will be in 4.8
-Patch100: kdemultimedia-4.7.1-dragonplayer-phonon-dvd-menu.patch
 
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -137,10 +133,6 @@ Requires: %{name}-kio_audiocd = %{?epoch:%{epoch}:}%{version}-%{release}
 # no mplayerthumbs/ffmpegthumbs
 %patch1 -p1 -b .no_thumbs
 
-# make Dragon Player use Phonon instead of xine-lib for DVD menus
-pushd dragonplayer
-%patch100 -p0 -b .dvd-menus
-popd
 
 %build
 
@@ -331,6 +323,9 @@ fi
 
 
 %changelog
+* Mon Nov 28 2011 Jaroslav Reznik <jreznik at redhat.com> 6:4.7.80-1
+- 4.7.80 (beta 1)
+
 * Sat Oct 29 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.7.3-1
 - 4.7.3
 
diff --git a/sources b/sources
index 210b566..394d67b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75764dfaab78c75ec5d40534ae20aa15  kdemultimedia-4.7.3.tar.bz2
+598d435986d737c982ed9e7f0874d210  kdemultimedia-4.7.80.tar.bz2


More information about the scm-commits mailing list