Attachment 863653 Details for Bug 820117 – remove half unbundle bouncycastle

[patch] remove half unbundle bouncycastle

azu2.patch (text/plain), 2.58 KB, created by Sergio Basto on 2014-02-16 03:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergio Basto

Created: 2014-02-16 03:20:01 UTC

Size: 2.58 KB

patch

obsolete

>--- 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-10 20:34:25.000000000 +0100
>++++ 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
>  
>@@ -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 json_simple 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 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
>--- a/azureus.spec
>+++ b/azureus.spec
>@@ -36,14 +36,14 @@ 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:	bouncycastle >= 1.33-3
> BuildRequires:	eclipse-swt >= 3.5
> BuildRequires:	junit
>+BuildRequires:	json_simple
> Requires:	apache-commons-cli, log4j
> Requires:	apache-commons-lang
> Requires:	eclipse-swt >= 3.5
>-Requires:	 bouncycastle >= 1.33-3
>+#Requires:	 bouncycastle >= 1.33-3
> Requires:	 java >= 1:1.6.0
> Requires:	json_simple
> BuildRequires:	 java-devel >= 1:1.6.0
>@@ -70,7 +70,8 @@ cp %{SOURCE4} .
> %patch1 -p1 -b .remove-manifest-classpath
> %patch2 -p1 -b .no-shared-plugins
> 
>-%patch3 -p1 -b .nobcprov
>+#patch3 -p1 -b .nobcprov
>+
> 
> rm org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java
> rm org/gudy/azureus2/ui/swt/osx/Start.java
>@@ -107,7 +108,7 @@ rm -fR org/json
> 
> %build
> mkdir -p build/libs
>-build-jar-repository -p build/libs bcprov apache-commons-cli log4j \
>+build-jar-repository -p build/libs apache-commons-cli log4j \
>   junit apache-commons-lang json_simple
> 
> #ppc seems to have eclipse-swt.ppc64 installed so libdir can't be used

Actions: View | Diff

Attachments on bug 820117: 863653 | 863654 | 863655