[tritonus] 665576 - lirary path update according to the Java SIG

lzap lzap at fedoraproject.org
Mon Mar 14 10:30:41 UTC 2011 

commit 537020a0f4efa17fcc2b3bc713bbc26e89a5352d
Author: Lukas Zapletal <lzap+git at redhat.com>
Date:   Mon Mar 14 11:30:32 2011 +0100

    665576 - lirary path update according to the Java SIG

 tritonus.spec |   71 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 37 insertions(+), 34 deletions(-)
---
diff --git a/tritonus.spec b/tritonus.spec
index 47a31e6..eca27f4 100644
--- a/tritonus.spec
+++ b/tritonus.spec
@@ -5,7 +5,7 @@ Summary:        Java Sound API Implementation
 URL:            http://www.tritonus.org/
 Group:          System Environment/Libraries
 Version:        0.3.7
-Release:        0.12.%{cvs_version}%{?dist}
+Release:        0.13.%{cvs_version}%{?dist}
 License:        LGPLv2+
 Source0:        %{name}-%{version}-%{cvs_version}.tar.bz2
 Source9:        %{name}-snapshot.sh
@@ -136,10 +136,10 @@ done
 sed -i '/Class-Path/d' build-common.xml
 
 # Fix libdir issues
-sed -i 's|/usr/lib|%{_libdir}|g' `find . -name Makefile.in`
+sed -i 's|/usr/lib|%{_libdir}/java|g' `find . -name Makefile.in`
 
 # Fedora doesn't like usage of System.loadLibrary
-sed -i 's|System.loadLibrary("\(.*\)")|System.load("%{_libdir}/%{name}/lib\1.so")|' `grep -rl loadLibrary *`
+sed -i 's|System.loadLibrary("\(.*\)")|System.load("%{_libdir}/java/%{name}/lib\1.so")|' `grep -rl loadLibrary *`
 
 # Fix compiler flags
 sed -i -e 's|-Werror||g' \
@@ -178,14 +178,14 @@ rm -rf %{buildroot}
 
 make install \
     LIBS="" \
-    JAVAEXTPATH=%{buildroot}%{_libdir}/%{name} \
-    JAVAEXTLIBPATH=%{buildroot}%{_libdir}/%{name} \
+    JAVAEXTPATH=%{buildroot}%{_libdir}/java/%{name} \
+    JAVAEXTLIBPATH=%{buildroot}%{_libdir}/java/%{name} \
     DESTDIR=%{buildroot}
 
 # jars
-install -dm 755 %{buildroot}%{_libdir}/%{name}
-install -pm 644 dist/*.jar %{buildroot}%{_libdir}/%{name}
-pushd %{buildroot}%{_libdir}/%{name}
+install -dm 755 %{buildroot}%{_libdir}/java/%{name}
+install -pm 644 dist/*.jar %{buildroot}%{_libdir}/java/%{name}
+pushd %{buildroot}%{_libdir}/java/%{name}
     for jar in *-%{version}*; do
         ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
     done
@@ -194,11 +194,11 @@ popd
 # symlinks in the java dir
 mkdir -p %{buildroot}%{_javadir}/%{name}
 pushd %{buildroot}%{_javadir}/%{name}
-    for jar in %{buildroot}%{_libdir}/%{name}/*-%{version}*; do
+    for jar in %{buildroot}%{_libdir}/java/%{name}/*-%{version}*; do
         J=$(basename ${jar})
         if [ "$J" != "%{name}_src-%{version}.jar" ]; then
-            ln -sf %{_libdir}/%{name}/$J $J
-            ln -sf %{_libdir}/%{name}/$J `echo $J | sed "s|-%{version}||g"`
+            ln -sf %{_libdir}/java/%{name}/$J $J
+            ln -sf %{_libdir}/java/%{name}/$J `echo $J | sed "s|-%{version}||g"`
         fi
     done
 popd
@@ -208,7 +208,7 @@ install -dm 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
 # No need to have symlinks for JNI files
-pushd %{buildroot}%{_libdir}/%{name}
+pushd %{buildroot}%{_libdir}/java/%{name}
     for sofile in *.so; do
         mv $sofile.1.0 $sofile
         rm -f $sofile.*
@@ -217,7 +217,7 @@ popd
 
 # Create JNI symlinks (bug 665426)
 mkdir -p %{buildroot}%{_jnidir}
-pushd %{buildroot}%{_libdir}/%{name}
+pushd %{buildroot}%{_libdir}/java/%{name}
     for sofile in *.so; do
         ln -s $sofile %{buildroot}%{_jnidir}
     done
@@ -230,25 +230,25 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc LGPL NEWS README doc/kaffe* doc/midi* doc/*TODO* doc/*proposal*
-%dir %{_libdir}/%{name}/
-%{_libdir}/%{name}/%{name}_share*.jar
+%dir %{_libdir}/java/%{name}/
+%{_libdir}/java/%{name}/%{name}_share*.jar
 %doc doc/%{name}faq.sgml
-%{_libdir}/%{name}/%{name}_core*.jar
+%{_libdir}/java/%{name}/%{name}_core*.jar
 %doc doc/AudioOutput*
-%{_libdir}/%{name}/%{name}_aos*.jar
-%{_libdir}/%{name}/%{name}_javasequencer*.jar
-%{_libdir}/%{name}/%{name}_remaining*.jar
+%{_libdir}/java/%{name}/%{name}_aos*.jar
+%{_libdir}/java/%{name}/%{name}_javasequencer*.jar
+%{_libdir}/java/%{name}/%{name}_remaining*.jar
 %doc doc/ALSA* doc/Alsa* doc/bindists/alsa/readme.txt
-%{_libdir}/%{name}/%{name}_alsa*.jar
-%{_libdir}/%{name}/lib%{name}alsa.so
-%{_libdir}/%{name}/%{name}_dsp*.jar
+%{_libdir}/java/%{name}/%{name}_alsa*.jar
+%{_libdir}/java/%{name}/lib%{name}alsa.so
+%{_libdir}/java/%{name}/%{name}_dsp*.jar
 %doc doc/compression*
-%{_libdir}/%{name}/%{name}_jorbis*.jar
-%{_libdir}/%{name}/%{name}_pvorbis*.jar
+%{_libdir}/java/%{name}/%{name}_jorbis*.jar
+%{_libdir}/java/%{name}/%{name}_pvorbis*.jar
 %doc doc/bindists/vorbis/readme.txt
-%{_libdir}/%{name}/%{name}_vorbis*.jar
-%{_libdir}/%{name}/lib%{name}vorbis.so
-%{_libdir}/%{name}/%{name}_src*.jar
+%{_libdir}/java/%{name}/%{name}_vorbis*.jar
+%{_libdir}/java/%{name}/lib%{name}vorbis.so
+%{_libdir}/java/%{name}/%{name}_src*.jar
 %{_javadir}/%{name}/%{name}_alsa*jar
 %{_javadir}/%{name}/%{name}_aos*jar
 %{_javadir}/%{name}/%{name}_core*jar
@@ -265,22 +265,22 @@ rm -rf %{buildroot}
 %files cdda
 %defattr(-,root,root,-)
 %doc doc/cdda.txt doc/bindists/cdda/readme.txt
-%{_libdir}/%{name}/%{name}_cdda*.jar
-%{_libdir}/%{name}/lib%{name}cdparanoia.so
+%{_libdir}/java/%{name}/%{name}_cdda*.jar
+%{_libdir}/java/%{name}/lib%{name}cdparanoia.so
 %{_javadir}/%{name}/%{name}_cdda*jar
 
 %files esd
 %defattr(-,root,root,-)
 %doc doc/bindists/esd/readme.txt
-%{_libdir}/%{name}/%{name}_esd*.jar
-%{_libdir}/%{name}/lib%{name}esd.so
+%{_libdir}/java/%{name}/%{name}_esd*.jar
+%{_libdir}/java/%{name}/lib%{name}esd.so
 %{_javadir}/%{name}/%{name}_esd*jar
 
 %files fluidsynth
 %defattr(-,root,root,-)
 %doc doc/fluidsynth*
-%{_libdir}/%{name}/%{name}_fluidsynth*.jar
-%{_libdir}/%{name}/lib%{name}fluid.so
+%{_libdir}/java/%{name}/%{name}_fluidsynth*.jar
+%{_libdir}/java/%{name}/lib%{name}fluid.so
 %{_javadir}/%{name}/%{name}_fluidsynth*jar
 
 %files javadoc
@@ -290,11 +290,14 @@ rm -rf %{buildroot}
 %files gsm
 %defattr(-,root,root,-)
 %doc doc/compression*
-%{_libdir}/%{name}/%{name}_gsm*.jar
+%{_libdir}/java/%{name}/%{name}_gsm*.jar
 %{_javadir}/%{name}/%{name}_gsm*jar
 
 
 %changelog
+* Mon Mar 14 2011 Lukas Zapletal <lzap+rpm[@]redhat.com> - 0.3.7-0.13.20101108cvs
+- bug 665576 - so files installed in /usr/lib(64)/java/tritonus
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.7-0.12.20101108cvs
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

More information about the scm-commits mailing list