packages: portmidi/portmidi.spec - fix broken so names installation - remov...

[lisu]

Author: lisu                         Date: Fri Jan 28 23:29:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix broken so names installation
- remove duplicate library
- rel 4

---- Files affected:
packages/portmidi:
   portmidi.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/portmidi/portmidi.spec
diff -u packages/portmidi/portmidi.spec:1.14 packages/portmidi/portmidi.spec:1.15
--- packages/portmidi/portmidi.spec:1.14	Tue Jan 25 17:03:00 2011
+++ packages/portmidi/portmidi.spec	Sat Jan 29 00:29:47 2011
@@ -6,7 +6,7 @@
 Summary(pl.UTF-8):	Przenośna biblioteka MIDI czasu rzeczywistego
 Name:		portmidi
 Version:	217
-Release:	3
+Release:	4
 License:	MIT-like
 Group:		Libraries
 Source0:	http://downloads.sourceforge.net/portmedia/%{version}/%{name}-src-%{version}.zip
@@ -68,13 +68,14 @@
 # Add shebang, lib and class path
 %{__sed} -i -e 's|^java|#!/bin/sh\njava \\\
 	-Djava.library.path=%{_libdir}/%{name}/|' \
-	-e 's|/usr/share/java/|%{_libdir}/%{name}/|' \
+	-e 's|%{_javadir}/|%{_libdir}/%{name}/|' \
 	pm_java/pmdefaults/pmdefaults
 
 %build
 export JAVA_HOME=%{java_home}
 %cmake \
-	-DCMAKE_CACHEFILE_DIR=%{_builddir}/%{name}/build
+	-DCMAKE_CACHEFILE_DIR=%{_builddir}/%{name}/build \
+	-DVERSION=%{version}
 
 %{__make} -j 1
 
@@ -109,6 +110,9 @@
 # desktop file
 desktop-file-install --dir=$RPM_BUILD_ROOT%{_desktopdir} %{SOURCE1}
 
+# remove duplicate library
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libportmidi_s.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -118,13 +122,12 @@
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG.txt README.txt license.txt pm_linux/README_LINUX.txt
-%attr(755,root,root) %ghost %{_libdir}/libportmidi.so.0*
-%{_libdir}/libportmidi.so.0.
+%attr(755,root,root) %{_libdir}/libportmidi.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libportmidi.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libportmidi.so
-%attr(755,root,root) %{_libdir}/libportmidi_s.so
 %{_includedir}/portmidi.h
 %{_includedir}/porttime.h
 
@@ -152,6 +155,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/01/28 23:29:47  lisu
+- fix broken so names installation
+- remove duplicate library
+- rel 4
+
 Revision 1.14  2011/01/25 16:03:00  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/portmidi/portmidi.spec?r1=1.14&r2=1.15&f=u