- patch fixing build with sun java 1.5

Changed files:
    cryptix-asn1-java-1.5.patch -> 1.1
    cryptix-asn1.spec -> 1.7

diff --git a/cryptix-asn1-java-1.5.patch b/cryptix-asn1-java-1.5.patch
new file mode 100644 (file)
index 0000000..42f88b8
--- /dev/null
+++ b/cryptix-asn1-java-1.5.patch
@@ -0,0 +1,46 @@
+diff -uNr Cryptix-asn1-20011119-orig/cryptix/asn1/encoding/PackageProperties.java Cryptix-asn1-20011119/cryptix/asn1/encoding/PackageProperties.java
+--- Cryptix-asn1-20011119-orig/cryptix/asn1/encoding/PackageProperties.java    1999-06-20 23:16:33.000000000 +0200
++++ Cryptix-asn1-20011119/cryptix/asn1/encoding/PackageProperties.java 2005-05-30 10:12:36.000000000 +0200
+@@ -112,9 +112,9 @@
+         out.println("# ----- Begin "+PACKAGE_NAME+" properties -----");\r
+         out.println("#");\r
+         String key, value;\r
+-        Enumeration enum = properties.propertyNames();\r
+-        while (enum.hasMoreElements()) {\r
+-            key = (String) enum.nextElement();\r
++        Enumeration enum_names = properties.propertyNames();\r
++        while (enum_names.hasMoreElements()) {\r
++            key = (String) enum_names.nextElement();\r
+             value = getProperty(key);\r
+             out.println(key + " = " + value);\r
+         }\r
+diff -uNr Cryptix-asn1-20011119-orig/cryptix/asn1/lang/PackageProperties.java Cryptix-asn1-20011119/cryptix/asn1/lang/PackageProperties.java
+--- Cryptix-asn1-20011119-orig/cryptix/asn1/lang/PackageProperties.java        1999-06-20 23:17:01.000000000 +0200
++++ Cryptix-asn1-20011119/cryptix/asn1/lang/PackageProperties.java     2005-05-30 10:13:05.000000000 +0200
+@@ -109,9 +109,9 @@
+         out.println("# ----- Begin "+PACKAGE_NAME+" properties -----");\r
+         out.println("#");\r
+         String key, value;\r
+-        Enumeration enum = properties.propertyNames();\r
+-        while (enum.hasMoreElements()) {\r
+-            key = (String) enum.nextElement();\r
++        Enumeration enum_names = properties.propertyNames();\r
++        while (enum_names.hasMoreElements()) {\r
++            key = (String) enum_names.nextElement();\r
+             value = getProperty(key);\r
+             out.println(key + " = " + value);\r
+         }\r
+diff -uNr Cryptix-asn1-20011119-orig/cryptix/asn1/lang/Parser.java Cryptix-asn1-20011119/cryptix/asn1/lang/Parser.java
+--- Cryptix-asn1-20011119-orig/cryptix/asn1/lang/Parser.java   1999-06-20 23:18:24.000000000 +0200
++++ Cryptix-asn1-20011119/cryptix/asn1/lang/Parser.java        2005-05-30 10:12:36.000000000 +0200
+@@ -2395,8 +2395,8 @@
+         jj_expentry[i] = jj_lasttokens[i];
+       }
+       boolean exists = false;
+-      for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
+-        int[] oldentry = (int[])(enum.nextElement());
++      for (java.util.Enumeration enum_elem = jj_expentries.elements(); enum_elem.hasMoreElements();) {
++        int[] oldentry = (int[])(enum_elem.nextElement());
+         if (oldentry.length == jj_expentry.length) {
+           exists = true;
+           for (int i = 0; i < jj_expentry.length; i++) {

diff --git a/cryptix-asn1.spec b/cryptix-asn1.spec
index b4b0e3d479001b72fd5b1604b444bf96058047bb..aa9a599bc15d95a474efb7010dd060a9c16a42c5 100644 (file)
--- a/cryptix-asn1.spec
+++ b/cryptix-asn1.spec
@@ -12,6 +12,7 @@ Source0:      Cryptix-asn1-%{snap}.tar.gz
 # Source0-md5: ac4080eee24b1cf0a476cee4fe501149
 Source1:       %{name}.build.xml
 URL:           http://cryptix-asn1.sf.net/
+Patch0:                %{name}-java-1.5.patch
 BuildRequires: cryptix
 BuildRequires: gnu.getopt
 BuildRequires: jakarta-ant >= 1.5
@@ -32,6 +33,7 @@ Pakiet kryptograficzny Javy zawieraj
 
 %prep
 %setup -q -n Cryptix-asn1-%{snap}
+%patch0 -p1
 cp %{SOURCE1} build.xml
 find . -name "*.jar" -exec rm -f {} \;