diff --git a/.cvsignore b/.cvsignore index 4575e9f..4a49bd3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -kdemultimedia-4.0.99.tar.bz2 -kdemultimedia-4.1.0.tar.bz2 -kdemultimedia-4.1.1.tar.bz2 +kdemultimedia-4.1.2.tar.bz2 diff --git a/kdemultimedia-4.1.1-kde#170941-dragon.patch b/kdemultimedia-4.1.1-kde#170941-dragon.patch deleted file mode 100644 index 2529958..0000000 --- a/kdemultimedia-4.1.1-kde#170941-dragon.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp.orig kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp ---- kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp.orig 2008-09-17 00:14:07.000000000 +0200 -+++ kdemultimedia-4.1.1/dragonplayer/src/app/videoWindow.cpp 2008-09-17 00:16:49.000000000 +0200 -@@ -529,15 +529,13 @@ debug() << "chapters: " << m_controller- - refreshXineStream(); - updateChannels(); - -- if(m_adjustedSize==false) -- { -- ( (QWidget*) mainWindow() )->adjustSize(); -- m_adjustedSize=true; -- debug() << "adjusting size to video resolution"; -- } -- //m_vWidget->updateGeometry(); -- //updateGeometry(); -- -+ if(m_adjustedSize==false) -+ { -+ if( mainWindow() ) -+ ( (QWidget*) mainWindow() )->adjustSize(); -+ m_adjustedSize=true; -+ debug() << "adjusting size to video resolution"; -+ } - } - emit stateChanged( state( currentState ) ); - } diff --git a/kdemultimedia.spec b/kdemultimedia.spec index 716e1df..c2fb703 100644 --- a/kdemultimedia.spec +++ b/kdemultimedia.spec @@ -1,7 +1,8 @@ + Name: kdemultimedia Epoch: 6 -Version: 4.1.1 -Release: 2%{?dist} +Version: 4.1.2 +Release: 1%{?dist} Summary: K Desktop Environment - Multimedia applications Group: Applications/Multimedia @@ -9,8 +10,6 @@ Group: Applications/Multimedia License: GPLv2+ URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2 -# upstream patches -Patch100: kdemultimedia-4.1.1-kde#170941-dragon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # This one is normal, FLAC_OGG_LIBRARY is not actually used anyway: @@ -22,8 +21,8 @@ BuildRequires: cmake BuildRequires: flac-devel BuildRequires: giflib-devel BuildRequires: kde-filesystem >= 4 -BuildRequires: kdelibs4-devel >= %{version} -BuildRequires: kdebase-workspace-devel >= %{version} +#BuildRequires: kdelibs4-devel >= %{version} +#BuildRequires: kdebase-workspace-devel >= %{version} BuildRequires: libmusicbrainz-devel BuildRequires: libtheora-devel BuildRequires: libtunepimp-devel @@ -77,8 +76,6 @@ Requires: kdelibs4-devel kdebase-workspace-devel %prep %setup -q -n kdemultimedia-%{version} -# upstream patches -%patch100 -p1 -b .kde#170941-dragon %build @@ -152,6 +149,9 @@ rm -rf %{buildroot} %changelog +* Fri Sep 26 2008 Rex Dieter 4.1.2-1 +- 4.1.2 + * Wed Sep 17 2008 Than Ngo 4.1.1-2 - backport from trunk to fix dragon kpart crash in the embedding application diff --git a/sources b/sources index cea6479..e724bd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -efbf12cf33aafb13848fda258d001322 kdemultimedia-4.1.1.tar.bz2 +232001bb20ad40d039c99a86360705db kdemultimedia-4.1.2.tar.bz2