rpms/kmid2/F-12 kmid2-0.2.1-drumstick-version.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 kmid2.spec, 1.7, 1.8 sources, 1.3, 1.4 kmid2-0.2.0-dont-translate-output-names.patch, 1.1, NONE kmid2-0.2.0-timidity-pulseaudio.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kmid2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27995/F-12

Modified Files:
	.cvsignore kmid2.spec sources 
Added Files:
	kmid2-0.2.1-drumstick-version.patch 
Removed Files:
	kmid2-0.2.0-dont-translate-output-names.patch 
	kmid2-0.2.0-timidity-pulseaudio.patch 
Log Message:
Sync from devel:

* Tue Feb 09 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.1-1
- Update to 0.2.1
- Drop upstreamed timidity-pulseaudio patch
- Drop dont-translate-output-names patch, should not be needed anymore
- BR drumstick-devel >= 0.2.99-0.3 (0.2.1 needs the 20100208 snapshot)
- relax drumstick version check in CMakeLists.txt as 0.3 is not out yet

kmid2-0.2.1-drumstick-version.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kmid2-0.2.1-drumstick-version.patch ---
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 1085734)
+++ CMakeLists.txt	(revision 1085733)
@@ -36,7 +36,7 @@
                 add_precompiled_header(precompiled_headers src/qt_kde.h)
             endif(USE_PCH)
             # Check for DRUMSTICK
-            pkg_check_modules(DRUMSTICK drumstick>=0.3)
+            pkg_check_modules(DRUMSTICK drumstick>=0.2)
             if (NOT DRUMSTICK_FOUND)
                 # build the local copy
                 set (DRUMSTICK_LIBRARIES drumstick ${ALSA_LIBRARIES})


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	1 Feb 2010 05:07:36 -0000	1.3
+++ .cvsignore	9 Feb 2010 17:55:24 -0000	1.4
@@ -1 +1 @@
-kmid2-0.2.0.tar.bz2
+kmid2-0.2.1.tar.bz2


Index: kmid2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/F-12/kmid2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- kmid2.spec	5 Feb 2010 14:26:34 -0000	1.7
+++ kmid2.spec	9 Feb 2010 17:55:25 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           kmid2
-Version:        0.2.0
-Release:        3%{?dist}
+Version:        0.2.1
+Release:        1%{?dist}
 Summary:        A MIDI/karaoke player for KDE
 
 Group:          Applications/Multimedia
@@ -9,14 +9,10 @@ License:        GPLv2+ and CC-BY
 URL:            http://userbase.kde.org/KMid2
 
 Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
-# support PulseAudio when autospawning TiMidity++ (-OO -opulse switches)
-# submitted upstream, will be in the next upstream release
-# http://websvn.kde.org/?view=revision&revision=1083480
-Patch0:         kmid2-0.2.0-timidity-pulseaudio.patch
-# don't translate output names (by uppercasing some letters) as the code
-# compares with fixed values
-# problem reported upstream
-Patch1:         kmid2-0.2.0-dont-translate-output-names.patch
+# relax drumstick version check in CMakeLists.txt as 0.3 is not out yet
+# 0.2.99-0.3.20100208svn has all the fixes and API additions in the bundled copy
+# svn diff -r 1085734:1085733 svn://anonsvn.kde.org/home/kde/trunk/playground/multimedia/kmid2
+Patch0:         kmid2-0.2.1-drumstick-version.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,7 +20,7 @@ BuildRequires:  kdelibs4-devel
 BuildRequires:  kde-filesystem
 BuildRequires:  cmake
 BuildRequires:  alsa-lib-devel
-BuildRequires:  drumstick-devel
+BuildRequires:  drumstick-devel >= 0.2.99-0.3
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 
@@ -51,8 +47,7 @@ It also has a keyboard view to see the n
 %setup -q
 # zap bundled copy of drumstick to guarantee it's never used
 rm -rf drumstick
-%patch0 -p1 -b .timidity-pulseaudio
-%patch1 -p1 -b .output-names
+%patch0 -p0 -b .drumstick-version
 
 
 %build
@@ -104,6 +99,13 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Tue Feb 09 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.1-1
+- Update to 0.2.1
+- Drop upstreamed timidity-pulseaudio patch
+- Drop dont-translate-output-names patch, should not be needed anymore
+- BR drumstick-devel >= 0.2.99-0.3 (0.2.1 needs the 20100208 snapshot)
+- relax drumstick version check in CMakeLists.txt as 0.3 is not out yet
+
 * Fri Feb 05 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.0-3
 - Don't translate output names, breaks autospawning sequencers
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	1 Feb 2010 05:07:36 -0000	1.3
+++ sources	9 Feb 2010 17:55:25 -0000	1.4
@@ -1 +1 @@
-6d445739481991437210bd92b85c0ca9  kmid2-0.2.0.tar.bz2
+3462b2d82c12893533e8bc3717850869  kmid2-0.2.1.tar.bz2


--- kmid2-0.2.0-dont-translate-output-names.patch DELETED ---


--- kmid2-0.2.0-timidity-pulseaudio.patch DELETED ---