From 94e27dea618a791a3a377a2c592d9709dfa4ae79bab44cbbfa6bdaa401d2e537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 11 Jun 2014 12:54:09 +0000
Subject: [PATCH] osc copypac from project:Java:packages package:xerces-j2
 revision:25

OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=34
---
 Xerces-J-src.2.11.0.tar.gz                    |  3 -
 Xerces-J-src.2.8.1.tar.bz2                    |  3 +
 Xerces-J-tools.2.11.0.tar.gz                  |  3 -
 Xerces-J-tools.2.8.1.tar.bz2                  |  3 +
 java150_build.patch                           | 94 +++++++++++++++++++
 xerces-build.patch                            | 18 ++++
 ...j2-2.8.1_new_unsupported_dom_methods.patch | 74 +++++++++++++++
 xerces-j2-constants.1                         | 12 ---
 xerces-j2-gcj-switch-constants-bug.patch      | 79 ++++++++++++++++
 xerces-j2-parsing.patch                       | 19 ++++
 xerces-j2-version.1                           | 12 ---
 xerces-j2.spec                                | 48 +++++-----
 12 files changed, 314 insertions(+), 54 deletions(-)
 delete mode 100644 Xerces-J-src.2.11.0.tar.gz
 create mode 100644 Xerces-J-src.2.8.1.tar.bz2
 delete mode 100644 Xerces-J-tools.2.11.0.tar.gz
 create mode 100644 Xerces-J-tools.2.8.1.tar.bz2
 create mode 100644 java150_build.patch
 create mode 100644 xerces-build.patch
 create mode 100644 xerces-j2-2.8.1_new_unsupported_dom_methods.patch
 delete mode 100644 xerces-j2-constants.1
 create mode 100644 xerces-j2-gcj-switch-constants-bug.patch
 create mode 100644 xerces-j2-parsing.patch
 delete mode 100644 xerces-j2-version.1

diff --git a/Xerces-J-src.2.11.0.tar.gz b/Xerces-J-src.2.11.0.tar.gz
deleted file mode 100644
index 826aaa7..0000000
--- a/Xerces-J-src.2.11.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f59a5ef7b51bd883f2e9bda37a9360692e6c5e439b98d9b6ac1953e1f98b0680
-size 1792762
diff --git a/Xerces-J-src.2.8.1.tar.bz2 b/Xerces-J-src.2.8.1.tar.bz2
new file mode 100644
index 0000000..8fb79af
--- /dev/null
+++ b/Xerces-J-src.2.8.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ed1cb6b3bb65dfbf7a493dec45dba48673d6a7dd2ef28df5e32de6c0ddfefe0
+size 1242079
diff --git a/Xerces-J-tools.2.11.0.tar.gz b/Xerces-J-tools.2.11.0.tar.gz
deleted file mode 100644
index d30d5ee..0000000
--- a/Xerces-J-tools.2.11.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff9a5e3a12b4bdad5a9238db03ed5a4709831d3e2c13fe53601163c374ad2051
-size 7079679
diff --git a/Xerces-J-tools.2.8.1.tar.bz2 b/Xerces-J-tools.2.8.1.tar.bz2
new file mode 100644
index 0000000..acda1c3
--- /dev/null
+++ b/Xerces-J-tools.2.8.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b492f78042f5bbbc8cb7e0d9e82d7f7c0d1539b529b882310cdfc720839ce42
+size 4065452
diff --git a/java150_build.patch b/java150_build.patch
new file mode 100644
index 0000000..ec2355a
--- /dev/null
+++ b/java150_build.patch
@@ -0,0 +1,94 @@
+Index: xerces-2_8_1/build.xml
+===================================================================
+--- xerces-2_8_1.orig/build.xml
++++ xerces-2_8_1/build.xml
+@@ -240,6 +240,7 @@ Copyright:
+     </copy>
+ 
+     <xjavac srcdir="${build.src}"
++      source="1.4" target="1.4"
+            destdir="${build.dest}"
+            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}"
+            debug="${debug}"
+@@ -300,6 +301,7 @@ Copyright:
+         <fileset dir="${samples.dir}"/>
+     </copy>
+     <xjavac srcdir="${build.samples}"
++      source="1.4" target="1.4"
+            destdir="${build.dest}"
+            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
+            debug="${debug}"
+@@ -317,6 +319,7 @@ Copyright:
+          excludes="dom/rename/**" />
+     </copy>
+     <xjavac srcdir="${build.tests}"
++      source="1.4" target="1.4"
+            destdir="${build.dest}"
+            classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
+            debug="${debug}"
+@@ -403,6 +406,7 @@ Copyright:
+   	
+     <mkdir dir='${build.dir}/docs/javadocs/api'/>
+     <javadoc packagenames='javax.xml.*,org.w3c.*,org.xml.*'
++      source="1.4"
+       locale='en_US'
+       sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/api'
+       author='true' version='true'
+@@ -412,6 +416,7 @@ Copyright:
+       />
+     <mkdir dir='${build.dir}/docs/javadocs/xni'/>
+     <javadoc packagenames='org.apache.xerces.xni.*'
++      source="1.4"
+       locale='en_US'
+       sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/xni'
+       author='true' version='true'
+@@ -422,6 +427,7 @@ Copyright:
+       />
+     <mkdir dir='${build.dir}/docs/javadocs/xs'/>
+     <javadoc packagenames='org.apache.xerces.xs, org.apache.xerces.xs.datatypes'
++      source="1.4"
+       locale='en_US'
+       sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/xs'
+       author='true' version='true'
+@@ -441,7 +447,9 @@ Copyright:
+                            org.apache.xerces.xpointer'
+       locale='en_US'
+       sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/xerces2'
++      source="1.4"
+       classpath='${tools.dir}/${jar.resolver}'
++      
+       author='true' version='true'
+       windowtitle='Xerces2 Implementation' 
+       doctitle='Xerces2 Implementation'
+@@ -455,6 +463,7 @@ Copyright:
+       locale='en_US'
+       sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/other'
+       author='true' version='true'
++      source="1.4"
+       windowtitle='Other Classes' doctitle='Other Classes'
+       bottom='${copyright}'
+       additionalparam='${additional.param}'
+@@ -927,6 +936,7 @@ Copyright:
+     </copy>
+ 
+     <xjavac srcdir="${build.src}"
++      source="1.4" target="1.4"
+            destdir="${build.dest}"
+            debug="${debug}"
+            deprecation="${deprecation}"
+@@ -1213,6 +1223,7 @@ Copyright:
+     </copy>
+ 
+     <xjavac srcdir="${build.src}"
++      source="1.4" target="1.4"
+            destdir="${build.dest}"
+     	   classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
+            debug="${debug}"
+@@ -1361,6 +1372,7 @@ Copyright:
+         </copy>
+ 
+         <xjavac srcdir="${build.src}"
++      source="1.4" target="1.4"
+                destdir="${build.dest}"
+                classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}"
+                debug="${debug}"
diff --git a/xerces-build.patch b/xerces-build.patch
new file mode 100644
index 0000000..9b93f9b
--- /dev/null
+++ b/xerces-build.patch
@@ -0,0 +1,18 @@
+Index: build.xml
+===================================================================
+--- build.xml
++++ build.xml
+@@ -28,11 +28,13 @@ Copyright:
+   <property name="tools.dir" value="./tools"/>
+ 
+   <!-- enable compilation under JDK 1.4 and above -->
++  <!-- commented out by SUSE packager
+   <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
+     <classpath>
+       <pathelement location="${tools.dir}/bin/xjavac.jar"/>
+     </classpath>
+   </taskdef>
++  -->
+ 
+   <!-- Allow properties following these statements to be overridden -->
+   <!-- Note that all of these don't have to exist.  They've just been defined
diff --git a/xerces-j2-2.8.1_new_unsupported_dom_methods.patch b/xerces-j2-2.8.1_new_unsupported_dom_methods.patch
new file mode 100644
index 0000000..8fa007b
--- /dev/null
+++ b/xerces-j2-2.8.1_new_unsupported_dom_methods.patch
@@ -0,0 +1,74 @@
+Index: xerces-2_8_1/src/org/apache/html/dom/HTMLFrameElementImpl.java
+===================================================================
+--- xerces-2_8_1.orig/src/org/apache/html/dom/HTMLFrameElementImpl.java
++++ xerces-2_8_1/src/org/apache/html/dom/HTMLFrameElementImpl.java
+@@ -16,6 +16,8 @@
+ package org.apache.html.dom;
+ 
+ import org.w3c.dom.html.HTMLFrameElement;
++import org.w3c.dom.Document;
++import org.w3c.dom.DOMException;
+ 
+ /**
+  * @xerces.internal
+@@ -28,6 +30,10 @@ public class HTMLFrameElementImpl
+     extends HTMLElementImpl
+     implements HTMLFrameElement
+ {
++  public Document getContentDocument() {
++    throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "method not supportet");
++  }
++
+ 
+     private static final long serialVersionUID = 635237057173695984L; 
+ 
+Index: xerces-2_8_1/src/org/apache/html/dom/HTMLIFrameElementImpl.java
+===================================================================
+--- xerces-2_8_1.orig/src/org/apache/html/dom/HTMLIFrameElementImpl.java
++++ xerces-2_8_1/src/org/apache/html/dom/HTMLIFrameElementImpl.java
+@@ -14,6 +14,9 @@
+  * limitations under the License.
+  */
+ package org.apache.html.dom;
++import org.w3c.dom.Document;
++import org.w3c.dom.DOMException;
++
+ 
+ import org.w3c.dom.html.HTMLIFrameElement;
+ 
+@@ -31,6 +34,11 @@ public class HTMLIFrameElementImpl
+ 
+     private static final long serialVersionUID = 2393622754706230429L;
+ 
++    public Document getContentDocument() {
++      throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "method not supportet");
++    }
++
++
+     public String getAlign()
+     {
+         return capitalize( getAttribute( "align" ) );
+Index: xerces-2_8_1/src/org/apache/html/dom/HTMLObjectElementImpl.java
+===================================================================
+--- xerces-2_8_1.orig/src/org/apache/html/dom/HTMLObjectElementImpl.java
++++ xerces-2_8_1/src/org/apache/html/dom/HTMLObjectElementImpl.java
+@@ -16,6 +16,8 @@
+ package org.apache.html.dom;
+ 
+ import org.w3c.dom.html.HTMLObjectElement;
++import org.w3c.dom.Document;
++import org.w3c.dom.DOMException;
+ 
+ /**
+  * @xerces.internal
+@@ -31,6 +33,10 @@ public class HTMLObjectElementImpl
+     
+     private static final long serialVersionUID = 2276953229932965067L;
+ 
++    public Document getContentDocument() {
++      throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "method not supportet");
++    }
++
+     public String getCode()
+     {
+         return getAttribute( "code" );
diff --git a/xerces-j2-constants.1 b/xerces-j2-constants.1
deleted file mode 100644
index 02e5c75..0000000
--- a/xerces-j2-constants.1
+++ /dev/null
@@ -1,12 +0,0 @@
-.TH XERCES-J2-CONSTANTS 1 "08 April 2013" "xerces-2.11.0" "User commands"
-
-.SH NAME
-xerces-j2-constants \- display constants used by Xerces2 Java Parser
-
-.SH SYNOPSIS
-.BR xerces-j2-constants
-
-.SH DESCRIPTION
-
-Xerces-J2-Constants dumps common constants used by Xerces2 Java Parser
-to standard output.
diff --git a/xerces-j2-gcj-switch-constants-bug.patch b/xerces-j2-gcj-switch-constants-bug.patch
new file mode 100644
index 0000000..f76f42d
--- /dev/null
+++ b/xerces-j2-gcj-switch-constants-bug.patch
@@ -0,0 +1,79 @@
+Index: src/org/apache/xerces/xpointer/ElementSchemePointer.java
+===================================================================
+--- src/org/apache/xerces/xpointer/ElementSchemePointer.java
++++ src/org/apache/xerces/xpointer/ElementSchemePointer.java
+@@ -162,8 +162,7 @@ class ElementSchemePointer implements XP
+         while (tokens.hasMore()) {
+             int token = tokens.nextToken();
+ 
+-            switch (token) {
+-            case Tokens.XPTRTOKEN_ELEM_NCNAME: {
++            if( token == Tokens.XPTRTOKEN_ELEM_NCNAME) {
+                 // Note:  Only a single ShortHand pointer can be present
+ 
+                 // The shortHand name
+@@ -175,14 +174,12 @@ class ElementSchemePointer implements XP
+                 fShortHandPointer.setSchemeName(fShortHandPointerName);
+ 
+                 break;
+-            }
+-            case Tokens.XPTRTOKEN_ELEM_CHILD: {
++            } else if( token == Tokens.XPTRTOKEN_ELEM_CHILD) {
+                 tmpChildSequence[i] = tokens.nextToken();
+                 i++;
+ 
+                 break;
+-            }
+-            default:
++            } else {
+                 reportError("InvalidElementSchemeXPointer",
+                         new Object[] { xpointer });
+             }
+@@ -871,4 +868,4 @@ class ElementSchemePointer implements XP
+ 
+     } // class Scanner
+ 
+-}
+\ No newline at end of file
++}
+Index: src/org/apache/xerces/xpointer/XPointerHandler.java
+===================================================================
+--- src/org/apache/xerces/xpointer/XPointerHandler.java
++++ src/org/apache/xerces/xpointer/XPointerHandler.java
+@@ -165,8 +165,7 @@ public final class XPointerHandler exten
+         while (tokens.hasMore()) {
+             int token = tokens.nextToken();
+ 
+-            switch (token) {
+-            case Tokens.XPTRTOKEN_SHORTHAND: {
++            if(token ==  Tokens.XPTRTOKEN_SHORTHAND) {
+ 
+                 // The shortHand name
+                 token = tokens.nextToken();
+@@ -182,8 +181,7 @@ public final class XPointerHandler exten
+                 shortHandPointer.setSchemeName(shortHandPointerName);
+                 fXPointerParts.add(shortHandPointer);
+                 break;
+-            }
+-            case Tokens.XPTRTOKEN_SCHEMENAME: {
++            } else if(token ==  Tokens.XPTRTOKEN_SCHEMENAME) {
+ 
+                 // Retreive the local name and prefix to form the scheme name
+                 token = tokens.nextToken();
+@@ -273,8 +271,7 @@ public final class XPointerHandler exten
+                 }
+ 
+                 break;
+-            }
+-            default:
++            } else {
+                 reportError("InvalidXPointerExpression",
+                         new Object[] { xpointer });
+             }
+@@ -1248,4 +1245,4 @@ public final class XPointerHandler exten
+         super.setProperty(propertyId, value);
+     }
+ 
+-}
+\ No newline at end of file
++}
diff --git a/xerces-j2-parsing.patch b/xerces-j2-parsing.patch
new file mode 100644
index 0000000..7f09009
--- /dev/null
+++ b/xerces-j2-parsing.patch
@@ -0,0 +1,19 @@
+Index: xerces-2_8_1/src/org/apache/xerces/impl/XMLScanner.java
+===================================================================
+--- xerces-2_8_1.orig/src/org/apache/xerces/impl/XMLScanner.java	2006-09-14 03:23:36.000000000 +0200
++++ xerces-2_8_1/src/org/apache/xerces/impl/XMLScanner.java	2009-08-17 12:02:22.811296491 +0200
+@@ -1026,6 +1026,14 @@
+                     if (XMLChar.isMarkup(c) || c == ']') {
+                         fStringBuffer.append((char)fEntityScanner.scanChar());
+                     }
++                    else if (XMLChar.isHighSurrogate(c)) {
++                        scanSurrogates(fStringBuffer);
++                    }
++                    else if (isInvalidLiteral(c)) {
++                        reportFatalError("InvalidCharInSystemID",
++                                new Object[] { Integer.toHexString(c) }); 
++                        fEntityScanner.scanChar();
++                    }
+                 } while (fEntityScanner.scanLiteral(quote, ident) != quote);
+                 fStringBuffer.append(ident);
+                 ident = fStringBuffer;
diff --git a/xerces-j2-version.1 b/xerces-j2-version.1
deleted file mode 100644
index 2ae1074..0000000
--- a/xerces-j2-version.1
+++ /dev/null
@@ -1,12 +0,0 @@
-.TH XERCES-J2-VERSION 1 "08 April 2013" "xerces-2.11.0" "User commands"
-
-.SH NAME
-xerces-j2-version \- display version of Xerces2 Java Parser
-
-.SH SYNOPSIS
-.BR xerces-j2-version
-
-.SH DESCRIPTION
-
-Xerces-J2-Version prints version of Xerces2 Java Parser to standard
-output.
diff --git a/xerces-j2.spec b/xerces-j2.spec
index 96b593c..7925324 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xerces-j2
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,22 +18,25 @@
 
 Name:           xerces-j2
 %define name		xerces-j2
-%define version	2.11.0
-%define cvs_version	2_11_0
+%define version	2.8.1
+%define cvs_version	2_8_1
 %define release		3jpp
 %define section		free
-Version:        2.11.0
+Version:        2.8.1
 Release:        0
 Summary:        Java XML parser
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 Url:            http://xml.apache.org/xerces2-j/
-Source0:        http://www.eu.apache.org/dist/xerces/j/source/Xerces-J-src.%{version}.tar.gz
-Source1:        http://www.eu.apache.org/dist/xerces/j/source/Xerces-J-tools.%{version}.tar.gz
-Source2:        %{name}-version.sh
-Source3:        %{name}-version.1
-Source4:        %{name}-constants.sh
-Source5:        %{name}-constants.1
+Source0:        Xerces-J-src.%{version}.tar.bz2
+Source1:        %{name}-version.sh
+Source2:        %{name}-constants.sh
+Source3:        Xerces-J-tools.%{version}.tar.bz2
+Patch1:         java150_build.patch
+Patch2:         %{name}-%{version}_new_unsupported_dom_methods.patch
+#PATCH-FIX-UPSTREAM bnc#530717
+#http://svn.apache.org/viewvc?view=rev&revision=787352
+Patch3:         xerces-j2-parsing.patch
 Provides:       jaxp_parser_impl
 PreReq:         update-alternatives /bin/ln
 # some build requirements removed to enable jpackage bootstrap. this is
@@ -166,13 +169,11 @@ This package contains the APIs subproject of xml-commons.
 
 %prep
 %setup -q -n xerces-%{cvs_version}
-%setup -q -T -a 1 -D -n xerces-%{cvs_version}
+%setup -q -T -a 3 -D -n xerces-%{cvs_version}
 %setup -T -D -n xerces-%{cvs_version}
-
-echo 'javac.target=1.5' > build.properties
-echo 'javac.source=1.5' >> build.properties
-
-sed -i 's/\r//' LICENSE README NOTICE build.sh
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1 -b .parsing
 
 %build
 ## this uses the ant.jar provided by the xerces packages. Tough luck,
@@ -182,6 +183,7 @@ export JAVA_HOME=%{_libdir}/jvm/java-1.5.0-gcj
 export GC_MAXIMUM_HEAP_SIZE="134217728"
 export CLASSPATH=$CLASSPATH:`build-classpath antlr-bootstrap`
 sh build.sh jars
+
 #ant tests test
 
 %install
@@ -193,12 +195,8 @@ cp -p build/xml-apis.jar   $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}-xml-api
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 # scripts
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}-version
-cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/%{name}-constants
-# mans
-install -d -m 755 %{buildroot}%{_mandir}/man1
-install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1
-install -p -m 644 %{SOURCE5} %{buildroot}%{_mandir}/man1
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-version
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}-constants
 # demo
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -p build/xercesSamples.jar \
@@ -214,6 +212,9 @@ ln -s %{_sysconfdir}/alternatives \
 ln -s %{_sysconfdir}/alternatives \
   $RPM_BUILD_ROOT%{_javadir}/xml-commons-resolver.jar
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post
 /usr/sbin/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar jaxp_parser_impl  %{_javadir}/%{name}.jar 23
 /usr/sbin/update-alternatives --auto jaxp_parser_impl
@@ -246,7 +247,7 @@ ln -s %{_sysconfdir}/alternatives \
 
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE README
+%doc LICENSE README ISSUES STATUS TODO
 %{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
 %ghost %{_javadir}/jaxp_parser_impl.jar
@@ -270,6 +271,5 @@ ln -s %{_sysconfdir}/alternatives \
 %files scripts
 %defattr(0755,root,root,0755)
 %{_bindir}/*
-/usr/share/man/man1/*
 
 %changelog