[azureus/f19] - Fix warning re: /usr/share/azureus not beeing writable (Sergio Monteiro Basto) - Revert limiting j

[David Juran]

commit ef4897edd0fd9ef0bb77e39deb4ce1fc1d9f31f6
Author: David Juran <djuran at redhat.com>
Date:   Thu Feb 6 20:16:43 2014 +0100

    - Fix warning re: /usr/share/azureus not beeing writable (Sergio Monteiro Basto)
    - Revert limiting java heap size (Bz1040625)
    
    Conflicts:
    	azureus.spec

 azureus-5.2.0.0-startupScript.patch |   37 ++++++++++++++++++++++------------
 azureus.spec                        |    6 ++++-
 2 files changed, 29 insertions(+), 14 deletions(-)
---
diff --git a/azureus-5.2.0.0-startupScript.patch b/azureus-5.2.0.0-startupScript.patch
index e74642e..0ca32a7 100644
--- a/azureus-5.2.0.0-startupScript.patch
+++ b/azureus-5.2.0.0-startupScript.patch
@@ -1,18 +1,20 @@
-diff -up azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript.script azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript
---- azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript.script	2014-01-09 11:54:00.290327594 +0100
-+++ azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript	2014-01-09 15:53:39.329862716 +0100
-@@ -1,11 +1,25 @@
+diff -up azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript.startupScript azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript
+--- azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript.startupScript	2012-09-17 19:51:24.000000000 +0200
++++ azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript	2014-02-06 19:36:09.000000000 +0100
+@@ -1,10 +1,25 @@
  #!/bin/bash
  
  ######## CONFIGURATION OPTIONS ########
 -SCRIPT_NOT_CHANGED=0	# change this to 1 if you don't want your script overwritten!
 -JAVA_PROGRAM_DIR=""	# use full path to java bin dir, ex. "/usr/java/j2sdk1.4.2/bin/"
 -#PROGRAM_DIR="/home/username/apps/azureus"	# use full path to Azureus bin dir
+-JAVA_ARGS="-Xmx128m"
 +SCRIPT_NOT_CHANGED=1	# change this to 1 if you don't want your script overwritten!
 +JAVA_PROGRAM_DIR="/usr/lib/jvm/jre/bin/"	# use full path to java bin dir, ex. "/usr/java/j2sdk1.4.2/bin/"
-+PROGRAM_DIR="/usr/share/azureus"	# use full path to Azureus bin dir
- JAVA_ARGS="-Xmx128m"
- 
++
++PROGRAM_DIR="$HOME/.azureus/app"
++mkdir -p ${PROGRAM_DIR}
++
 +case $(uname -i) in
 +        *64)
 +                SWT=/usr/lib64/eclipse/swt.jar
@@ -26,11 +28,10 @@ diff -up azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript.script az
 +
 +
 +export LD_LIBRARY_PATH=$LIBDIR/eclipse/plugins/:$LIBDIR/eclipse/:$LIBDIR CLASSPATH=$SWT:`build-classpath bcprov apache-commons-cli log4j`:/usr/share/azureus/Azureus2.jar
-+
+ 
  #export MOZILLA_FIVE_HOME="/path/to/gre"	# Full path to GRE/Mozilla. When commenting out this line, also comment out the next line
  #if [ "$LD_LIBRARY_PATH x" = " x" ]; then export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME; else export LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH; fi
- #######################################
-@@ -37,84 +51,9 @@ MSG_JAVABORK="Java appeared to have cras
+@@ -37,136 +52,27 @@ MSG_JAVABORK="Java appeared to have cras
  
  SKIP_GCJ=1
  
@@ -114,9 +115,10 @@ diff -up azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript.script az
 -	# assume we can write to the user's home..
 +        TMP_SCRIPT=$(mktemp)
  
- 	${JAVA_PROGRAM_DIR}java "${JAVA_ARGS}" \
+-	${JAVA_PROGRAM_DIR}java "${JAVA_ARGS}" \
++	${JAVA_PROGRAM_DIR}java ${JAVA_ARGS} \
  		-cp "${CLASSPATH}" \
-@@ -122,51 +61,17 @@ runJavaOutput()
+ 		-Djava.library.path="${PROGRAM_DIR}" \
  		-Dazureus.install.path="${PROGRAM_DIR}" \
  		-Dazureus.script="$0" \
  		$JAVA_PROPS \
@@ -173,7 +175,7 @@ diff -up azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript.script az
  # Change path here so we can do for loop on program dirs with spaces
  cd "${PROGRAM_DIR}"
  
-@@ -175,17 +80,8 @@ for FILE in ./*.jar; do
+@@ -175,17 +81,8 @@ for FILE in ./*.jar; do
  	CLASSPATH="${CLASSPATH:+${CLASSPATH}:}$FILE"
  done
  
@@ -192,3 +194,12 @@ diff -up azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript.script az
  
  runJavaOutput "org.gudy.azureus2.platform.unix.ScriptBeforeStartup" "$@";
  
+@@ -195,7 +92,7 @@ echo "${JAVA_PROGRAM_DIR}java ${JAVA_ARG
+ # Don't use "exec -a Azureus ..." here as exec quits this script after completion,
+ # preventing ScriptAfterShutdown from running, which installs updates and does
+ # restarts
+-${JAVA_PROGRAM_DIR}java "${JAVA_ARGS}" \
++${JAVA_PROGRAM_DIR}java ${JAVA_ARGS} \
+ 	-cp "${CLASSPATH}" \
+ 	-Djava.library.path="${PROGRAM_DIR}" \
+ 	-Dazureus.install.path="${PROGRAM_DIR}" \
diff --git a/azureus.spec b/azureus.spec
index 6cc6052..5f9ee49 100644
--- a/azureus.spec
+++ b/azureus.spec
@@ -2,7 +2,7 @@
 
 Name:		azureus
 Version:	5.0.0.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	A BitTorrent Client
 Group:		Applications/Internet
 License:	GPLv2+
@@ -160,6 +160,10 @@ fi
 %{_datadir}/azureus
 
 %changelog
+* Mon Feb 10 2014 David Juran <djuran at redhat.com> - 5.0.0.0-3
+- Fix warning re: /usr/share/azureus not beeing writable (Sergio Monteiro Basto)
+- Revert limiting java heap size (Bz1040625)
+
 * Thu Jan 09 2014 David Juran <djuran at redhat.com> - 5.0.0.0-2
 - update startup script (Bz1040625)