rpms/kmid2/devel .cvsignore, 1.2, 1.3 kmid2.spec, 1.4, 1.5 sources, 1.2, 1.3

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kmid2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3785/devel

Modified Files:
	.cvsignore kmid2.spec sources 
Log Message:
* Sun Jan 31 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.0-1
- Update to 0.2.0
- The examples with copyright issues have been dropped by upstream
- BR drumstick-devel instead of aseqmm-devel


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Jan 2010 09:33:03 -0000	1.2
+++ .cvsignore	31 Jan 2010 21:59:56 -0000	1.3
@@ -1 +1 @@
-kmid2-0.1.1-patched.tar.bz2
+kmid2-0.2.0.tar.bz2


Index: kmid2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/devel/kmid2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kmid2.spec	27 Jan 2010 14:31:51 -0000	1.4
+++ kmid2.spec	31 Jan 2010 21:59:56 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           kmid2
-Version:        0.1.1
-Release:        4%{?dist}
+Version:        0.2.0
+Release:        1%{?dist}
 Summary:        A MIDI/karaoke player for KDE
 
 Group:          Applications/Multimedia
@@ -8,29 +8,7 @@ Group:          Applications/Multimedia
 License:        GPLv2+ and CC-BY
 URL:            http://userbase.kde.org/KMid2
 
-# remove content with unknown copyright status
-#
-# KMid2 is shipping some non-code content with unknown copyright status,
-# inherited from the original KMid. The README claims the files are GPL, however
-# it is unknown whether the authors of the sequenced versions approved of this
-# and there are also (non-expired) copyrights on the original music in 3 out of
-# 4 cases. Upstream has been notified of this issue.
-# These files are removed here and the CMakeLists.txt is patched for this:
-#
-# VERSION=0.1.1
-# rm -rf kmid2-${VERSION}
-# tar xjf kmid2-${VERSION}.tar.bz2
-# rm -f kmid2-${VERSION}/examples/*.kar
-# sed -i -e '/\.kar/d' kmid2-${VERSION}/examples/CMakeLists.txt
-# sed -i -e '3,+6d' -e 's/There are also/There are/g' kmid2-${VERSION}/examples/README
-# tar cjf kmid2-${VERSION}-patched.tar.bz2 kmid2-${VERSION}
-#
-# The 2 new examples are fine as the original music is out of copyright and
-# the MIDI files were sequenced by the KMid2 maintainer.
-
-# original tarball:
-# Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
-Source0:        %{name}-%{version}-patched.tar.bz2
+Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,7 +16,7 @@ BuildRequires:  kdelibs4-devel
 BuildRequires:  kde-filesystem
 BuildRequires:  cmake
 BuildRequires:  alsa-lib-devel
-BuildRequires:  aseqmm-devel
+BuildRequires:  drumstick-devel
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 
@@ -63,8 +41,8 @@ It also has a keyboard view to see the n
 
 %prep
 %setup -q
-# zap bundled copy of aseqmm to guarantee it's never used
-rm -rf aseqmm
+# zap bundled copy of drumstick to guarantee it's never used
+rm -rf drumstick
 
 
 %build
@@ -116,6 +94,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Jan 31 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.0-1
+- Update to 0.2.0
+- The examples with copyright issues have been dropped by upstream
+- BR drumstick-devel instead of aseqmm-devel
+
 * Wed Jan 27 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.1.1-4
 - Fix the kde4-config output parsing for 4.4 ("KDE Development Platform:")
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Jan 2010 09:33:03 -0000	1.2
+++ sources	31 Jan 2010 21:59:56 -0000	1.3
@@ -1 +1 @@
-e7832d75c0db1fc68bddb85a558123a2  kmid2-0.1.1-patched.tar.bz2
+6d445739481991437210bd92b85c0ca9  kmid2-0.2.0.tar.bz2