rpms/mono-bouncycastle/devel bccrypto-use-strong-name.patch, NONE, 1.1 bccrypto-strongname.patch, 1.2, NONE

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/mono-bouncycastle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12151

Added Files:
	bccrypto-use-strong-name.patch 
Removed Files:
	bccrypto-strongname.patch 
Log Message:
Replaced bccrypto-strongname.patch with upstream bccrypto-use-strong-name.patch


bccrypto-use-strong-name.patch:
 NBuild.build |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

--- NEW FILE bccrypto-use-strong-name.patch ---
commit 74bdeed9cab98fc55d964999509f76fd106f1ea9
Author: bouncy <bouncy>
Date:   Sun Feb 7 08:43:36 2010 +0000

    [#BMA-59]
    Support command-line option 'use-strong-name' to sign for all compile targets

diff --git a/crypto/NBuild.build b/crypto/NBuild.build
index e2a96ec..f4c471a 100644
--- a/crypto/NBuild.build
+++ b/crypto/NBuild.build
@@ -26,9 +26,16 @@
 
 	<property name="OPTIONAL_INCLUDE_IDEA" value="" />
 	<if test="${file::exists(api-srcpath + '/crypto/engines/IdeaEngine.cs')}">
+		<echo>Include extended algorithm set (IDEA)</echo> 
 		<property name="OPTIONAL_INCLUDE_IDEA" value=";INCLUDE_IDEA" />
 	</if>
 
+	<property name="OPTIONAL_STRONG_NAME" value="" />
+	<if test="${property::exists('use-strong-name') and use-strong-name}">
+		<echo>Compile targets will be signed using keyfile ../BouncyCastle.snk</echo> 
+		<property name="OPTIONAL_STRONG_NAME" value=";STRONG_NAME" />
+	</if>
+
 	<target name="init">
 		<call target="set-framework-props" />
 	</target>
@@ -101,7 +108,7 @@
 		<echo message="Compiling API in debug mode."/>
 		<mkdir dir="${api-debugpath}"/>
 		<csc target="library" noconfig="true" nostdlib="${enable-nostdlib}" output="${api-debugpath}/${name}.dll"
-			verbose="false" debug="true" define="${compile-defines}${OPTIONAL_INCLUDE_IDEA}">
+			verbose="false" debug="true" define="${compile-defines}${OPTIONAL_STRONG_NAME}${OPTIONAL_INCLUDE_IDEA}">
 			<sources>
 				<include name="${api-srcpath}/**/*.cs"/>
 				<include name="${bzip2-srcpath}/**/*.cs"/>
@@ -124,7 +131,7 @@
 		<echo message="Compiling Tests."/>
 		<mkdir dir="${api-debugpath}"/>
 		<csc target="library" noconfig="true" nostdlib="${enable-nostdlib}" output="${test-binpath}/BCTest.dll"
-			verbose="false" debug="true" define="${compile-defines}${OPTIONAL_INCLUDE_IDEA}">
+			verbose="false" debug="true" define="${compile-defines}${OPTIONAL_STRONG_NAME}${OPTIONAL_INCLUDE_IDEA}">
 			<sources>
 				<include name="${test-srcpath}/**/*.cs"/>
 			</sources>
@@ -147,7 +154,7 @@
 		<echo message="Compiling API in release mode."/>
 		<mkdir dir="${api-releasepath}"/>
 		<csc target="library" noconfig="true" nostdlib="${enable-nostdlib}" output="${api-releasepath}/${name}.dll"
-			verbose="false" debug="false" optimize="true" define="${compile-defines}${OPTIONAL_INCLUDE_IDEA}">
+			verbose="false" debug="false" optimize="true" define="${compile-defines}${OPTIONAL_STRONG_NAME}${OPTIONAL_INCLUDE_IDEA}">
 			<sources>
 				<include name="${api-srcpath}/**/*.cs"/>
 				<include name="${bzip2-srcpath}/**/*.cs"/>
@@ -196,7 +203,7 @@
 
 		<!-- One version with everything -->
 		<csc target="library" noconfig="true" nostdlib="${enable-nostdlib}" output="${dist-path}/${name-ext}.dll"
-			verbose="false" debug="false" optimize="true" define="${compile-defines};STRONG_NAME${OPTIONAL_INCLUDE_IDEA}">
+			verbose="false" debug="false" optimize="true" define="${compile-defines};STRONG_NAME;INCLUDE_IDEA">
 			<sources>
 				<include name="${dist-path}/src/csharp/crypto/${api-srcpath}/**/*.cs"/>
 				<include name="${dist-path}/src/csharp/crypto/${bzip2-srcpath}/**/*.cs"/>


--- bccrypto-strongname.patch DELETED ---