rpms/frinika/F-10 frinika.sh,1.1,1.2 frinika.spec,1.1,1.2

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/frinika/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18466

Modified Files:
	frinika.sh frinika.spec 
Log Message:
* Mon Jul 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5.1-7.551svn
- Workaround the ppc64 builder failure
- Correct wrapper script for all 64bit archs in Fedora



Index: frinika.sh
===================================================================
RCS file: /cvs/pkgs/rpms/frinika/F-10/frinika.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- frinika.sh	6 Jul 2009 17:32:23 -0000	1.1
+++ frinika.sh	7 Jul 2009 00:13:43 -0000	1.2
@@ -3,7 +3,7 @@ JAVA=${JAVA:=java}
 NAME=frinika
 JP=/usr/share/java
 LP=/usr/lib
-for arch in ia64 x86_64 ppc64; do
+for arch in sparc64 s390x x86_64 ppc64; do
     if [[ $(uname -i) == "$arch" ]]; then
         LP=/usr/lib64
     fi
@@ -12,11 +12,7 @@ done
 MAINJARFILE=${JP}/${NAME}.jar
 PACKAGE_MAIN=com.frinika.FrinikaMain
 
-if [ -f ${LP}/flexdock/flexdock.jar ]; then
-   FLEXDOCK=${LP}/flexdock/flexdock.jar
-else
-   FLEXDOCK=`find ${LP}/flexdock -name flexdock*.jar`
-fi
+FLEXDOCK=${LP}/flexdock/flexdock.jar
 JJACK=${LP}/jjack/jjack.jar
 RASMUSDSP=${LP}/RasmusDSP/RasmusDSP.jar
 TOOTAUDIOSERVERS=${LP}/tootaudioservers/tootaudioservers.jar


Index: frinika.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frinika/F-10/frinika.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- frinika.spec	6 Jul 2009 17:32:23 -0000	1.1
+++ frinika.spec	7 Jul 2009 00:13:43 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:             frinika
 Version:          0.5.1
-Release:          6.%{svnver}svn%{?dist}
+Release:          7.%{svnver}svn%{?dist}
 Summary:          Music Workstation
 Group:            Applications/Multimedia
 License:          GPLv2+
@@ -116,11 +116,12 @@ sed -i 's|default\.sf2|PCLite.sf2|' \
 
 
 %build
-ln -s %{_libdir}/flexdock/flexdock.jar lib/
-ln -s %{_libdir}/jjack/jjack.jar lib/
-ln -s %{_libdir}/RasmusDSP/RasmusDSP.jar lib/
-ln -s %{_libdir}/tootaudioservers/tootaudioservers.jar lib/
-ln -s %{_libdir}/tritonus/tritonus_share.jar lib/
+# %%{_libdir} does not expand as expected on a ppc64 builder
+ln -s %{_prefix}/lib*/flexdock/flexdock.jar lib/
+ln -s %{_prefix}/lib*/jjack/jjack.jar lib/
+ln -s %{_prefix}/lib*/RasmusDSP/RasmusDSP.jar lib/
+ln -s %{_prefix}/lib*/tootaudioservers/tootaudioservers.jar lib/
+ln -s %{_prefix}/lib*/tritonus/tritonus_share.jar lib/
 build-jar-repository -s -p lib toot2 jmod jVorbisEnc jgoodies-looks jakarta-commons-logging skinlf SevenZip
 ant jar javadocs
 
@@ -180,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 06 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5.1-7.551svn
+- Workaround the ppc64 builder failure
+- Correct wrapper script for all 64bit archs in Fedora
+
 * Thu Jul 02 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.5.1-6.551svn
 - Update to svn revision 551
 - Optimize the fetch script and comment in the SPEC file about its usage