rpms/cryptix/devel cryptix-jdk15-compatibility.patch, NONE, 1.1 cryptix.spec, 1.10, 1.11

[Matt Wringe (mwringe)]

Author: mwringe

Update of /cvs/pkgs/rpms/cryptix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10963

Modified Files:
	cryptix.spec 
Added Files:
	cryptix-jdk15-compatibility.patch 
Log Message:
Apply patch (from Oliver Falk) to allow for building on a 1.5 jdk
(Bug #318181)


cryptix-jdk15-compatibility.patch:

--- NEW FILE cryptix-jdk15-compatibility.patch ---
diff -up cryptix-3.2.0/src/xjava/security/IJCE.java.jdk1.5fix cryptix-3.2.0/src/xjava/security/IJCE.java
--- src/xjava/security/IJCE.java.jdk1.5fix        2007-10-04 14:42:48.000000000 +0200
+++ src/xjava/security/IJCE.java  2007-10-04 14:43:17.000000000 +0200
@@ -195,9 +195,9 @@ public class IJCE
 
         String typedot = type + ".";
         Vector algorithms = new Vector();
-        Enumeration enum = provider.propertyNames();
-        while (enum.hasMoreElements()) {
-            String key = (String) (enum.nextElement());
+        Enumeration enum1 = provider.propertyNames();
+        while (enum1.hasMoreElements()) {
+            String key = (String) (enum1.nextElement());
             if (key.startsWith(typedot))
                 algorithms.addElement(key.substring(typedot.length()));
         }
@@ -236,18 +236,18 @@ public class IJCE
         Provider[] providers = getProvidersInternal();
 
         for (int i = 0; i < providers.length; i++) {
-            Enumeration enum = providers[i].propertyNames();
-            while (enum.hasMoreElements()) {
-                String key = (String) (enum.nextElement());
+            Enumeration enum1 = providers[i].propertyNames();
+            while (enum1.hasMoreElements()) {
+                String key = (String) (enum1.nextElement());
                 if (key.startsWith(typedot))
                     algorithms.put(key.substring(typedot.length()), "");
             }
         }
         String[] buf = new String[algorithms.size()];
-        Enumeration enum = algorithms.keys();
+        Enumeration enum1 = algorithms.keys();
         int n = 0;
-        while (enum.hasMoreElements())
-            buf[n++] = (String) (enum.nextElement());
+        while (enum1.hasMoreElements())
+            buf[n++] = (String) (enum1.nextElement());
 
         return buf;
     }


Index: cryptix.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cryptix/devel/cryptix.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cryptix.spec	10 Aug 2006 23:05:04 -0000	1.10
+++ cryptix.spec	30 Oct 2007 18:25:57 -0000	1.11
@@ -38,7 +38,7 @@
 
 Name:		cryptix
 Version:	3.2.0
-Release:	9jpp.1
+Release:	9jpp.2
 Epoch:		0
 Summary:	Java crypto package
 License:	BSD style
@@ -46,6 +46,7 @@
 Group:		Security/Cryptography
 Source0:	%{name}32-%{snapshot}-r%{version}-RHCLEAN.zip
 Source1:	%{name}.build.script
+Patch0:          cryptix-jdk15-compatibility.patch
 BuildRequires:	ant
 %if ! %{gcj_support}
 BuildArch:	noarch
@@ -82,6 +83,8 @@
 # correct silly permissions
 chmod -R go=u-w *
 
+%patch0 -b .sav
+
 %build
 export CLASSPATH=
 
@@ -144,6 +147,10 @@
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 04 2006 Matt Wringe <mwringe at redhat.com> 3.2.0-9jpp.2
+- Apply patch (from Oliver Falk) to allow for building on a 1.5 jdk
+  (Bug #318181)
+
 * Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 3.2.0-9jpp.1
 - Merge with upstream version:
  - Add missing javadoc post and unpost