rpms/kmid2/F-13 .cvsignore, 1.4, 1.5 kmid2.spec, 1.11, 1.12 sources, 1.4, 1.5 kmid2-0.2.1-drumstick-version.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kmid2/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30512/F-13

Modified Files:
	.cvsignore kmid2.spec sources 
Removed Files:
	kmid2-0.2.1-drumstick-version.patch 
Log Message:
Sync from devel:

* Fri May 28 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.3.0-1
- Update to 2.3.0 (new versioning scheme)
- BR drumstick-devel >= 0.3
- Requires: drumstick >= 0.3
- Drop obsolete drumstick-version patch
- Examples now partly CC-BY-SA, partly GPLv2+ (instead of CC-BY)
- Use _kde4_version macro
- Add -devel and -libs subpackages
- Package COPYING


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	9 Feb 2010 17:23:03 -0000	1.4
+++ .cvsignore	30 May 2010 23:57:24 -0000	1.5
@@ -1 +1 @@
-kmid2-0.2.1.tar.bz2
+kmid-2.3.0.tar.bz2


Index: kmid2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/F-13/kmid2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- kmid2.spec	9 Feb 2010 18:07:15 -0000	1.11
+++ kmid2.spec	30 May 2010 23:57:24 -0000	1.12
@@ -1,18 +1,14 @@
 Name:           kmid2
-Version:        0.2.1
-Release:        2%{?dist}
+Version:        2.3.0
+Release:        1%{?dist}
 Summary:        A MIDI/karaoke player for KDE
 
 Group:          Applications/Multimedia
-# GPLv2+ for the code, CC-BY for the examples
-License:        GPLv2+ and CC-BY
+# GPLv2+ for the code and the MMA examples, CC-BY-SA for the MIDI examples
+License:        GPLv2+ and CC-BY-SA
 URL:            http://userbase.kde.org/KMid2
 
-Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.bz2
-# 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
+Source0:        http://downloads.sourceforge.net/project/%{name}/%{version}/kmid-%{version}.tar.bz2
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,20 +16,18 @@ BuildRequires:  kdelibs4-devel
 BuildRequires:  kde-filesystem
 BuildRequires:  cmake
 BuildRequires:  alsa-lib-devel
-BuildRequires:  drumstick-devel >= 0.2.99-0.3
+BuildRequires:  drumstick-devel >= 0.3
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
 
-%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-%global kdelibs4_ver %((kde4-config --version 2>/dev/null || echo KDE 4.3.0) | grep '^KDE' | sed -e 's/KDE[^:]*:/KDE:/g' | cut -d' ' -f2 | cut -d'-' -f1)
-Requires:       kdelibs4%{?_isa} >= %{kdelibs4_ver}
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api}}
+%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
 Requires:       oxygen-icon-theme
-Requires:       drumstick >= 0.2.99-0.3
+Requires:       drumstick >= 0.3
+Requires:       %{name}-libs = %{version}-%{release}
 
 Obsoletes:      kmid < 2.0-1
-Provides:       kmid = 2.0-1
-
-Obsoletes:      kmid-devel < 2.0-1
+Provides:       kmid = %{version}-%{release}
 
 %description
 KMid2 is a MIDI/karaoke file player, with configurable midi mapper, real
@@ -43,12 +37,34 @@ color of the lyrics.
 It supports output through external synthesizers, AWE, FM and GUS cards.
 It also has a keyboard view to see the notes played by each instrument.
 
+%package libs
+Summary:        Runtime libraries for %{name}
+Group:          System Environment/Libraries
+License:        GPLv2+
+
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api}}
+%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}}
+
+%description libs
+%{summary}.
+
+%package devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+License:        GPLv2+
+
+Requires:       %{name}-libs = %{version}-%{release}
+
+Obsoletes:      kmid-devel < 2.0-1
+Provides:       kmid-devel = %{version}-%{release}
+
+%description devel
+%{summary}.
 
 %prep
-%setup -q
+%setup -q -n kmid-%{version}
 # zap bundled copy of drumstick to guarantee it's never used
 rm -rf drumstick
-%patch0 -p0 -b .drumstick-version
 
 
 %build
@@ -63,8 +79,8 @@ make %{?_smp_mflags} -C %{_target_platfo
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kmid2.desktop
-%find_lang %{name} --with-kde
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kmid.desktop
+%find_lang kmid --with-kde
 
 
 %clean
@@ -85,21 +101,43 @@ fi
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
-%files -f %{name}.lang
+
+%files -f kmid.lang
 %defattr(-,root,root,-)
-%doc ChangeLog README TODO
-%{_kde4_bindir}/kmid2
-%{_kde4_appsdir}/kmid2/
-%{_kde4_datadir}/applications/kde4/kmid2.desktop
+%doc ChangeLog COPYING README TODO
+%{_kde4_bindir}/kmid
+%{_kde4_appsdir}/kmid/
+%{_kde4_datadir}/applications/kde4/kmid.desktop
 %{_kde4_datadir}/config.kcfg/*
 %{_kde4_datadir}/kde4/services/*
 %{_kde4_datadir}/kde4/servicetypes/*
 %{_kde4_iconsdir}/hicolor/*/apps/*
 %{_kde4_libdir}/kde4/*
 
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkmidbackend.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkmidbackend.so
+%{_kde4_includedir}/kmid/
+
 
 %changelog
+* Fri May 28 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.3.0-1
+- Update to 2.3.0 (new versioning scheme)
+- BR drumstick-devel >= 0.3
+- Requires: drumstick >= 0.3
+- Drop obsolete drumstick-version patch
+- Examples now partly CC-BY-SA, partly GPLv2+ (instead of CC-BY)
+- Use _kde4_version macro
+- Add -devel and -libs subpackages
+- Package COPYING
+
 * Tue Feb 09 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2.1-2
 - Requires: drumstick >= 0.2.99-0.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmid2/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Feb 2010 17:23:03 -0000	1.4
+++ sources	30 May 2010 23:57:24 -0000	1.5
@@ -1 +1 @@
-3462b2d82c12893533e8bc3717850869  kmid2-0.2.1.tar.bz2
+9d49155c31d7ff73832e9f4efe2b183a  kmid-2.3.0.tar.bz2


--- kmid2-0.2.1-drumstick-version.patch DELETED ---