[azureus] Upgrade to Vuze-5.5.0.0
David Juran
djuran at fedoraproject.org
Mon Nov 24 14:51:23 UTC 2014
commit 7d9b2eeb07a79fd16d6d2ffabceb2fe2c8a91317
Author: David Juran <djuran at redhat.com>
Date: Mon Nov 24 15:51:04 2014 +0100
Upgrade to Vuze-5.5.0.0
.gitignore | 1 +
azureus-5.2.0.0-startupScript.patch | 49 +++++++++++++++++++---------------
azureus-5.4.0.0-fix_compile.patch | 20 +++++++-------
azureus.spec | 9 ++++--
sources | 2 +-
5 files changed, 45 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2776876..bf2191b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ Vuze_4502_source.zip
/Vuze_5200_source.zip
/Vuze_5300_source.zip
/Vuze_5400_source.zip
+/Vuze_5500_source.zip
diff --git a/azureus-5.2.0.0-startupScript.patch b/azureus-5.2.0.0-startupScript.patch
index 4810f97..98b7a61 100644
--- a/azureus-5.2.0.0-startupScript.patch
+++ b/azureus-5.2.0.0-startupScript.patch
@@ -1,37 +1,42 @@
-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-10 20:34:25.000000000 +0100
-@@ -1,10 +1,25 @@
+diff -up azureus-5.5.0.0/org/gudy/azureus2/platform/unix/startupScript.startupScript azureus-5.5.0.0/org/gudy/azureus2/platform/unix/startupScript
+--- azureus-5.5.0.0/org/gudy/azureus2/platform/unix/startupScript.startupScript 2014-11-19 18:30:30.000000000 +0100
++++ azureus-5.5.0.0/org/gudy/azureus2/platform/unix/startupScript 2014-11-24 14:57:31.099062462 +0100
+@@ -1,10 +1,10 @@
#!/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"
+-JAVA_ARGS="-Xmx256m"
+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="$HOME/.azureus/app"
++PROGRAM_DIR="$HOME/.azureus/app" # use full path to Azureus bin dir
+mkdir -p ${PROGRAM_DIR}
-+
+
+ #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
+@@ -12,6 +12,19 @@ JAVA_ARGS="-Xmx256m"
+
+ export SWT_GTK3=0 # things don't work well with the preliminary GTK3 SWT support
+
+case $(uname -i) in
-+ *64)
-+ SWT=/usr/lib64/eclipse/swt.jar
-+ LIBDIR=/usr/lib64
-+ ;;
-+ *)
-+ SWT=/usr/lib/eclipse/swt.jar
-+ LIBDIR=/usr/lib
-+ ;;
++ *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 json_simple bcprov apache-commons-cli log4j`:/usr/share/azureus/Azureus2.jar
++
+ ######## YOU PROBABLY DO NOT WANT TO TOUCH ANYTHING BELOW! ########
- #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,136 +52,27 @@ MSG_JAVABORK="Java appeared to have cras
+ SCRIPT_VERSION=4
+@@ -37,136 +50,27 @@ MSG_JAVABORK="Java appeared to have cras
SKIP_GCJ=1
@@ -175,7 +180,7 @@ diff -up azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript.startupSc
# Change path here so we can do for loop on program dirs with spaces
cd "${PROGRAM_DIR}"
-@@ -175,17 +81,8 @@ for FILE in ./*.jar; do
+@@ -175,17 +79,8 @@ for FILE in ./*.jar; do
CLASSPATH="${CLASSPATH:+${CLASSPATH}:}$FILE"
done
@@ -194,7 +199,7 @@ diff -up azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript.startupSc
runJavaOutput "org.gudy.azureus2.platform.unix.ScriptBeforeStartup" "$@";
-@@ -195,7 +92,7 @@ echo "${JAVA_PROGRAM_DIR}java ${JAVA_ARG
+@@ -195,7 +90,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
diff --git a/azureus-5.4.0.0-fix_compile.patch b/azureus-5.4.0.0-fix_compile.patch
index 0909272..f44a4f0 100644
--- a/azureus-5.4.0.0-fix_compile.patch
+++ b/azureus-5.4.0.0-fix_compile.patch
@@ -1,7 +1,7 @@
-diff -up azureus-5.4.0.0/org/gudy/azureus2/core3/util/AddressUtils.java.5.4.0.0_fix_compile azureus-5.4.0.0/org/gudy/azureus2/core3/util/AddressUtils.java
---- azureus-5.4.0.0/org/gudy/azureus2/core3/util/AddressUtils.java.5.4.0.0_fix_compile 2014-07-30 18:13:50.000000000 +0200
-+++ azureus-5.4.0.0/org/gudy/azureus2/core3/util/AddressUtils.java 2014-11-12 19:41:16.527000000 +0100
-@@ -469,11 +469,11 @@ AddressUtils
+diff -up azureus-5.5.0.0/org/gudy/azureus2/core3/util/AddressUtils.java.5.4.0.0_fix_compile azureus-5.5.0.0/org/gudy/azureus2/core3/util/AddressUtils.java
+--- azureus-5.5.0.0/org/gudy/azureus2/core3/util/AddressUtils.java.5.4.0.0_fix_compile 2014-11-19 18:30:46.000000000 +0100
++++ azureus-5.5.0.0/org/gudy/azureus2/core3/util/AddressUtils.java 2014-11-24 15:03:06.223293397 +0100
+@@ -494,11 +494,11 @@ AddressUtils
try{
// unfortunately we have an incompatible base64 standard in i2p, they replaced / with ~ and + with -
@@ -15,19 +15,19 @@ diff -up azureus-5.4.0.0/org/gudy/azureus2/core3/util/AddressUtils.java.5.4.0.0_
if ( c == '~' ){
encoded[i] = '/';
-diff -up azureus-5.4.0.0/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java.5.4.0.0_fix_compile azureus-5.4.0.0/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
---- azureus-5.4.0.0/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java.5.4.0.0_fix_compile 2014-07-30 18:13:46.000000000 +0200
-+++ azureus-5.4.0.0/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java 2014-11-12 19:45:53.402000000 +0100
-@@ -24,7 +24,7 @@ package org.gudy.azureus2.pluginsimpl.lo
+diff -up azureus-5.5.0.0/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java.5.4.0.0_fix_compile azureus-5.5.0.0/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java
+--- azureus-5.5.0.0/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java.5.4.0.0_fix_compile 2014-11-19 18:30:26.000000000 +0100
++++ azureus-5.5.0.0/org/gudy/azureus2/pluginsimpl/local/utils/xml/simpleparser/SimpleXMLParserDocumentImpl.java 2014-11-24 15:09:55.075086231 +0100
+@@ -25,7 +25,7 @@ package org.gudy.azureus2.pluginsimpl.lo
import javax.xml.parsers.*;
import org.xml.sax.*;
-import org.apache.commons.lang.Entities;
+import org.apache.commons.lang.StringEscapeUtils;
+ import org.gudy.azureus2.core3.util.AENetworkClassifier;
import org.gudy.azureus2.core3.util.Constants;
import org.gudy.azureus2.core3.util.Debug;
- import org.gudy.azureus2.plugins.utils.xml.simpleparser.SimpleXMLParserDocument;
-@@ -564,17 +564,8 @@ SimpleXMLParserDocumentImpl
+@@ -656,17 +656,8 @@ SimpleXMLParserDocumentImpl
replacement = new String( buffer, 0, buffer_pos );
}else{
diff --git a/azureus.spec b/azureus.spec
index c3a8a39..831844e 100644
--- a/azureus.spec
+++ b/azureus.spec
@@ -1,8 +1,8 @@
%global _newname Vuze
Name: azureus
-Version: 5.4.0.0
-Release: 3%{?dist}
+Version: 5.5.0.0
+Release: 1%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
@@ -12,7 +12,7 @@ License: GPLv2 with exceptions
URL: http://azureus.sourceforge.net
-Source0: http://downloads.sourceforge.net/azureus/%{_newname}_5400_source.zip
+Source0: http://downloads.sourceforge.net/azureus/%{_newname}_5500_source.zip
Source2: Azureus.desktop
Source3: azureus.applications
@@ -173,6 +173,9 @@ fi
%{_datadir}/azureus
%changelog
+* Mon Nov 24 2014 David Juran <djuran at redhat.com> - 5.5.0.0-1
+- Upgrade to Vuze-5.5.0.0
+
* Wed Nov 12 2014 David Juran <djuran at redhat.com> - 5.4.0.0-3
- Fix Desktop file (as suggested by Sergio Monteiro Basto)
diff --git a/sources b/sources
index 3241e18..081ce4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c4865c93f983992f38700f8d51390ef Vuze_5400_source.zip
+08c82f322c3fe43438349dbbe4c9136d Vuze_5500_source.zip
More information about the scm-commits
mailing list