rpms/gnu-crypto/devel gnu-crypto-gcc41.patch, NONE, 1.1 gnu-crypto.spec, 1.19, 1.20

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/gnu-crypto/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12754

Modified Files:
	gnu-crypto.spec 
Added Files:
	gnu-crypto-gcc41.patch 
Log Message:
Hack around whatever changed in gcc 4.1

gnu-crypto-gcc41.patch:
 ClientMechanism.java |    4 ++--
 ServerMechanism.java |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE gnu-crypto-gcc41.patch ---
--- gnu-crypto-2.0.1/source/gnu/crypto/sasl/ClientMechanism.java.orig	2003-11-21 09:22:10.000000000 +0000
+++ gnu-crypto-2.0.1/source/gnu/crypto/sasl/ClientMechanism.java	2005-12-14 11:39:45.000000000 +0000
@@ -140,9 +140,9 @@
       return mechanism;
    }
 
-   public Object getNegotiatedProperty(final String propName) throws SaslException {
+   public Object getNegotiatedProperty(final String propName) {
       if (!isComplete()) {
-         throw new IllegalMechanismStateException();
+         throw new RuntimeException(new IllegalMechanismStateException());
       }
       if (Sasl.QOP.equals(propName)) {
          return getNegotiatedQOP();
--- gnu-crypto-2.0.1/source/gnu/crypto/sasl/ServerMechanism.java.orig	2003-11-21 09:26:14.000000000 +0000
+++ gnu-crypto-2.0.1/source/gnu/crypto/sasl/ServerMechanism.java	2005-12-14 11:40:06.000000000 +0000
@@ -147,9 +147,9 @@
       return this.authorizationID;
    }
 
-   public Object getNegotiatedProperty(final String propName) throws SaslException {
+   public Object getNegotiatedProperty(final String propName) {
       if (!isComplete()) {
-         throw new IllegalMechanismStateException();
+         throw new RuntimeException(new IllegalMechanismStateException());
       }
       if (Sasl.QOP.equals(propName)) {
          return getNegotiatedQOP();


Index: gnu-crypto.spec
===================================================================
RCS file: /cvs/dist/rpms/gnu-crypto/devel/gnu-crypto.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gnu-crypto.spec	13 Dec 2005 17:41:39 -0000	1.19
+++ gnu-crypto.spec	14 Dec 2005 11:56:09 -0000	1.20
@@ -2,7 +2,7 @@
 
 Name:           gnu-crypto
 Version:        2.0.1
-Release: 1jpp_9fc.1
+Release: 1jpp_9fc
 Epoch:          0
 Summary:        GNU Crypto library for Java
 
@@ -13,6 +13,7 @@
 Patch0:         %{name}-crosslink.patch
 # javax.security.auth.* is already in J2SE >= 1.4.
 Patch1:         %{name}-noauth.patch
+Patch2:         %{name}-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  ant, java-devel >= 0:1.4
@@ -81,6 +82,7 @@
 %if !%{gcj_support}
 %patch1 -p0
 %endif
+%patch2 -p1 -b .orig
 
 
 %build
@@ -239,11 +241,14 @@
 
 
 %changelog
+* Wed Dec 14 2005 Gary Benson <gbenson at redhat.com> - 0:2.0.1-1jpp_9fc
+- Rebuild for new gcj.
+
 * Tue Dec 13 2005 Jesse Keating <jkeating at redhat.com>
-- rebuilt for new gcj
+- Attempt rebuild for new gcj.
 
-* Sun Dec 11 2005 Warren Togami <wtogami at redhat.com> 0:2.0.1-1jpp_9fc
-- Attempt rebuild
+* Sun Dec 11 2005 Warren Togami <wtogami at redhat.com>
+- Attempt rebuild.
 
 * Wed Nov 16 2005 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:2.0.1-1jpp_8fc
 - Call rebuild-security-providers and rebuild-gcj-db conditionally on