[packages/java-xerces] - change xml commons api R/BR to virtual dep java(xml-commons-apis) - add patch which fixes build on

[atler]

commit 1bf837dd27f1f39ac32b102c999b6c22c29115d6
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Aug 31 17:09:08 2014 +0200

    - change xml commons api R/BR to virtual dep java(xml-commons-apis)
    - add patch which fixes build on jdk >= 1.5

 java-xerces-jdk5.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 java-xerces.spec       |  6 ++++--
 2 files changed, 49 insertions(+), 2 deletions(-)
---
diff --git a/java-xerces.spec b/java-xerces.spec
index e04440a..a7f6cba 100644
--- a/java-xerces.spec
+++ b/java-xerces.spec
@@ -18,14 +18,15 @@ Source0:	http://www.apache.org/dist/xerces/j/Xerces-J-src.%{version}.tar.gz
 # Get Xerces-J-tools to avoid BuildRequires: xerces-j
 Source1:	http://www.apache.org/dist/xerces/j/Xerces-J-tools.%{version}.tar.gz
 # Source1-md5:	50700b3a6558202b056530babf80f1db
+Patch0:		%{name}-jdk5.patch
 URL:		http://xerces.apache.org/xerces-j/
 BuildRequires:	ant >= 1.6.5
-BuildRequires:	java-xml-commons
+BuildRequires:	java(xml-commons-apis)
 BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-Requires:	java-xml-commons
+Requires:	java(xml-commons-apis)
 Provides:	java(jaxp_parser_impl)
 Provides:	xerces-j
 Obsoletes:	xerces-j
@@ -57,6 +58,7 @@ Javadoc pour Xerces.
 
 %prep
 %setup -q -n xerces-%(echo %{version} | tr . _) -a1
+%patch0 -p1
 
 %build
 required_jars='xml-commons-apis'
diff --git a/java-xerces-jdk5.patch b/java-xerces-jdk5.patch
new file mode 100644
index 0000000..ec03df7
--- /dev/null
+++ b/java-xerces-jdk5.patch
@@ -0,0 +1,45 @@
+diff -urN xerces-2_11_0.orig/src/org/apache/html/dom/HTMLFrameElementImpl.java xerces-2_11_0/src/org/apache/html/dom/HTMLFrameElementImpl.java
+--- xerces-2_11_0.orig/src/org/apache/html/dom/HTMLFrameElementImpl.java	2014-08-31 16:50:03.067203907 +0200
++++ xerces-2_11_0/src/org/apache/html/dom/HTMLFrameElementImpl.java	2014-08-31 16:53:18.193864619 +0200
+@@ -127,6 +127,11 @@
+         setAttribute( "src", src );
+     }
+ 
++    public org.w3c.dom.Document getContentDocument()
++    {
++        throw new UnsupportedOperationException();
++    }
++
+     
+     /**
+      * Constructor requires owner document.
+diff -urN xerces-2_11_0.orig/src/org/apache/html/dom/HTMLIFrameElementImpl.java xerces-2_11_0/src/org/apache/html/dom/HTMLIFrameElementImpl.java
+--- xerces-2_11_0.orig/src/org/apache/html/dom/HTMLIFrameElementImpl.java	2014-08-31 16:55:43.767193510 +0200
++++ xerces-2_11_0/src/org/apache/html/dom/HTMLIFrameElementImpl.java	2014-08-31 16:56:16.483859178 +0200
+@@ -150,6 +150,11 @@
+         setAttribute( "width", width );
+     }
+ 
++    public org.w3c.dom.Document getContentDocument()
++    {
++        throw new UnsupportedOperationException();
++    }
++
+     
+     /**
+      * Constructor requires owner document.
+diff -urN xerces-2_11_0.orig/src/org/apache/html/dom/HTMLObjectElementImpl.java xerces-2_11_0/src/org/apache/html/dom/HTMLObjectElementImpl.java
+--- xerces-2_11_0.orig/src/org/apache/html/dom/HTMLObjectElementImpl.java	2014-08-31 16:55:43.767193510 +0200
++++ xerces-2_11_0/src/org/apache/html/dom/HTMLObjectElementImpl.java	2014-08-31 16:56:29.657192110 +0200
+@@ -239,6 +239,11 @@
+         setAttribute( "width", width );
+     }
+ 
++
++    public org.w3c.dom.Document getContentDocument()
++    {
++        throw new UnsupportedOperationException();
++    }
+     
+     
+     /**
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-xerces.git/commitdiff/1bf837dd27f1f39ac32b102c999b6c22c29115d6