[packages/java-xml-commons] Rel 14

[arekm]

commit e4a15be5a524e0b52c7d77217d32e9694d84314e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Mar 11 15:10:30 2026 +0100

    Rel 14

 java-xml-commons.spec          |  7 +++++--
 xml-commons.enum-keyword.patch | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
---
diff --git a/java-xml-commons.spec b/java-xml-commons.spec
index 5c67a98..ef5c070 100644
--- a/java-xml-commons.spec
+++ b/java-xml-commons.spec
@@ -1,5 +1,5 @@
 %define		subver	b2
-%define		rel	13
+%define		rel	14
 %define		srcname	xml-commons
 Summary:	Common code for Apache XML projects
 Summary(pl.UTF-8):	Wspólny kod dla projektów Apache XML
@@ -12,6 +12,7 @@ Source0:	http://www.apache.org/dist/xml/commons/%{srcname}-%{version}.%{subver}.
 # Source0-md5:	6c6551ece56948ee535d5f5014489b8d
 Patch0:		%{srcname}.build.patch
 Patch1:		%{srcname}.manifest.patch
+Patch2:		%{srcname}.enum-keyword.patch
 URL:		https://xerces.apache.org/xml-commons/
 BuildRequires:	ant
 BuildRequires:	jdk
@@ -57,9 +58,11 @@ Dokumentacja dla xml-commons.
 %{__sed} -i -e 's,\r$,,' build.xml
 %{__sed} -i -e 's,\r$,,' java/which.xml
 %{__sed} -i -e 's,\r$,,' java/external/build.xml
+%{__sed} -i -e 's,\r$,,' java/src/org/apache/env/Which.java
 
 %patch -P0 -p1
 %patch -P1 -p1
+%patch -P2 -p1
 
 %build
 %ant clean
@@ -78,7 +81,7 @@ ln -s %{srcname}-which-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-whic
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
-cp -a java/external/build/docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a java/external/build/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
 ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 
 %clean
diff --git a/xml-commons.enum-keyword.patch b/xml-commons.enum-keyword.patch
new file mode 100644
index 0000000..3948d88
--- /dev/null
+++ b/xml-commons.enum-keyword.patch
@@ -0,0 +1,36 @@
+diff -Nru xml-commons-1.0.b2.orig/java/src/org/apache/env/Which.java xml-commons-1.0.b2/java/src/org/apache/env/Which.java
+--- xml-commons-1.0.b2.orig/java/src/org/apache/env/Which.java
++++ xml-commons-1.0.b2/java/src/org/apache/env/Which.java
+@@ -289,12 +289,12 @@
+         if (null == hash)
+             return;
+ 
+-        Enumeration enum = hash.keys();
++        Enumeration keys = hash.keys();
+         Vector v = new Vector();
+ 
+-        while (enum.hasMoreElements())
++        while (keys.hasMoreElements())
+         {
+-            Object key = enum.nextElement();
++            Object key = keys.nextElement();
+             String keyStr = key.toString();
+             Object item = hash.get(key);
+ 
+@@ -311,12 +311,12 @@
+             }
+         }
+ 
+-        enum = v.elements();
++        Enumeration elems = v.elements();
+ 
+-        while (enum.hasMoreElements())
++        while (elems.hasMoreElements())
+         {
+-            String n = (String) enum.nextElement();
+-            Hashtable h = (Hashtable) enum.nextElement();
++            String n = (String) elems.nextElement();
++            Hashtable h = (Hashtable) elems.nextElement();
+ 
+             reportHashtable(h, n, out);
+         }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-xml-commons.git/commitdiff/e4a15be5a524e0b52c7d77217d32e9694d84314e