From 064bba21d54201a0c1047e13717fe53c45420522 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Jun 26 2009 13:26:09 +0000 Subject: 4.3rc1 drop kdemultimedia-4.2.3-noxine.patch, it's already included in 4.3rc1 --- diff --git a/.cvsignore b/.cvsignore index 6d17531..554d493 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ kdemultimedia-4.2.90.tar.bz2 +kdemultimedia-4.2.95.tar.bz2 diff --git a/kdemultimedia-4.2.3-noxine.patch b/kdemultimedia-4.2.3-noxine.patch deleted file mode 100644 index ef58ebd..0000000 --- a/kdemultimedia-4.2.3-noxine.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up kdemultimedia-4.2.3/doc/CMakeLists.txt.orig kdemultimedia-4.2.3/doc/CMakeLists.txt ---- kdemultimedia-4.2.3/doc/CMakeLists.txt.orig 2009-06-01 00:20:29.000000000 +0200 -+++ kdemultimedia-4.2.3/doc/CMakeLists.txt 2009-06-01 00:20:39.000000000 +0200 -@@ -3,9 +3,7 @@ if (TAGLIB_FOUND) - endif(TAGLIB_FOUND) - add_subdirectory(kioslave) - add_subdirectory(kmix) --if(XINE_XCB_FOUND) -- add_subdirectory(dragonplayer) --endif(XINE_XCB_FOUND) -+add_subdirectory(dragonplayer) - if (NOT APPLE) - add_subdirectory(kscd) - endif (NOT APPLE) diff --git a/kdemultimedia.spec b/kdemultimedia.spec index 339d29f..ce47a64 100644 --- a/kdemultimedia.spec +++ b/kdemultimedia.spec @@ -1,7 +1,7 @@ Name: kdemultimedia Epoch: 6 -Version: 4.2.90 -Release: 2%{?dist} +Version: 4.2.95 +Release: 1%{?dist} Summary: K Desktop Environment - Multimedia applications Group: Applications/Multimedia @@ -11,7 +11,6 @@ URL: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: kdemultimedia-4.2.3-noxine.patch Patch1: kdemultimedia-4.2.85-nomplayerthumbs.patch ## upstream patches @@ -74,7 +73,6 @@ Requires: kdelibs4-devel %prep %setup -q -n kdemultimedia-%{version} -%patch0 -p1 -b .noxine %patch1 -p1 -b .nomplayerthumbs @@ -165,6 +163,9 @@ fi %changelog +* Fri Jun 26 2009 Than Ngo - 4.2.95-1 +- 4.3rc1 + * Fri Jun 05 2009 Than Ngo - 4.2.90-2 - fix build issue without xine-lib diff --git a/sources b/sources index 5e32bb5..f01a78e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a00b7590971b8fcadf465485fe59743 kdemultimedia-4.2.90.tar.bz2 +38cb1f0146f351f6eb93f50eceaf9b1a kdemultimedia-4.2.95.tar.bz2