rpms/mono-bouncycastle/devel bccrypto-strongname.patch, 1.1, 1.2 mono-bouncycastle.spec, 1.6, 1.7

[Kalev Lember]

Author: kalev

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

Modified Files:
	bccrypto-strongname.patch mono-bouncycastle.spec 
Log Message:
Updated strongname.patch to the version sent for upstream inclusion


bccrypto-strongname.patch:
 NBuild.build |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: bccrypto-strongname.patch
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/bccrypto-strongname.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bccrypto-strongname.patch	6 Feb 2010 01:10:34 -0000	1.1
+++ bccrypto-strongname.patch	6 Feb 2010 01:48:24 -0000	1.2
@@ -1,12 +1,24 @@
 diff -up csharp/crypto/NBuild.build.strongname csharp/crypto/NBuild.build
 --- csharp/crypto/NBuild.build.strongname	2010-02-05 14:19:40.000000000 +0200
-+++ csharp/crypto/NBuild.build	2010-02-06 02:50:49.000000000 +0200
-@@ -147,7 +147,7 @@
++++ csharp/crypto/NBuild.build	2010-02-06 03:22:50.000000000 +0200
+@@ -29,6 +29,11 @@
+ 		<property name="OPTIONAL_INCLUDE_IDEA" value=";INCLUDE_IDEA" />
+ 	</if>
+ 
++	<property name="OPTIONAL_STRONG_NAME" value="" />
++	<if test="${file::exists('../BouncyCastle.snk')}">
++		<property name="OPTIONAL_STRONG_NAME" value=";STRONG_NAME" />
++	</if>
++
+ 	<target name="init">
+ 		<call target="set-framework-props" />
+ 	</target>
+@@ -147,7 +152,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_INCLUDE_IDEA};STRONG_NAME">
++			verbose="false" debug="false" optimize="true" define="${compile-defines}${OPTIONAL_INCLUDE_IDEA}${OPTIONAL_STRONG_NAME}">
  			<sources>
  				<include name="${api-srcpath}/**/*.cs"/>
  				<include name="${bzip2-srcpath}/**/*.cs"/>


Index: mono-bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/mono-bouncycastle.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mono-bouncycastle.spec	6 Feb 2010 01:10:34 -0000	1.6
+++ mono-bouncycastle.spec	6 Feb 2010 01:48:24 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           mono-bouncycastle
 Version:        1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bouncy Castle Crypto Package for Mono
 
 Group:          System Environment/Libraries
@@ -12,6 +12,7 @@ License:        MIT and ASL 2.0
 URL:            http://www.bouncycastle.org/csharp/
 Source0:        http://www.bouncycastle.org/csharp/download/bccrypto-net-%{version}-src.zip
 # Enable strongname signing so that we could install the assembly into GAC
+# http://www.bouncycastle.org/jira/browse/BMA-59
 Patch0:         bccrypto-strongname.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -57,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mono/bouncycastle/
 
 %changelog
+* Sat Feb 06 2010 Kalev Lember <kalev at smartlink.ee> - 1.6-2
+- Updated strongname.patch to the version sent for upstream inclusion
+
 * Sat Feb 06 2010 Kalev Lember <kalev at smartlink.ee> - 1.6-1
 - Update to version 1.6
 - Use upstream source zip now that IDEA code is removed