[bouncycastle/el6/master: 8/8] Merge branch 'master' into el6

[stevetraylen]

commit 82633abfe60beaf9346f0db50b06fcbf9b6919d6
Merge: cd43612 ffee67b
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Mar 2 20:17:18 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	bcprov-jdk16-1.43.pom
    	bcprov-jdk16-1.45.pom
    	bcprov-jdk16-1.46.pom
    	bouncycastle.spec
    	sources

 .gitignore                                     |    3 +-
 bcprov-jdk16-1.45.pom => bcprov-jdk16-1.46.pom |    2 +-
 bouncycastle.spec                              |   39 +++++------------------
 sources                                        |    2 +-
 4 files changed, 13 insertions(+), 33 deletions(-)
---
diff --cc bouncycastle.spec
index f66d132,f333ad7..5f7a6e3
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@@ -203,16 -173,18 +178,20 @@@ f
  %{_javadocdir}/%{name}/
  
  %changelog
 -* Tue Mar 01 2011 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.46-1
++* Wed Mar 02 2011 Steve Traylen <steve.traylen at cern.ch> - 1.46-1
+ - Import Bouncy Castle 1.46.
++- Drop gcj.
+ 
 -* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.45-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 +* Tue May 11 2010 Steve Traylen <steve.traylen at cern.ch> - 1.45-6
 +- Jump release from 2 to 6 to permit easy upgrade from EL5
 +  to EL6.
  
 -* Thu Dec 30 2010 Alexander Kurtakov <akurtako at redhat.com> 1.45-2
 -- Drop gcj.
 -- Adapt to current guidelines.
 +* Tue May 11 2010 Steve Traylen <steve.traylen at cern.ch> - 1.45-2
 +- Exclude ppc64 on since no junit4 on this platform.
 +  https://bugzilla.redhat.com/show_bug.cgi?id=591091
  
 -* Thu Feb 11 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.45-1
 -- Import Bouncy Castle 1.45.
 +* Tue May 11 2010 Steve Traylen <steve.traylen at cern.ch> - 1.45-1
 +- Import Boucy Castle 1.45.
  
  * Sat Nov 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.44-1
  - Import Bouncy Castle 1.44.