[azureus/f19] UPdated startup script (Bz1040625)
David Juran
djuran at fedoraproject.org
Thu Jan 9 19:47:50 UTC 2014
commit 5eeea70d746faf3d084cd7bf86998545f0b0a9e9
Author: David Juran <djuran at redhat.com>
Date: Thu Jan 9 19:22:17 2014 +0100
UPdated startup script (Bz1040625)
Conflicts:
azureus.spec
azureus-5.2.0.0-startupScript.patch | 194 +++++++++++++++++++++++++++++++++++
azureus.script | 33 ------
azureus.spec | 14 ++-
3 files changed, 204 insertions(+), 37 deletions(-)
---
diff --git a/azureus-5.2.0.0-startupScript.patch b/azureus-5.2.0.0-startupScript.patch
new file mode 100644
index 0000000..e74642e
--- /dev/null
+++ b/azureus-5.2.0.0-startupScript.patch
@@ -0,0 +1,194 @@
+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 @@
+ #!/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
++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"
+
++case $(uname -i) in
++ *64)
++ SWT=/usr/lib64/eclipse/swt.jar
++ LIBDIR=/usr/lib64
++ ;;
++ *)
++ SWT=/usr/lib/eclipse/swt.jar
++ LIBDIR=/usr/lib
++ ;;
++esac
++
++
++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
+
+ SKIP_GCJ=1
+
+-look_for_java()
+-{
+- if command -v java &>/dev/null; then
+- if check_version ; then
+- echo $MSG11
+- return 0
+- fi
+- fi
+-
+- echo $MSG10
+-
+-
+- JAVA_CHECK_DIRS="/usr/java/latest /usr/java /usr/lib/jvm/latest /usr/lib/jvm"
+- for JAVADIR in $JAVA_CHECK_DIRS; do
+- IFS=$'\n'
+- potential_java_dirs=(`ls -1 "$JAVADIR" | sort | tac 2>/dev/null`)
+- IFS=
+- for D in "${potential_java_dirs[@]}"; do
+- if [[ -d "$JAVADIR/$D" && -x "$JAVADIR/$D/bin/java" ]]; then
+- JAVA_PROGRAM_DIR="$JAVADIR/$D/bin/"
+- echo $MSG2 $JAVA_PROGRAM_DIR
+- if check_version ; then
+- return 0
+- else
+- return 1
+- fi
+- fi
+- done
+- done
+-
+- if [ $SKIP_GCJ ] ; then
+- echo $MSG_RECHECK
+- SKIP_GCJ=
+- if look_for_java ; then
+- return 0
+- else
+- return 1
+- fi
+- else
+- echo $MSG8 "${JAVADIR}/" $MSG9 ; echo $MSG4
+- fi
+- return 1
+-}
+-
+-check_version()
+-{
+- if [ $SKIP_GCJ ] ; then
+- JAVA_ISGCJ=`"${JAVA_PROGRAM_DIR}java" -version 2>&1 | grep "gcj"`
+- if [ ! "$JAVA_ISGCJ x" = " x" ] ; then
+- echo $MSG_ISGCJ
+- return 1
+- fi
+- fi
+-
+- JAVA_HEADER=`"${JAVA_PROGRAM_DIR}java" -version 2>&1 | head -n 1`
+- JAVA_IMPL=`echo ${JAVA_HEADER} | cut -f1 -d' '`
+- if [ "$JAVA_IMPL" = "java" ] ; then
+- VERSION=`echo ${JAVA_HEADER} | sed "s/java version \"\(.*\)\"/\1/"`
+- if echo $VERSION | grep "^1.[0-3]" ; then
+- echo $MSG3 "[${JAVA_PROGRAM_DIR}java = ${VERSION}]" ; echo $MSG4
+- return 1
+- else
+- echo $MSG5 "[${JAVA_PROGRAM_DIR}java = ${VERSION}]" ; echo $MSG6
+- return 0
+- fi
+- elif [ "$JAVA_IMPL" = "#" ] ; then
+- echo $MSG_JAVABORK
+- ${JAVA_PROGRAM_DIR}java -version 2>&1
+- exit 1
+- else
+- echo $MSG7 "[${JAVA_PROGRAM_DIR}java = ${JAVA_IMPL}]" ; echo $MSG4
+- return 1
+- fi
+-}
+-
+ runJavaOutput()
+ {
+- # assume we can write to the user's home..
++ TMP_SCRIPT=$(mktemp)
+
+ ${JAVA_PROGRAM_DIR}java "${JAVA_ARGS}" \
+ -cp "${CLASSPATH}" \
+@@ -122,51 +61,17 @@ runJavaOutput()
+ -Dazureus.install.path="${PROGRAM_DIR}" \
+ -Dazureus.script="$0" \
+ $JAVA_PROPS \
+- "$@" > ~/azScript
+- if [ -f ~/azScript ]; then
+- chmod +x ~/azScript
+- . ~/azScript
+- rm ~/azScript
+- fi
+-}
++ "$@" > $TMP_SCRIPT
+
+-moveInSWT()
+-{
+- if [ ! -f "${PROGRAM_DIR}/swt.jar" ]; then
+- if [ ! "$(echo ${PROGRAM_DIR}/swt/*.jar)" = "${PROGRAM_DIR}/swt/*.jar" ]; then
+- if [ "`${JAVA_PROGRAM_DIR}java -cp \"${CLASSPATH}\" org.gudy.azureus2.platform.JavaBitMode`" = "64" ]; then
+- cp ${PROGRAM_DIR}/swt/swt64.jar ${PROGRAM_DIR}/swt.jar
+- else
+- cp ${PROGRAM_DIR}/swt/swt32.jar ${PROGRAM_DIR}/swt.jar
+- fi
+- fi
++ if [ -f ~/$TMP_SCRIPT ]; then
++ chmod +x $TMP_SCRIPT
++ . $TMP_SCRIPT
++ rm $TMP_SCRIPT
+ fi
+ }
+
+-
+ echo $MSG_STARTING
+
+-# locate and test the java executable
+-if [ "$JAVA_PROGRAM_DIR" == "" ]; then
+- if ! look_for_java ; then
+- exit 1
+- fi
+-fi
+-
+-# get the app dir if not already defined
+-if [ -z "$PROGRAM_DIR" ]; then
+- PROGRAM_DIR=`dirname "$0"`
+- PROGRAM_DIR=`cd "$PROGRAM_DIR"; pwd`
+-else
+- if [ "$(echo ${PROGRAM_DIR}/*.jar)" = "${PROGRAM_DIR}/*.jar" ]; then
+- echo "You seem to have set an invalid PROGRAM_DIR, unable to continue!"
+- exit 1
+- elif [ ! -f "${PROGRAM_DIR}/Azureus2.jar" ]; then
+- echo "Unable to locate Azureus2.jar in $PROGRAM_DIR, aborting!"
+- exit 1
+- fi
+-fi
+-
+ # 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
+ CLASSPATH="${CLASSPATH:+${CLASSPATH}:}$FILE"
+ done
+
+-moveInSWT
+-
+ # setup Java System Properties (no spaces in values)
+-JAVA_PROPS="-Dazureus.script.version=${SCRIPT_VERSION}"
+-if [ ! "$JAVA_ISGCJ x" = " x" ] ; then
+- JAVA_PROPS="$JAVA_PROPS -Dgnu.gcj.runtime.VMClassLoader.library_control=never"
+-fi
+-
+-# some distros symlink application level plugins into the users's plugin directory..
+-# remove all symlinks in user's plugin directory
+-find ~/.azureus/plugins -maxdepth 1 -type l -xtype d -exec rm {} \;
++JAVA_PROPS="-Dazureus.script.version=${SCRIPT_VERSION} -Dorg.eclipse.swt.browser.UseWebKitGTK=true"
+
+ runJavaOutput "org.gudy.azureus2.platform.unix.ScriptBeforeStartup" "$@";
+
diff --git a/azureus.spec b/azureus.spec
index d9e6697..6cc6052 100644
--- a/azureus.spec
+++ b/azureus.spec
@@ -2,7 +2,7 @@
Name: azureus
Version: 5.0.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
License: GPLv2+
@@ -10,7 +10,6 @@ URL: http://azureus.sourceforge.net
Source0: http://downloads.sourceforge.net/azureus/%{_newname}_5000_source.zip
-Source1: azureus.script
Source2: Azureus.desktop
Source3: azureus.applications
@@ -33,6 +32,8 @@ Patch8: azureus-4.8.1.2-fix-compile.patch
Patch9: azureus-4.8.1.2-no-bundled-apache-commons.patch
+Patch10: azureus-5.2.0.0-startupScript.patch
+
BuildRequires: ant, jpackage-utils >= 1.5, xml-commons-apis
BuildRequires: apache-commons-cli, log4j
BuildRequires: apache-commons-lang
@@ -84,6 +85,8 @@ rm org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
%patch9 -p1 -b .no-bundled-apache-commons
+%patch10 -p1 -b .startupScript
+
#hacks to org.eclipse.swt.widgets.Tree2 don't compile.
rm -fR org/eclipse
@@ -111,8 +114,8 @@ ant jar
%install
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins
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
+
+install -p -D -m 0755 org/gudy/azureus2/platform/unix/startupScript $RPM_BUILD_ROOT%{_bindir}/azureus
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
@@ -157,6 +160,9 @@ fi
%{_datadir}/azureus
%changelog
+* Thu Jan 09 2014 David Juran <djuran at redhat.com> - 5.0.0.0-2
+- update startup script (Bz1040625)
+
* Mon May 20 2013 Alexander Kurtakov <akurtako at redhat.com> 5.0.0.0-1
- Update to 5.0.0.0.
- Remove unused patches.
More information about the scm-commits
mailing list