rpms/mono-bouncycastle/devel bccrypto-assemblyinfo.patch, NONE, 1.1 mono-bouncycastle.spec, 1.7, 1.8

[Kalev Lember]

Author: kalev

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

Modified Files:
	mono-bouncycastle.spec 
Added Files:
	bccrypto-assemblyinfo.patch 
Log Message:
Applied upstream patch to fix AssemblyInfo for 1.6


bccrypto-assemblyinfo.patch:
 AssemblyInfo.cs |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--- NEW FILE bccrypto-assemblyinfo.patch ---
commit 10ca95f3f02a5b5a5ebff11c934485f281e1c225
Author: bouncy <bouncy>
Date:   Sun Feb 7 08:11:02 2010 +0000

    Fix AssemblyInfo for 1.6

diff --git a/crypto/src/AssemblyInfo.cs b/crypto/src/AssemblyInfo.cs
index 8f6686f..8f94cdf 100644
--- a/crypto/src/AssemblyInfo.cs
+++ b/crypto/src/AssemblyInfo.cs
@@ -9,12 +9,17 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 //
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
+#if INCLUDE_IDEA
+[assembly: AssemblyTitle("BouncyCastle.CryptoExt")]
+[assembly: AssemblyDescription("Bouncy Castle Cryptography API (Extended)")]
+#else
+[assembly: AssemblyTitle("BouncyCastle.Crypto")]
+[assembly: AssemblyDescription("Bouncy Castle Cryptography API")]
+#endif
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("The Legion of the Bouncy Castle")]
-[assembly: AssemblyProduct("Bouncy Castle Cryptography API")]
-[assembly: AssemblyCopyright("Copyright (C) 2000-2009")]
+[assembly: AssemblyProduct("Bouncy Castle for .NET")]
+[assembly: AssemblyCopyright("Copyright (C) 2000-2010")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -29,7 +34,7 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the


Index: mono-bouncycastle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mono-bouncycastle/devel/mono-bouncycastle.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- mono-bouncycastle.spec	6 Feb 2010 01:48:24 -0000	1.7
+++ mono-bouncycastle.spec	7 Feb 2010 11:06:40 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:           mono-bouncycastle
 Version:        1.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Bouncy Castle Crypto Package for Mono
 
 Group:          System Environment/Libraries
@@ -13,7 +13,9 @@ URL:            http://www.bouncycastle.
 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
+Patch0:         bccrypto-use-strong-name.patch
+# Upstream patch to fix AssemblyInfo for 1.6
+Patch1:         bccrypto-assemblyinfo.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  mono-devel, nant
@@ -32,13 +34,14 @@ and real-world use the Java version has 
 
 %prep
 %setup -q -n csharp
-%patch0 -p1 -b .strongname
+%patch0 -p1 -b .use-strong-name
+%patch1 -p1 -b .assemblyinfo
 
 %build
 # Use the mono system key instead of generating our own here.
 cp -a /etc/pki/mono/mono.snk BouncyCastle.snk
 pushd crypto/
-nant compile-release
+nant -D:use-strong-name=true compile-release
 popd
 
 %install
@@ -58,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mono/bouncycastle/
 
 %changelog
+* Sun Feb 07 2010 Kalev Lember <kalev at smartlink.ee> - 1.6-3
+- Applied upstream patch to fix AssemblyInfo for 1.6
+
 * Sat Feb 06 2010 Kalev Lember <kalev at smartlink.ee> - 1.6-2
 - Updated strongname.patch to the version sent for upstream inclusion