[azureus/f19] - Unbundle json (Sérgio Basto <sergio at serjux.com>) (Bz 820117)
David Juran
djuran at fedoraproject.org
Tue Feb 11 20:05:08 UTC 2014
commit 82dd47055f5064318412c13df40a309e69cab2ab
Author: David Juran <djuran at redhat.com>
Date: Mon Feb 10 21:08:42 2014 +0100
- Unbundle json (Sérgio Basto <sergio at serjux.com>) (Bz 820117)
Conflicts:
azureus.spec
azureus-5.2-no-bundled-json.patch | 25 +++++++++++++++++++++++++
azureus-5.2.0.0-startupScript.patch | 4 ++--
azureus.spec | 23 ++++++++++++++++++++---
3 files changed, 47 insertions(+), 5 deletions(-)
---
diff --git a/azureus-5.2-no-bundled-json.patch b/azureus-5.2-no-bundled-json.patch
new file mode 100644
index 0000000..3e45001
--- /dev/null
+++ b/azureus-5.2-no-bundled-json.patch
@@ -0,0 +1,25 @@
+diff -up azureus-5.0.0.0/com/aelitis/azureus/util/ImportExportUtils.java.no-bundled-json azureus-5.0.0.0/com/aelitis/azureus/util/ImportExportUtils.java
+--- azureus-5.0.0.0/com/aelitis/azureus/util/ImportExportUtils.java.no-bundled-json 2012-07-12 22:37:36.000000000 +0200
++++ azureus-5.0.0.0/com/aelitis/azureus/util/ImportExportUtils.java 2014-02-11 20:34:18.000000000 +0100
+@@ -360,7 +360,7 @@ public final class ImportExportUtils {
+
+ throws IOException
+ {
+- List l = new JSONArray(data.length);
++ List l = new JSONArray();
+
+ map.put( key, l );
+
+diff -up azureus-5.0.0.0/com/aelitis/azureus/util/JSONUtils.java.no-bundled-json azureus-5.0.0.0/com/aelitis/azureus/util/JSONUtils.java
+--- azureus-5.0.0.0/com/aelitis/azureus/util/JSONUtils.java.no-bundled-json 2014-02-11 20:34:18.000000000 +0100
++++ azureus-5.0.0.0/com/aelitis/azureus/util/JSONUtils.java 2014-02-11 21:00:23.000000000 +0100
+@@ -135,7 +135,8 @@ public class JSONUtils
+ * @since 3.0.1.5
+ */
+ private static List encodeToJSONArray(Collection list) {
+- List newList = new JSONArray(list);
++ List newList = new JSONArray();
++ newList.addAll(list);
+
+ for (int i = 0; i < newList.size(); i++) {
+ Object value = newList.get(i);
diff --git a/azureus-5.2.0.0-startupScript.patch b/azureus-5.2.0.0-startupScript.patch
index 0ca32a7..4810f97 100644
--- a/azureus-5.2.0.0-startupScript.patch
+++ b/azureus-5.2.0.0-startupScript.patch
@@ -1,6 +1,6 @@
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
++++ azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript 2014-02-10 20:34:25.000000000 +0100
@@ -1,10 +1,25 @@
#!/bin/bash
@@ -27,7 +27,7 @@ diff -up azureus-5.2.0.0/org/gudy/azureus2/platform/unix/startupScript.startupSc
+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 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
#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
diff --git a/azureus.spec b/azureus.spec
index 5f9ee49..3a4aa5b 100644
--- a/azureus.spec
+++ b/azureus.spec
@@ -2,7 +2,7 @@
Name: azureus
Version: 5.0.0.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A BitTorrent Client
Group: Applications/Internet
License: GPLv2+
@@ -34,16 +34,21 @@ Patch9: azureus-4.8.1.2-no-bundled-apache-commons.patch
Patch10: azureus-5.2.0.0-startupScript.patch
+Patch11: azureus-5.2-no-bundled-json.patch
+
BuildRequires: ant, jpackage-utils >= 1.5, xml-commons-apis
BuildRequires: apache-commons-cli, log4j
BuildRequires: apache-commons-lang
BuildRequires: bouncycastle >= 1.33-3
+BuildRequires: json_simple
BuildRequires: eclipse-swt >= 3.5
BuildRequires: junit
Requires: apache-commons-cli, log4j
+Requires: apache-commons-lang
Requires: eclipse-swt >= 3.5
Requires: bouncycastle >= 1.33-3
Requires: java >= 1:1.6.0
+Requires: json_simple
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: desktop-file-utils
Requires(post): desktop-file-utils
@@ -70,7 +75,6 @@ cp %{SOURCE4} .
%patch3 -p1 -b .nobcprov
-
rm org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
rm org/gudy/azureus2/ui/swt/osx/Start.java
rm org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
@@ -87,6 +91,8 @@ rm org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java
%patch10 -p1 -b .startupScript
+%patch11 -p1 -b .no-bundled-json
+
#hacks to org.eclipse.swt.widgets.Tree2 don't compile.
rm -fR org/eclipse
@@ -97,10 +103,18 @@ chmod 644 *.txt
#remove bundled libs
rm -fR org/apache
+# requires org.bouncycastle.jce.provider
+# http://www.cs.berkeley.edu/~jonah/bc/org/bouncycastle/jce/provider/JCEECDHKeyAgreement.html
+# Bouncy Castle Cryptography Library 1.37
+#rm -fR org/bouncycastle
+rm -fR org/json
+# http://www.programmers-friend.org/download/ not found in fedora repos
+#rm -fR org/pf
+
%build
mkdir -p build/libs
build-jar-repository -p build/libs bcprov apache-commons-cli log4j \
- junit apache-commons-lang
+ junit apache-commons-lang json_simple
#ppc seems to have eclipse-swt.ppc64 installed so libdir can't be used
if [ -e /usr/lib/eclipse/swt.jar ];then
@@ -160,6 +174,9 @@ fi
%{_datadir}/azureus
%changelog
+* Mon Feb 10 2014 Sérgio Basto <sergio at serjux.com> - 5.0.0.0-4
+- Unbundle json (Bz 820117)
+
* 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)
More information about the scm-commits
mailing list