rpms/azureus/devel azureus.script,1.23,1.24 azureus.spec,1.77,1.78

[David Juran]

Author: djuran

Update of /cvs/pkgs/rpms/azureus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30544

Modified Files:
	azureus.script azureus.spec 
Log Message:
- Fix Bz 515228 properly



Index: azureus.script
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.script,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- azureus.script	3 Aug 2009 19:05:59 -0000	1.23
+++ azureus.script	4 Aug 2009 13:52:13 -0000	1.24
@@ -21,10 +21,12 @@ case $(uname -i) in
         *64)
                 eval $(grep '^GRE_PATH=' /etc/gre.d/gre64.conf)
                 SWT=/usr/lib64/eclipse/swt.jar
+		LIBDIR=/usr/lib64
                 ;;
         *)
                 eval $(grep '^GRE_PATH=' /etc/gre.d/gre.conf)
                 SWT=/usr/lib/eclipse/swt.jar
+		LIBDIR=/usr/lib
                 ;;
 esac
-MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:LIBDIR/eclipse/plugins/:LIBDIR/eclipse/:LIBDIR CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"
+MOZILLA_FIVE_HOME=$GRE_PATH JAVA_HOME=/usr/lib/jvm/java-openjdk LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LIBDIR/eclipse/plugins/:$LIBDIR/eclipse/:$LIBDIR CLASSPATH=$SWT:`build-classpath bcprov jakarta-commons-cli log4j gtk2.8 glib0.2`:/usr/share/azureus/Azureus2.jar java -Dazureus.install.path=$APPDIR -Dazureus.script.version=$SCRIPT_VERSION -Dazureus.script=$0 org.gudy.azureus2.ui.swt.Main "$@"


Index: azureus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/azureus/devel/azureus.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- azureus.spec	3 Aug 2009 19:05:59 -0000	1.77
+++ azureus.spec	4 Aug 2009 13:52:13 -0000	1.78
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	4.2.0.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -167,7 +167,6 @@ install -dm 755 $RPM_BUILD_ROOT%{_datadi
 install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/Azureus2.jar
 # TODO: fix launcher to be multilib-safe
 install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus
-sed --in-place "s:LIBDIR:%{_libdir}:g" $RPM_BUILD_ROOT%{_bindir}/azureus
 
 #install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins
 #install -pm 644 plugins/azplugins/azplugins_2.1.6.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_2.1.6.jar
@@ -228,6 +227,9 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Tue Aug  4 2009 David Juran <david at juran.se> - 4.2.0.4-2
+- Fix Bz 515228 properly
+
 * Wed Jul 29 2009 David Juran <david at juran.se> - 4.2.0.4-1
 - Upgrade to 4.2.0.4
 - Fix SWT dir on x86_64 (Bz 515228)