- add subpackage for tools

- package libportmidi.so.0. binary
- rel 1

Changed files:
    portmidi.spec -> 1.10

1 files changed, 43 insertions, 5 deletions

diff --git a/portmidi.spec b/portmidi.spec
index 4be5484..026ad0f 100644
--- a/portmidi.spec
+++ b/portmidi.spec
@@ -5,7 +5,7 @@ Summary:	Portable Real-Time MIDI library
 Summary(pl.UTF-8):	Przenośna biblioteka MIDI czasu rzeczywistego
 Name:		portmidi
 Version:	217
-Release:	0.1
+Release:	1
 License:	MIT-like
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/portmedia/%{version}/%{name}-src-%{version}.zip
@@ -42,6 +42,20 @@ Header files for PortMidi library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki PortMidi.
 
+%package tools
+Summary:	Tools to configure and use portmidi
+Summary(pl.UTF-8):	Narzędzia do konfiguracji i używania portmidi
+Group:		Applications/Multimedia
+Requires:	%{name} = %{version}-%{release}
+Requires:	java >= 1.5
+Requires:	jpackage-utils
+
+%description tools
+Tools to configure and use portmidi.
+
+%description tools -l pl.UTF-8
+Narzędzia do konfiguracji i używania portmidi.
+
 %prep
 %setup -q -n %{name}
 %patch0 -p1
@@ -55,7 +69,7 @@ export JAVA_HOME=%{java_home}
 
 # TODO: fix "undefined refernce" errors
 %if 0
-# Build the doxygen documentation:
+# Build the doxygen documentation
 doxygen
 cd latex
 %{__make}
@@ -67,6 +81,16 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# Install the test applications
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}
+for app in latency midiclock midithread midithru mm qtest sysex test; do
+	install build/Release/$app $RPM_BUILD_ROOT%{_libdir}/%{name}/
+done
+
+# PLD's jni library location is different
+mv $RPM_BUILD_ROOT%{_libdir}/libpmjni.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
+mv $RPM_BUILD_ROOT%{_javadir}/pmdefaults.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -76,13 +100,27 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG.txt README.txt license.txt pm_linux/README_LINUX.txt
-%attr(755,root,root) %{_bindir}/pmdefaults
-%attr(755,root,root) %ghost %{_libdir}/libportmidi.so.0
+%attr(755,root,root) %ghost %{_libdir}/libportmidi.so.0*
+%{_libdir}/libportmidi.so.0.
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpmjni.so
 %attr(755,root,root) %{_libdir}/libportmidi.so
 %attr(755,root,root) %{_libdir}/libportmidi_s.so
 %{_includedir}/portmidi.h
 %{_includedir}/porttime.h
+
+%files tools
+%defattr(644,root,root,755)
+%doc pm_java/pmdefaults/README.txt pm_cl/*
+%attr(755,root,root) %{_bindir}/pmdefaults
+%attr(755,root,root) %{_libdir}/portmidi/latency
+%attr(755,root,root) %{_libdir}/portmidi/libpmjni.so
+%attr(755,root,root) %{_libdir}/portmidi/midiclock
+%attr(755,root,root) %{_libdir}/portmidi/midithread
+%attr(755,root,root) %{_libdir}/portmidi/midithru
+%attr(755,root,root) %{_libdir}/portmidi/mm
+%attr(755,root,root) %{_libdir}/portmidi/pmdefaults.jar
+%attr(755,root,root) %{_libdir}/portmidi/qtest
+%attr(755,root,root) %{_libdir}/portmidi/sysex
+%attr(755,root,root) %{_libdir}/portmidi/test