diff --git a/.gitignore b/.gitignore index a97e860..d8eb07d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/kdemultimedia-4.5.2.tar.bz2 -/kdemultimedia-4.5.3.tar.bz2 +/kdemultimedia-4.5.80.tar.bz2 diff --git a/kdemultimedia-4.3.75-kscd_doc.patch b/kdemultimedia-4.3.75-kscd_doc.patch deleted file mode 100644 index 00d1449..0000000 --- a/kdemultimedia-4.3.75-kscd_doc.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -r -U5 kdemultimedia-4.3.75svn1048496/doc/CMakeLists.txt kdemultimedia-4.3.75svn1048496.kscd_doc/doc/CMakeLists.txt ---- kdemultimedia-4.3.75svn1048496/doc/CMakeLists.txt 2009-10-06 17:37:54.000000000 -0400 -+++ kdemultimedia-4.3.75svn1048496.kscd_doc/doc/CMakeLists.txt 2009-11-23 22:04:55.000000000 -0500 -@@ -9,9 +9,9 @@ - endif() - if(BUILD_dragonplayer) - add_subdirectory(dragonplayer) - endif() - if (NOT APPLE) -- if(BUILD_kscd) -+ if(BUILD_kscd AND MUSICBRAINZ_FOUND) - add_subdirectory(kscd) -- endif() -+ endif(BUILD_kscd AND MUSICBRAINZ_FOUND) - endif (NOT APPLE) diff --git a/kdemultimedia-4.5.1-no_mplayerthumbs.patch b/kdemultimedia-4.5.1-no_mplayerthumbs.patch deleted file mode 100644 index 6cd5edf..0000000 --- a/kdemultimedia-4.5.1-no_mplayerthumbs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up kdemultimedia-4.5.1/CMakeLists.txt.nomplayerthumbs kdemultimedia-4.5.1/CMakeLists.txt ---- kdemultimedia-4.5.1/CMakeLists.txt.nomplayerthumbs 2010-07-07 12:12:23.000000000 -0500 -+++ kdemultimedia-4.5.1/CMakeLists.txt 2010-08-28 15:12:23.515676309 -0500 -@@ -42,7 +42,7 @@ configure_file (config.h.cmake ${CMAKE_C - - add_subdirectory(libkcddb) - add_subdirectory(libkcompactdisc) --add_subdirectory(mplayerthumbs) -+#add_subdirectory(mplayerthumbs) - - if (FFMPEG_FOUND AND SWSCALE_FOUND) - macro_optional_add_subdirectory(ffmpegthumbs) diff --git a/kdemultimedia-4.5.80-no_mplayerthumbs.patch b/kdemultimedia-4.5.80-no_mplayerthumbs.patch new file mode 100644 index 0000000..a38ccba --- /dev/null +++ b/kdemultimedia-4.5.80-no_mplayerthumbs.patch @@ -0,0 +1,12 @@ +diff -up kdemultimedia-4.5.80/CMakeLists.txt.nomplayerthumbs kdemultimedia-4.5.80/CMakeLists.txt +--- kdemultimedia-4.5.80/CMakeLists.txt.nomplayerthumbs 2010-11-11 08:42:16.000000000 -0600 ++++ kdemultimedia-4.5.80/CMakeLists.txt 2010-11-21 17:57:05.152363749 -0600 +@@ -42,7 +42,7 @@ configure_file (config.h.cmake ${CMAKE_C + + add_subdirectory(libkcddb) + add_subdirectory(libkcompactdisc) +-macro_optional_add_subdirectory(mplayerthumbs) ++#macro_optional_add_subdirectory(mplayerthumbs) + + if (FFMPEG_FOUND AND SWSCALE_FOUND) + macro_optional_add_subdirectory(ffmpegthumbs) diff --git a/kdemultimedia.spec b/kdemultimedia.spec index d876676..ca793d0 100644 --- a/kdemultimedia.spec +++ b/kdemultimedia.spec @@ -1,6 +1,6 @@ Name: kdemultimedia Epoch: 6 -Version: 4.5.3 +Version: 4.5.80 Release: 1%{?dist} Summary: KDE Multimedia applications @@ -8,12 +8,10 @@ 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}%{?alphatag}.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}%{?alphatag}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: kdemultimedia-4.5.1-no_mplayerthumbs.patch -# FIXME -Patch2: kdemultimedia-4.3.75-kscd_doc.patch +Patch1: kdemultimedia-4.5.80-no_mplayerthumbs.patch ## upstream patches @@ -33,7 +31,7 @@ BuildRequires: taglib-devel BuildRequires: xine-lib-devel libxcb-devel # needed to build Kscd, keep %define kscd 1 -BuildRequires: libtunepimp-devel libmusicbrainz-devel +BuildRequires: libtunepimp-devel libmusicbrainz3-devel %endif Requires: %{name}-libs%{?isa} = %{?epoch:%{epoch}:}%{version}-%{release} @@ -81,10 +79,7 @@ Requires: kdelibs4-devel %setup -q -n kdemultimedia-%{version}%{?alphatag} %if ! 0%{?mplayerthumbs} -%patch1 -p1 -b .nomplayerthumbs -%endif -%if ! 0%{?kscd} -%patch2 -p1 -b .kscd_doc +%patch1 -p1 -b .no_mplayerthumbs %endif @@ -180,6 +175,9 @@ fi %changelog +* Sun Nov 21 2010 Rex Dieter - 4.5.80-1 +- 4.5.80 (4.6beta1) + * Sun Oct 31 2010 Than Ngo - 6:4.5.3-1 - 4.5.3 diff --git a/sources b/sources index dd1f8c2..5e2248c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b17cf0f43b3934dd0604f451b6963ff kdemultimedia-4.5.3.tar.bz2 +7f1061962cff9ac481302ccde9db0866 kdemultimedia-4.5.80.tar.bz2