rpms/azureus/FC-6 azureus.script,1.10,1.11 azureus.spec,1.38,1.39

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/extras/rpms/azureus/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13029

Modified Files:
	azureus.script azureus.spec 
Log Message:
* Mon Nov 29 2006 Andrew Overholt <overholt at redhat.com> 2.5.0.0-9
- Use new swt jar location.
- Need to wait to build until forthcoming eclipse update (currently in
  fc6-updates-testing).



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-6/azureus.script,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- azureus.script	28 Oct 2006 14:14:28 -0000	1.10
+++ azureus.script	29 Nov 2006 18:12:35 -0000	1.11
@@ -15,4 +15,4 @@
 done;
 popd > /dev/null 2>&1
 
-LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:`build-classpath jakarta-commons-cli log4j swt-gtk-3.2 gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"
+LD_LIBRARY_PATH=/usr/lib/eclipse:/usr/lib CLASSPATH=/usr/share/java/gcj-endorsed/bcprov-1.33.jar:/usr/lib/eclipse/swt-gtk-3.2.jar:`build-classpath jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dgnu.gcj.runtime.VMClassLoader.library_control=never -Dazureus.install.path=$APPDIR org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-6/azureus.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- azureus.spec	28 Oct 2006 14:14:28 -0000	1.38
+++ azureus.spec	29 Nov 2006 18:12:35 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	2.5.0.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -101,8 +101,9 @@
 
 %build
 mkdir -p build/libs
-build-jar-repository -p build/libs jakarta-commons-cli swt-gtk-3.2 log4j gnu-crypto gtk2.8 glib0.2
+build-jar-repository -p build/libs jakarta-commons-cli log4j gnu-crypto gtk2.8 glib0.2
 ln -s /usr/share/java/gcj-endorsed/bcprov-1.33.jar build/libs
+ln -s %{_libdir}/eclipse/swt-gtk-3.2.jar build/libs
 find ./ -name osx | xargs rm -r
 find ./ -name macosx | xargs rm -r
 find ./ -name [Ww]in32\* | xargs rm -r
@@ -115,7 +116,7 @@
 cd plugins/azplugins
 unzip -q %{SOURCE5}
 rm -f *.jar `find ./ -name \*class`
-find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:.
+find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.2.jar:../..:.
 find ./ -name \*java | xargs rm
 jar cvf azplugins_1.9.jar .
 cd ../..
@@ -124,7 +125,7 @@
 cd plugins/bdcc
 unzip *.jar
 rm -f *.jar `find ./ -name \*class`
-find ./ -name \*java | xargs javac -cp `build-classpath swt-gtk-3.2`:../..:.
+find ./ -name \*java | xargs javac -cp %{_libdir}/eclipse/swt-gtk-3.2.jar:../..:.
 find ./ -name \*java | xargs rm
 jar cvf bdcc_2.2.2.jar .
 cd ../..
@@ -206,6 +207,11 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Mon Nov 29 2006 Andrew Overholt <overholt at redhat.com> 2.5.0.0-9
+- Use new swt jar location.
+- Need to wait to build until forthcoming eclipse update (currently in
+  fc6-updates-testing).
+
 * Sat Oct 28 2006 Anthony Green <green at redhat.com> 2.5.0.0-8
 - Force bcprov-1.33.jar onto the CLASSPATH in azureus.script so it
   will run on non-gcj java alternatives.