From 71f13bf9ff9878e4be4b7ce2bb009dc71f51187e20f86b87bb6b18908c8e4bc4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 17 May 2018 20:07:53 +0000 Subject: [PATCH 1/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=50 --- xerces-j2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xerces-j2.spec b/xerces-j2.spec index c714714..23e4fc7 100644 --- a/xerces-j2.spec +++ b/xerces-j2.spec @@ -1,7 +1,7 @@ # # spec file for package xerces-j2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 6b4fa8ef791edb8cb49ee5d7f80f538a1dea18d89063237481ee52c96ee9e96d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 18 Nov 2018 21:21:49 +0000 Subject: [PATCH 2/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=51 --- xerces-j2-manifest.patch | 17 +++++++++++++++++ xerces-j2.spec | 6 ++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 xerces-j2-manifest.patch diff --git a/xerces-j2-manifest.patch b/xerces-j2-manifest.patch new file mode 100644 index 0000000..09a02e5 --- /dev/null +++ b/xerces-j2-manifest.patch @@ -0,0 +1,17 @@ +--- src/manifest.xerces 2010-11-26 21:42:07.000000000 +0100 ++++ src/manifest.xerces 2018-11-18 22:17:04.109447814 +0100 +@@ -1,5 +1,14 @@ + Manifest-Version: 1.0 + Created-By: @java.version@ (@java.vendor@) ++Bundle-RequiredExecutionEnvironment: J2SE-1.5 ++Bundle-SymbolicName: org.apache.xerces ++Bundle-ManifestVersion: 2 ++Bundle-Name: @impl.name@ ++Bundle-Localization: plugin ++Bundle-Version: @impl.version@ ++Bundle-Vendor: Apache Software Foundation ++Require-Bundle: system.bundle,javax.xml;visibility:=reexport, org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)" ++Export-Package: META-INF.services;version="@impl.version@",org.apache.html.dom;version="@impl.version@",org.apache.wml;version="@impl.version@",org.apache.wml.dom;version="@impl.version@",org.apache.xerces.dom;version="@impl.version@",org.apache.xerces.dom.events;version="@impl.version@",org.apache.xerces.dom3.as;version="@impl.version@",org.apache.xerces.impl;version="@impl.version@",org.apache.xerces.impl.dtd;version="@impl.version@",org.apache.xerces.impl.dtd.models;version="@impl.version@",org.apache.xerces.impl.dv;version="@impl.version@",org.apache.xerces.impl.dv.dtd;version="@impl.version@",org.apache.xerces.impl.dv.util;version="@impl.version@",org.apache.xerces.impl.dv.xs;version="@impl.version@",org.apache.xerces.impl.io;version="@impl.version@",org.apache.xerces.impl.msg;version="@impl.version@",org.apache.xerces.impl.validation;version="@impl.version@",org.apache.xerces.impl.xpath;version="@impl.version@",org.apache.xerces.impl.xpath.regex;version="@impl.version@",org.apache.xerces.impl.xs;version="@impl.version@",org.apache.xerces.impl.xs.identity;version="@impl.version@",org.apache.xerces.impl.xs.models;version="@impl.version@",org.apache.xerces.impl.xs.opti;version="@impl.version@",org.apache.xerces.impl.xs.traversers;version="@impl.version@",org.apache.xerces.impl.xs.util;version="@impl.version@",org.apache.xerces.jaxp;version="@impl.version@",org.apache.xerces.jaxp.datatype;version="@impl.version@",org.apache.xerces.jaxp.validation;version="@impl.version@",org.apache.xerces.parsers;version="@impl.version@",org.apache.xerces.stax;version="@impl.version@",org.apache.xerces.stax.events;version="@impl.version@",org.apache.xerces.util;version="@impl.version@",org.apache.xerces.xinclude;version="@impl.version@",org.apache.xerces.xni;version="@impl.version@",org.apache.xerces.xni.grammars;version="@impl.version@",org.apache.xerces.xni.parser;version="@impl.version@",org.apache.xerces.xpointer;version="@impl.version@",org.apache.xerces.xs;version="@impl.version@",org.apache.xerces.xs.datatypes;version="@impl.version@",org.apache.xml.serialize;version="@impl.version@",org.w3c.dom.html;version="@impl.version@" + + Name: org/apache/xerces/impl/Version.class + Comment: @impl.name@ diff --git a/xerces-j2.spec b/xerces-j2.spec index 23e4fc7..de963e6 100644 --- a/xerces-j2.spec +++ b/xerces-j2.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -34,9 +34,10 @@ Source5: %{name}-constants.1 Patch0: arrays-doubling.patch Patch1: scan-pseudo-attribute.patch Patch2: xerces-2_11_0-jdk7.patch +Patch3: xerces-j2-manifest.patch BuildRequires: dos2unix BuildRequires: java-devel >= 1.6 -BuildRequires: javapackages-tools +BuildRequires: javapackages-local BuildRequires: unzip Requires(post): update-alternatives Requires(pre): update-alternatives @@ -160,6 +161,7 @@ find -type f -print |xargs -i dos2unix {} %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p0 echo 'javac.target=1.6' > build.properties echo 'javac.source=1.6' >> build.properties From 2a1c6a02f6881e8fdbc5b1a8bed6a6e9e3e63ac1ae3fc4e03971697a6b4244ee Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 18 Nov 2018 21:29:51 +0000 Subject: [PATCH 3/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=52 --- xerces-j2.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xerces-j2.spec b/xerces-j2.spec index de963e6..308d818 100644 --- a/xerces-j2.spec +++ b/xerces-j2.spec @@ -34,7 +34,6 @@ Source5: %{name}-constants.1 Patch0: arrays-doubling.patch Patch1: scan-pseudo-attribute.patch Patch2: xerces-2_11_0-jdk7.patch -Patch3: xerces-j2-manifest.patch BuildRequires: dos2unix BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-local @@ -161,7 +160,6 @@ find -type f -print |xargs -i dos2unix {} %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p0 echo 'javac.target=1.6' > build.properties echo 'javac.source=1.6' >> build.properties From e4b54d192f33699b22afc7ff5b30d9f9e39347cdc6ed99138779d99ee5217bd5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 6 Dec 2018 13:16:20 +0000 Subject: [PATCH 4/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=53 --- xerces-j2.changes | 5 ++++ xerces-j2.spec | 68 ----------------------------------------------- 2 files changed, 5 insertions(+), 68 deletions(-) diff --git a/xerces-j2.changes b/xerces-j2.changes index 3837788..2357b21 100644 --- a/xerces-j2.changes +++ b/xerces-j2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 6 13:15:48 UTC 2018 - Fridrich Strba + +- Do not distribute the private xml-apis and xml-resolver + ------------------------------------------------------------------- Tue Oct 3 15:33:36 UTC 2017 - fstrba@suse.com diff --git a/xerces-j2.spec b/xerces-j2.spec index 308d818..8d5c852 100644 --- a/xerces-j2.spec +++ b/xerces-j2.spec @@ -117,40 +117,6 @@ Implementation page. This package contains additional utility scripts for Xerces2. -%package xml-resolver -Summary: Resolver subproject of xml-commons -Group: Development/Libraries/Java -Requires(post): update-alternatives -Requires(pre): update-alternatives -Provides: xml-commons-resolver - -%description xml-resolver -xml-commons is focused on common code and guidelines for xml projects. -The first focus will be to organize and have common packaging for the -various externally-defined standards code relating to XML - things like -the DOM, SAX, and JAXP interfaces. - -This package contains the resolver subproject of xml-commons. - -%package xml-apis -Summary: APIs subproject of xml-commons -Group: Development/Libraries/Java -Requires(post): update-alternatives -Requires(pre): update-alternatives -Provides: xml-commons-apis - -%description xml-apis -xml-commons is focused on common code and guidelines for xml projects. -Its first focus will be to organize and have common packaging for the -various externally-defined standards code relating to XML - things like -the DOM, SAX, and JAXP interfaces. As the xml-commons community forms, -we also hope to serve as a holding area for other common xml-related -utilities and code, and to help promulgate common packaging, testing, -documentation, and other guidelines across all xml.apache.org -subprojects. - -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} @@ -179,8 +145,6 @@ sh build.sh jars # jars mkdir -p %{buildroot}%{_javadir} cp -p build/xercesImpl.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -cp -p build/resolver.jar %{buildroot}%{_javadir}/%{name}-%{version}-xml-resolver.jar -cp -p build/xml-apis.jar %{buildroot}%{_javadir}/%{name}-%{version}-xml-apis.jar (cd %{buildroot}%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # scripts mkdir -p %{buildroot}%{_bindir} @@ -199,36 +163,16 @@ cp -pr data %{buildroot}%{_datadir}/%{name} # alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ ln -sf %{_sysconfdir}/alternatives/jaxp_parser_impl.jar %{buildroot}%{_javadir}/jaxp_parser_impl.jar -ln -sf %{_sysconfdir}/alternatives/xml-commons-apis.jar %{buildroot}%{_javadir}/xml-commons-apis.jar -ln -sf %{_sysconfdir}/alternatives/xml-commons-resolver.jar %{buildroot}%{_javadir}/xml-commons-resolver.jar %post %{_sbindir}/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar jaxp_parser_impl %{_javadir}/%{name}.jar 23 %{_sbindir}/update-alternatives --auto jaxp_parser_impl -%post xml-apis -%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/%{name}-xml-apis.jar 1 -%{_sbindir}/update-alternatives --auto xml-commons-apis - -%post xml-resolver -%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/%{name}-xml-resolver.jar 1 -%{_sbindir}/update-alternatives --auto xml-commons-resolver - %preun if [ $1 = 0 ] ; then %{_sbindir}/update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar fi -%preun xml-apis -if [ $1 = 0 ] ; then - %{_sbindir}/update-alternatives --remove xml-commons-apis %{_javadir}/%{name}-xml-apis.jar -fi - -%preun xml-resolver -if [ $1 = 0 ] ; then - %{_sbindir}/update-alternatives --remove xml-commons-resolver %{_javadir}/%{name}-xml-commons-resolver.jar -fi - %files %doc LICENSE README %{_javadir}/%{name}-%{version}.jar @@ -236,18 +180,6 @@ fi %{_javadir}/jaxp_parser_impl.jar %ghost %{_sysconfdir}/alternatives/jaxp_parser_impl.jar -%files xml-apis -%{_javadir}/%{name}-%{version}-xml-apis.jar -%{_javadir}/%{name}-xml-apis.jar -%{_javadir}/xml-commons-apis.jar -%ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar - -%files xml-resolver -%{_javadir}/%{name}-%{version}-xml-resolver.jar -%{_javadir}/%{name}-xml-resolver.jar -%{_javadir}/xml-commons-resolver.jar -%ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar - %files demo %{_datadir}/%{name} From 1453bb00294caeae2f62e72bf72fa373b08449b15740d5dce720919b39ce5a91 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 6 Dec 2018 16:07:46 +0000 Subject: [PATCH 5/9] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=54 --- Xerces-J-src.2.11.0.tar.gz | 3 - Xerces-J-src.2.12.0.tar.gz | 3 + Xerces-J-tools.2.11.0.tar.gz | 3 - arrays-doubling.patch | 48 ------ scan-pseudo-attribute.patch | 47 ------ xerces-j2-build.patch | 280 +++++++++++++++++++++++++++++++++++ xerces-j2-manifest.patch | 6 +- xerces-j2.changes | 50 ++++++- xerces-j2.spec | 252 +++++++++++++++---------------- xercesImpl-2.12.0.pom | 53 +++++++ 10 files changed, 510 insertions(+), 235 deletions(-) delete mode 100644 Xerces-J-src.2.11.0.tar.gz create mode 100644 Xerces-J-src.2.12.0.tar.gz delete mode 100644 Xerces-J-tools.2.11.0.tar.gz delete mode 100644 arrays-doubling.patch delete mode 100644 scan-pseudo-attribute.patch create mode 100644 xerces-j2-build.patch create mode 100644 xercesImpl-2.12.0.pom 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.12.0.tar.gz b/Xerces-J-src.2.12.0.tar.gz new file mode 100644 index 0000000..3755245 --- /dev/null +++ b/Xerces-J-src.2.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c27b81e139ecfc219202bcad79e77529b082e9ed9797bc1a4c13e1bd8f8e31c9 +size 1810232 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/arrays-doubling.patch b/arrays-doubling.patch deleted file mode 100644 index 9f9536a..0000000 --- a/arrays-doubling.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- xerces/src/org/apache/xerces/util/XMLStringBuffer.java 2006/09/18 05:12:57 447241 -+++ xerces/src/org/apache/xerces/util/XMLStringBuffer.java 2013/07/25 18:13:37 -@@ -111,12 +111,13 @@ - */ - public void append(char c) { - if (this.length + 1 > this.ch.length) { -- int newLength = this.ch.length*2; -- if (newLength < this.ch.length + DEFAULT_SIZE) -- newLength = this.ch.length + DEFAULT_SIZE; -- char[] newch = new char[newLength]; -- System.arraycopy(this.ch, 0, newch, 0, this.length); -- this.ch = newch; -+ int newLength = this.ch.length * 2; -+ if (newLength < this.ch.length + DEFAULT_SIZE) { -+ newLength = this.ch.length + DEFAULT_SIZE; -+ } -+ char[] newch = new char[newLength]; -+ System.arraycopy(this.ch, 0, newch, 0, this.length); -+ this.ch = newch; - } - this.ch[this.length] = c; - this.length++; -@@ -130,9 +131,10 @@ - public void append(String s) { - int length = s.length(); - if (this.length + length > this.ch.length) { -- int newLength = this.ch.length*2; -- if (newLength < this.length + length + DEFAULT_SIZE) -+ int newLength = this.ch.length * 2; -+ if (newLength < this.length + length + DEFAULT_SIZE) { - newLength = this.ch.length + length + DEFAULT_SIZE; -+ } - char[] newch = new char[newLength]; - System.arraycopy(this.ch, 0, newch, 0, this.length); - this.ch = newch; -@@ -150,7 +152,11 @@ - */ - public void append(char[] ch, int offset, int length) { - if (this.length + length > this.ch.length) { -- char[] newch = new char[this.ch.length + length + DEFAULT_SIZE]; -+ int newLength = this.ch.length * 2; -+ if (newLength < this.length + length + DEFAULT_SIZE) { -+ newLength = this.ch.length + length + DEFAULT_SIZE; -+ } -+ char[] newch = new char[newLength]; - System.arraycopy(this.ch, 0, newch, 0, this.length); - this.ch = newch; - } diff --git a/scan-pseudo-attribute.patch b/scan-pseudo-attribute.patch deleted file mode 100644 index 3996a30..0000000 --- a/scan-pseudo-attribute.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- xerces/src/org/apache/xerces/impl/XMLScanner.java 2013/07/03 18:25:06 1499505 -+++ xerces/src/org/apache/xerces/impl/XMLScanner.java 2013/07/03 18:29:43 -@@ -542,7 +542,7 @@ - // document is until we scan the encoding declaration - // you cannot reliably read any characters outside - // of the ASCII range here. -- mrglavas -- String name = fEntityScanner.scanName(); -+ String name = scanPseudoAttributeName(); - XMLEntityManager.print(fEntityManager.getCurrentEntity()); - if (name == null) { - reportFatalError("PseudoAttrNameExpected", null); -@@ -599,6 +599,35 @@ - } // scanPseudoAttribute(XMLString):String - - /** -+ * Scans the name of a pseudo attribute. The only legal names -+ * in XML 1.0/1.1 documents are 'version', 'encoding' and 'standalone'. -+ * -+ * @return the name of the pseudo attribute or null -+ * if a legal pseudo attribute name could not be scanned. -+ */ -+ private String scanPseudoAttributeName() throws IOException, XNIException { -+ final int ch = fEntityScanner.peekChar(); -+ switch (ch) { -+ case 'v': -+ if (fEntityScanner.skipString(fVersionSymbol)) { -+ return fVersionSymbol; -+ } -+ break; -+ case 'e': -+ if (fEntityScanner.skipString(fEncodingSymbol)) { -+ return fEncodingSymbol; -+ } -+ break; -+ case 's': -+ if (fEntityScanner.skipString(fStandaloneSymbol)) { -+ return fStandaloneSymbol; -+ } -+ break; -+ } -+ return null; -+ } // scanPseudoAttributeName() -+ -+ /** - * Scans a processing instruction. - *

- * 

diff --git a/xerces-j2-build.patch b/xerces-j2-build.patch
new file mode 100644
index 0000000..44b4a6b
--- /dev/null
+++ b/xerces-j2-build.patch
@@ -0,0 +1,280 @@
+--- xerces-2_12_0/build.xml	2018-11-18 20:10:36.933534130 +0100
++++ xerces-2_12_0/build.xml	2018-11-18 20:12:28.714126419 +0100
+@@ -38,13 +38,6 @@
+   
+   
+ 
+-  
+-  
+-    
+-      
+-    
+-  
+-
+   
+   
+@@ -71,7 +64,6 @@
+     
+     
+     
+-    
+     
+     
+     
+@@ -108,7 +100,6 @@
+     
+     
+     
+-    
+ 
+     
+     
+@@ -135,7 +126,6 @@
+     
+     
+     
+-    
+     
+     
+     
+@@ -247,30 +237,6 @@
+     
+ 
+-    
+-    
+-        
+-    
+-    
+     
+     
+@@ -286,7 +252,7 @@
+       
+     
+ 
+-    
+         
+     
+-    
+     
+-    
+ 
+ 
+-  
++  
+     
+       
INTERNAL:
Usage of this class is not supported. It may be altered or removed at any time.
]]>
+     
+@@ -453,46 +419,33 @@
+   
+   	
+   		
+-    
+-      
+-    
+-  	
+     
+   	
+-    
+-      
+-        
+-      
+-    
+-  	
+     
+     
+     
+     
+     
+     
+     
+     
+@@ -504,25 +457,23 @@
+                            org.apache.xerces.util,
+                            org.apache.xerces.xinclude,
+                            org.apache.xerces.xpointer'
+-      locale='en_US'
++      locale='en_US' source="${javac.source}"
+       sourcepath='${build.src}' destdir='${build.dir}/docs/javadocs/xerces2'
+       classpath='${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}'
+       author='true' version='true'
+       windowtitle='Xerces2 Implementation' 
+       doctitle='Xerces2 Implementation'
+       bottom='${copyright}'
+-      additionalparam='${additional.param}'
+       />
+     
+     
+   
+ 
+@@ -998,7 +949,7 @@
+       
+     
+ 
+-    
+  
+-    
+-    
+-        
+-    
+-
+ 
+     
+     
+     
+ 
+-    
+         
+ 
+-        
+   
+ 
+-  
+-  
+-  
+-  
+-    
+-    
+-  	
+-    
+-  	
+-    
+-  	
+-    
+-      
+-        
+-      
+-      
+-    
+-  
+ 
diff --git a/xerces-j2-manifest.patch b/xerces-j2-manifest.patch
index 09a02e5..b85a368 100644
--- a/xerces-j2-manifest.patch
+++ b/xerces-j2-manifest.patch
@@ -1,5 +1,5 @@
---- src/manifest.xerces	2010-11-26 21:42:07.000000000 +0100
-+++ src/manifest.xerces	2018-11-18 22:17:04.109447814 +0100
+--- src/manifest.xerces	2018-04-21 06:02:09.000000000 +0200
++++ src/manifest.xerces	2018-11-18 18:43:12.785381090 +0100
 @@ -1,5 +1,14 @@
  Manifest-Version: 1.0
  Created-By: @java.version@ (@java.vendor@)
@@ -13,5 +13,5 @@
 +Require-Bundle: system.bundle,javax.xml;visibility:=reexport, org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
 +Export-Package: META-INF.services;version="@impl.version@",org.apache.html.dom;version="@impl.version@",org.apache.wml;version="@impl.version@",org.apache.wml.dom;version="@impl.version@",org.apache.xerces.dom;version="@impl.version@",org.apache.xerces.dom.events;version="@impl.version@",org.apache.xerces.dom3.as;version="@impl.version@",org.apache.xerces.impl;version="@impl.version@",org.apache.xerces.impl.dtd;version="@impl.version@",org.apache.xerces.impl.dtd.models;version="@impl.version@",org.apache.xerces.impl.dv;version="@impl.version@",org.apache.xerces.impl.dv.dtd;version="@impl.version@",org.apache.xerces.impl.dv.util;version="@impl.version@",org.apache.xerces.impl.dv.xs;version="@impl.version@",org.apache.xerces.impl.io;version="@impl.version@",org.apache.xerces.impl.msg;version="@impl.version@",org.apache.xerces.impl.validation;version="@impl.version@",org.apache.xerces.impl.xpath;version="@impl.version@",org.apache.xerces.impl.xpath.regex;version="@impl.version@",org.apache.xerces.impl.xs;version="@impl.version@",org.apache.xerces.impl.xs.identity;version="@impl.version@",org.apache.xerces.impl.xs.models;version="@impl.version@",org.apache.xerces.impl.xs.opti;version="@impl.version@",org.apache.xerces.impl.xs.traversers;version="@impl.version@",org.apache.xerces.impl.xs.util;version="@impl.version@",org.apache.xerces.jaxp;version="@impl.version@",org.apache.xerces.jaxp.datatype;version="@impl.version@",org.apache.xerces.jaxp.validation;version="@impl.version@",org.apache.xerces.parsers;version="@impl.version@",org.apache.xerces.stax;version="@impl.version@",org.apache.xerces.stax.events;version="@impl.version@",org.apache.xerces.util;version="@impl.version@",org.apache.xerces.xinclude;version="@impl.version@",org.apache.xerces.xni;version="@impl.version@",org.apache.xerces.xni.grammars;version="@impl.version@",org.apache.xerces.xni.parser;version="@impl.version@",org.apache.xerces.xpointer;version="@impl.version@",org.apache.xerces.xs;version="@impl.version@",org.apache.xerces.xs.datatypes;version="@impl.version@",org.apache.xml.serialize;version="@impl.version@",org.w3c.dom.html;version="@impl.version@"
  
- Name: org/apache/xerces/impl/Version.class
+ Name: org/apache/xerces/impl/
  Comment: @impl.name@ 
diff --git a/xerces-j2.changes b/xerces-j2.changes
index 2357b21..519178b 100644
--- a/xerces-j2.changes
+++ b/xerces-j2.changes
@@ -1,7 +1,53 @@
 -------------------------------------------------------------------
-Thu Dec  6 13:15:48 UTC 2018 - Fridrich Strba 
+Thu Dec  6 15:37:26 UTC 2018 - Fridrich Strba 
 
-- Do not distribute the private xml-apis and xml-resolver
+- Upgrade to version 2.12.0
+  * This release expands on Xerces-J's experimental support for
+    XML Schema 1.1 by providing a fully compliant XML Schema 1.1
+    implementation. It fixes several bugs which were present in
+    Xerces-J 2.11.0 and also includes a few other enhancements and
+    performance improvements.
+    + add: Report all id/idref problems when validating XML against
+      DTD or XML Schema.
+    + add: Implemented improvements to XML Schema 1.1 CTA
+      implementation and inheritable attributes.
+    + update: Implemented improved error/warning message reporting
+      for various XML Schema use cases.
+    + update: Implemented few performance enhancements (affecting
+      parsing/validation latency and memory footprint) to the
+      implementation.
+    + fix: Fixed minor bugs in Xerces-J's regex support in XML
+      Schema  facet.
+    + fix: Implemented various fixes to XML Schema 1.1
+      assert/assertion implementation.
+    + fix: Fixed possible security issue: an implementation of the
+      NamedNodeMapImpl class in the JAXP component did not limit the
+      amount of memory allocated when creating object instance from
+      a serialized form. A specially-crafted input could cause a
+      java application to use an excessive amount of memory when
+      deserialized.
+    + fix: Implemented minor and major fixes in certain areas, to
+      XML Schema 1.0 and 1.1 implementations.
+    + fix: Fixed the issue related to, XIncludeTextReader doesn't
+      handle null Content Types properly.
+    + fix: Fixed minor problems in the DOM (Level 3 Core)
+      implementation.
+    + fix: Fixed few errors related to Xerces-J's build component.
+    + fix: Solved a minor bug in SoftReferenceSymbolTable
+      implementation component.
+    + fix: Fixed various bugs and made various improvements.
+- Removed patches:
+  * arrays-doubling.patch
+  * scan-pseudo-attribute.patch
+    + integrated upstream
+- Added patches:
+  * xerces-j2-build.patch
+    + Don't use the bundled xml-apis, but depend on an existing
+      package
+    + Don't use custom taglets and ant tasks
+- Do not bundle the xml-apis and xml-resolver and stop using
+  alternatives
+- Install as a maven artifact
 
 -------------------------------------------------------------------
 Tue Oct  3 15:33:36 UTC 2017 - fstrba@suse.com
diff --git a/xerces-j2.spec b/xerces-j2.spec
index 8d5c852..b94668c 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -16,175 +16,169 @@
 #
 
 
-%define cvs_version	2_11_0
+%global cvs_version 2_12_0
+%define __requires_exclude system.bundle
 Name:           xerces-j2
-Version:        2.11.0
+Version:        2.12.0
 Release:        0
 Summary:        Java XML parser
-License:        Apache-2.0
+License:        Apache-2.0 AND W3C
 Group:          Development/Libraries/Java
-Url:            http://xml.apache.org/xerces2-j/
+URL:            http://xerces.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
+Source1:        %{name}-version.sh
+Source2:        %{name}-constants.sh
 Source3:        %{name}-version.1
-Source4:        %{name}-constants.sh
-Source5:        %{name}-constants.1
-# PATCH-FIX-UPSTREAM bnc#814241 XERCESJ-1616
-Patch0:         arrays-doubling.patch
-Patch1:         scan-pseudo-attribute.patch
-Patch2:         xerces-2_11_0-jdk7.patch
+Source4:        %{name}-constants.1
+Source5:        http://repo.maven.apache.org/maven2/xerces/xercesImpl/%{version}/xercesImpl-%{version}.pom
+# Patch the build so that it doesn't try to use bundled xml-commons source
+# Also remove the use of the special taglets and xjavac task
+Patch0:         %{name}-build.patch
+Patch1:         xerces-2_11_0-jdk7.patch
+BuildRequires:  ant
+BuildRequires:  apache-parent
 BuildRequires:  dos2unix
-BuildRequires:  java-devel >= 1.6
+BuildRequires:  fdupes
+BuildRequires:  java-devel
 BuildRequires:  javapackages-local
-BuildRequires:  unzip
-Requires(post): update-alternatives
-Requires(pre):  update-alternatives
-Provides:       jaxp_parser_impl
+BuildRequires:  xalan-j2 >= 2.7.1
+BuildRequires:  xml-commons-apis >= 1.4.01
+BuildRequires:  xml-commons-resolver >= 1.2
+# Explicit javapackages-tools requires since scripts use
+# /usr/share/java-utils/java-functions
+Requires:       javapackages-tools
+Requires:       xalan-j2 >= 2.7.1
+Requires:       xml-commons-apis >= 1.4.01
+Requires:       xml-commons-resolver >= 1.2
+Provides:       %{name}-scripts = %{version}-%{release}
+Provides:       jaxp_parser_impl = 1.4
+Obsoletes:      %{name}-scripts < %{version}-%{release}
 BuildArch:      noarch
 
 %description
-Welcome to the future! Xerces2 is the next generation of high
-performance, fully compliant XML parsers in the Apache Xerces family.
-This new version of Xerces introduces the Xerces Native Interface
-(XNI), a complete framework for building parser components and
-configurations that is extremely modular and easy to program.
+Welcome to the future! Xerces2 is the next generation of high performance,
+fully compliant XML parsers in the Apache Xerces family. This new version of
+Xerces introduces the Xerces Native Interface (XNI), a complete framework for
+building parser components and configurations that is extremely modular and
+easy to program.
 
-The Apache Xerces2 parser is the reference implementation of XNI but
-other parser components, configurations, and parsers can be written
-using the Xerces Native Interface. For complete design and
-implementation documents, refer to the XNI Manual.
+The Apache Xerces2 parser is the reference implementation of XNI but other
+parser components, configurations, and parsers can be written using the Xerces
+Native Interface. For complete design and implementation documents, refer to
+the XNI Manual.
 
-Xerces 2 is a fully conforming XML Schema processor. For more
-information, refer to the XML Schema page.
+Xerces2 is a fully conforming XML Schema processor. For more information,
+refer to the XML Schema page.
 
-Xerces 2 also provides a partial implementation of Document Object
-Model Level 3 Core, Load and Save and Abstract Schemas [deprecated]
-Working Drafts. For more information, refer to the DOM Level 3
-Implementation page.
+Xerces2 also provides a complete implementation of the Document Object Model
+Level 3 Core and Load/Save W3C Recommendations and provides a complete
+implementation of the XML Inclusions (XInclude) W3C Recommendation. It also
+provides support for OASIS XML Catalogs v1.1.
+
+Xerces2 is able to parse documents written according to the XML 1.1
+Recommendation, except that it does not yet provide an option to enable
+normalization checking as described in section 2.13 of this specification. It
+also handles name spaces according to the XML Namespaces 1.1 Recommendation,
+and will correctly serialize XML 1.1 documents if the DOM level 3 load/save
+APIs are in use.
+
+%package        javadoc
+Summary:        Javadocs for %{name}
+Group:          Development/Libraries/Java
+
+%description    javadoc
+This package contains the API documentation for %{name}.
 
 %package        demo
-Summary:        Demonstration and sample files for xerces-j2
+Summary:        Demonstrations and samples for %{name}
 Group:          Development/Libraries/Java
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description    demo
-Welcome to the future! Xerces2 is the next generation of high
-performance, fully compliant XML parsers in the Apache Xerces family.
-This new version of Xerces introduces the Xerces Native Interface
-(XNI), a complete framework for building parser components and
-configurations that is extremely modular and easy to program.
-
-The Apache Xerces2 parser is the reference implementation of XNI but
-other parser components, configurations, and parsers can be written
-using the Xerces Native Interface. For complete design and
-implementation documents, refer to the XNI Manual.
-
-Xerces 2 is a fully conforming XML Schema processor. For more
-information, refer to the XML Schema page.
-
-Xerces 2 also provides a partial implementation of Document Object
-Model Level 3 Core, Load and Save and Abstract Schemas [deprecated]
-Working Drafts. For more information, refer to the DOM Level 3
-Implementation page.
-
-This package contains demonstration and sample files for Xerces2.
-
-%package        scripts
-Summary:        Additional utility scripts for xerces-j2
-Group:          Development/Libraries/Java
-Requires:       %{name} = %{version}
-
-%description    scripts
-Welcome to the future! Xerces2 is the next generation of high
-performance, fully compliant XML parsers in the Apache Xerces family.
-This new version of Xerces introduces the Xerces Native Interface
-(XNI), a complete framework for building parser components and
-configurations that is extremely modular and easy to program.
-
-The Apache Xerces2 parser is the reference implementation of XNI but
-other parser components, configurations, and parsers can be written
-using the Xerces Native Interface. For complete design and
-implementation documents, refer to the XNI Manual.
-
-Xerces 2 is a fully conforming XML Schema processor. For more
-information, refer to the XML Schema page.
-
-Xerces 2 also provides a partial implementation of Document Object
-Model Level 3 Core, Load and Save and Abstract Schemas [deprecated]
-Working Drafts. For more information, refer to the DOM Level 3
-Implementation page.
-
-This package contains additional utility scripts for Xerces2.
+%{summary}.
 
 %prep
 %setup -q -n xerces-%{cvs_version}
-%setup -q -T -a 1 -D -n xerces-%{cvs_version}
-%setup -q -T -D -n xerces-%{cvs_version}
-
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
 find -type f -print |xargs -i dos2unix {}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-
-echo 'javac.target=1.6' > build.properties
-echo 'javac.source=1.6' >> build.properties
-
-sed -i 's/\r//' LICENSE README NOTICE build.sh
 
 %build
-## this uses the ant.jar provided by the xerces packages. Tough luck,
-# jpackage bootstrap has to start somewhere. It is not installed,
-# though.
-export GC_MAXIMUM_HEAP_SIZE="134217728"
-export CLASSPATH=$CLASSPATH:$(build-classpath antlr-bootstrap)
-sh build.sh jars
-#ant tests test
+mkdir -p tools
+pushd tools
+ln -sf $(build-classpath xalan-j2-serializer) serializer.jar
+ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
+ln -sf $(build-classpath xml-commons-resolver) resolver.jar
+popd
+
+# Build everything
+export ANT_OPTS="-Xmx256m -Djava.awt.headless=true -Dbuild.sysclasspath=first -Ddisconnected=true"
+ant -Djavac.source=1.6 -Djavac.target=1.6 \
+    -Dbuild.compiler=modern \
+    clean jars javadocs
 
 %install
-# jars
-mkdir -p %{buildroot}%{_javadir}
-cp -p build/xercesImpl.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+# jar
+install -dm 755 %{buildroot}%{_javadir}
+install -pm 644 build/xercesImpl.jar %{buildroot}%{_javadir}/%{name}.jar
+(cd %{buildroot}%{_javadir} && ln -s %{name}.jar jaxp_parser_impl.jar)
+
+# pom
+install -dm 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar -a xerces:xerces,xerces:xmlParserAPIs,apache:xerces-j2
+
+# javadoc
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}/%{name}/impl
+mkdir -p %{buildroot}%{_javadocdir}/%{name}/xs
+mkdir -p %{buildroot}%{_javadocdir}/%{name}/xni
+mkdir -p %{buildroot}%{_javadocdir}/%{name}/other
+
+cp -pr build/docs/javadocs/xerces2/* %{buildroot}%{_javadocdir}/%{name}/impl
+cp -pr build/docs/javadocs/api/* %{buildroot}%{_javadocdir}/%{name}/xs
+cp -pr build/docs/javadocs/xni/* %{buildroot}%{_javadocdir}/%{name}/xni
+cp -pr build/docs/javadocs/other/* %{buildroot}%{_javadocdir}/%{name}/other
+
+%fdupes -s %{buildroot}%{_javadocdir}
+
 # scripts
-mkdir -p %{buildroot}%{_bindir}
-install -p -m 755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}-version
-install -p -m 755 %{SOURCE4} %{buildroot}%{_bindir}/%{name}-constants
-# mans
+install -pD -m755 -T %{SOURCE1} %{buildroot}%{_bindir}/%{name}-version
+install -pD -m755 -T %{SOURCE2} %{buildroot}%{_bindir}/%{name}-constants
+
+# manual pages
 install -d -m 755 %{buildroot}%{_mandir}/man1
 install -p -m 644 %{SOURCE3} %{buildroot}%{_mandir}/man1
-install -p -m 644 %{SOURCE5} %{buildroot}%{_mandir}/man1
+install -p -m 644 %{SOURCE4} %{buildroot}%{_mandir}/man1
+
 # demo
-mkdir -p %{buildroot}%{_datadir}/%{name}
-cp -p build/xercesSamples.jar \
-  %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar
+install -pD -T build/xercesSamples.jar %{buildroot}%{_datadir}/%{name}/%{name}-samples.jar
 cp -pr data %{buildroot}%{_datadir}/%{name}
 
-# alternatives
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
-ln -sf %{_sysconfdir}/alternatives/jaxp_parser_impl.jar %{buildroot}%{_javadir}/jaxp_parser_impl.jar
-
 %post
-%{_sbindir}/update-alternatives --install %{_javadir}/jaxp_parser_impl.jar jaxp_parser_impl  %{_javadir}/%{name}.jar 23
-%{_sbindir}/update-alternatives --auto jaxp_parser_impl
-
-%preun
-if [ $1 = 0 ] ; then
-  %{_sbindir}/update-alternatives --remove jaxp_parser_impl        %{_javadir}/%{name}.jar
-fi
+update-alternatives --remove jaxp_parser_impl %{_javadir}/%{name}.jar >/dev/null 2>&1 || :
+# it deletes the link, set it up again
+ln -sf %{name}.jar %{_javadir}/jaxp_parser_impl.jar
 
 %files
-%doc LICENSE README
-%{_javadir}/%{name}-%{version}.jar
-%{_javadir}/%{name}.jar
-%{_javadir}/jaxp_parser_impl.jar
-%ghost %{_sysconfdir}/alternatives/jaxp_parser_impl.jar
+%license LICENSE
+%doc NOTICE README
+%{_bindir}/*
+%{_javadir}/*
+%{_mandir}/*/*
+%{_mavenpomdir}/*
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
+%{_datadir}/maven-metadata/%{name}.xml*
+%endif
+
+%files javadoc
+%{_javadocdir}/%{name}
 
 %files demo
 %{_datadir}/%{name}
 
-%files scripts
-%{_bindir}/*
-%{_mandir}/man1/*
-
 %changelog
diff --git a/xercesImpl-2.12.0.pom b/xercesImpl-2.12.0.pom
new file mode 100644
index 0000000..e738fc5
--- /dev/null
+++ b/xercesImpl-2.12.0.pom
@@ -0,0 +1,53 @@
+
+    Xerces2-j
+    4.0.0
+    xerces
+    xercesImpl
+    2.12.0
+    
+      Xerces2 is the next generation of high performance, fully compliant XML parsers in the Apache Xerces family. This new version of Xerces introduces the Xerces Native Interface (XNI), a complete framework for building parser components and configurations that is extremely modular and easy to program.
+
+    The Apache Xerces2 parser is the reference implementation of XNI but other parser components, configurations, and parsers can be written using the Xerces Native Interface. For complete design and implementation documents, refer to the XNI Manual.
+
+    Xerces2 is a fully conforming XML Schema 1.0 processor. A partial experimental implementation of the XML Schema 1.1 Structures and Datatypes Working Drafts (December 2009) and an experimental implementation of the XML Schema Definition Language (XSD): Component Designators (SCD) Candidate Recommendation (January 2010) are provided for evaluation. For more information, refer to the XML Schema page.
+
+    Xerces2 also provides a complete implementation of the Document Object Model Level 3 Core and Load/Save W3C Recommendations and provides a complete implementation of the XML Inclusions (XInclude) W3C Recommendation. It also provides support for OASIS XML Catalogs v1.1.
+
+    Xerces2 is able to parse documents written according to the XML 1.1 Recommendation, except that it does not yet provide an option to enable normalization checking as described in section 2.13 of this specification. It also handles namespaces according to the XML Namespaces 1.1 Recommendation, and will correctly serialize XML 1.1 documents if the DOM level 3 load/save APIs are in use.  
+	
+    https://xerces.apache.org/xerces2-j/
+    
+        
+            The Apache Software License, Version 2.0
+            http://www.apache.org/licenses/LICENSE-2.0.txt
+            repo
+        
+    
+    
+        https://svn.apache.org/repos/asf/xerces/java/
+        https://svn.apache.org/repos/asf/xerces/java/tags/Xerces-J_2_12_0/
+    
+    
+        
+            xml-apis
+            xml-apis
+            1.4.01
+        
+        
+            xml-resolver
+            xml-resolver
+            1.2
+            true
+        
+    
+    
+        
+            xerces
+            Apache Software Foundation
+            j-dev@xerces.apache.org
+            http://www.apache.org
+            Apache Software Foundation
+            http://www.apache.org
+        
+    
+

From 1519dc3cd6d47eec5e7f8415a2d8f78c07ff27e31ccc03caebb9f180a520c8d5 Mon Sep 17 00:00:00 2001
From: Fridrich Strba 
Date: Tue, 11 Dec 2018 09:58:58 +0000
Subject: [PATCH 6/9] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=55

---
 xerces-j2.changes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xerces-j2.changes b/xerces-j2.changes
index 519178b..5be37ab 100644
--- a/xerces-j2.changes
+++ b/xerces-j2.changes
@@ -45,6 +45,8 @@ Thu Dec  6 15:37:26 UTC 2018 - Fridrich Strba 
     + Don't use the bundled xml-apis, but depend on an existing
       package
     + Don't use custom taglets and ant tasks
+  * xerces-j2-manifest.patch
+    + Add to the jar file an OSGi manifest
 - Do not bundle the xml-apis and xml-resolver and stop using
   alternatives
 - Install as a maven artifact

From d9e8e708135c19fb0908dfbcb2b1797015c06a4e0071de328e11a573212d9c05 Mon Sep 17 00:00:00 2001
From: Fridrich Strba 
Date: Tue, 11 Dec 2018 09:59:16 +0000
Subject: [PATCH 7/9] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=56

---
 xerces-j2.changes | 2 --
 1 file changed, 2 deletions(-)

diff --git a/xerces-j2.changes b/xerces-j2.changes
index 5be37ab..519178b 100644
--- a/xerces-j2.changes
+++ b/xerces-j2.changes
@@ -45,8 +45,6 @@ Thu Dec  6 15:37:26 UTC 2018 - Fridrich Strba 
     + Don't use the bundled xml-apis, but depend on an existing
       package
     + Don't use custom taglets and ant tasks
-  * xerces-j2-manifest.patch
-    + Add to the jar file an OSGi manifest
 - Do not bundle the xml-apis and xml-resolver and stop using
   alternatives
 - Install as a maven artifact

From e85291dc7ec14857acba95189e18497fd59892807f91f961835d7ad45f2cf29a Mon Sep 17 00:00:00 2001
From: Fridrich Strba 
Date: Tue, 11 Dec 2018 09:59:31 +0000
Subject: [PATCH 8/9] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=57

---
 xerces-j2-manifest.patch | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 xerces-j2-manifest.patch

diff --git a/xerces-j2-manifest.patch b/xerces-j2-manifest.patch
deleted file mode 100644
index b85a368..0000000
--- a/xerces-j2-manifest.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/manifest.xerces	2018-04-21 06:02:09.000000000 +0200
-+++ src/manifest.xerces	2018-11-18 18:43:12.785381090 +0100
-@@ -1,5 +1,14 @@
- Manifest-Version: 1.0
- Created-By: @java.version@ (@java.vendor@)
-+Bundle-RequiredExecutionEnvironment: J2SE-1.5
-+Bundle-SymbolicName: org.apache.xerces
-+Bundle-ManifestVersion: 2
-+Bundle-Name: @impl.name@
-+Bundle-Localization: plugin
-+Bundle-Version: @impl.version@
-+Bundle-Vendor: Apache Software Foundation
-+Require-Bundle: system.bundle,javax.xml;visibility:=reexport, org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
-+Export-Package: META-INF.services;version="@impl.version@",org.apache.html.dom;version="@impl.version@",org.apache.wml;version="@impl.version@",org.apache.wml.dom;version="@impl.version@",org.apache.xerces.dom;version="@impl.version@",org.apache.xerces.dom.events;version="@impl.version@",org.apache.xerces.dom3.as;version="@impl.version@",org.apache.xerces.impl;version="@impl.version@",org.apache.xerces.impl.dtd;version="@impl.version@",org.apache.xerces.impl.dtd.models;version="@impl.version@",org.apache.xerces.impl.dv;version="@impl.version@",org.apache.xerces.impl.dv.dtd;version="@impl.version@",org.apache.xerces.impl.dv.util;version="@impl.version@",org.apache.xerces.impl.dv.xs;version="@impl.version@",org.apache.xerces.impl.io;version="@impl.version@",org.apache.xerces.impl.msg;version="@impl.version@",org.apache.xerces.impl.validation;version="@impl.version@",org.apache.xerces.impl.xpath;version="@impl.version@",org.apache.xerces.impl.xpath.regex;version="@impl.version@",org.apache.xerces.impl.xs;version="@impl.version@",org.apache.xerces.impl.xs.identity;version="@impl.version@",org.apache.xerces.impl.xs.models;version="@impl.version@",org.apache.xerces.impl.xs.opti;version="@impl.version@",org.apache.xerces.impl.xs.traversers;version="@impl.version@",org.apache.xerces.impl.xs.util;version="@impl.version@",org.apache.xerces.jaxp;version="@impl.version@",org.apache.xerces.jaxp.datatype;version="@impl.version@",org.apache.xerces.jaxp.validation;version="@impl.version@",org.apache.xerces.parsers;version="@impl.version@",org.apache.xerces.stax;version="@impl.version@",org.apache.xerces.stax.events;version="@impl.version@",org.apache.xerces.util;version="@impl.version@",org.apache.xerces.xinclude;version="@impl.version@",org.apache.xerces.xni;version="@impl.version@",org.apache.xerces.xni.grammars;version="@impl.version@",org.apache.xerces.xni.parser;version="@impl.version@",org.apache.xerces.xpointer;version="@impl.version@",org.apache.xerces.xs;version="@impl.version@",org.apache.xerces.xs.datatypes;version="@impl.version@",org.apache.xml.serialize;version="@impl.version@",org.w3c.dom.html;version="@impl.version@"
- 
- Name: org/apache/xerces/impl/
- Comment: @impl.name@ 

From d1ca97d3f1c2858a7c5a69b4929642168afa59b01fa97a3645c175df3342b892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= 
Date: Tue, 11 Dec 2018 10:29:01 +0000
Subject: [PATCH 9/9] Accepting request 657126 from
 home:jengelh:branches:Java:packages

- Remove rhetorics from description, and then compact its verbose
  grammar.
- Do away with xargs when find has some better options.

OBS-URL: https://build.opensuse.org/request/show/657126
OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=58
---
 xerces-j2.changes |  7 +++++++
 xerces-j2.spec    | 37 +++++++++++--------------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/xerces-j2.changes b/xerces-j2.changes
index 519178b..6ec2f38 100644
--- a/xerces-j2.changes
+++ b/xerces-j2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Dec 11 10:16:51 UTC 2018 - Jan Engelhardt 
+
+- Remove rhetorics from description, and then compact its verbose
+  grammar.
+- Do away with xargs when find has some better options.
+
 -------------------------------------------------------------------
 Thu Dec  6 15:37:26 UTC 2018 - Fridrich Strba 
 
diff --git a/xerces-j2.spec b/xerces-j2.spec
index b94668c..a5e2c57 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -56,35 +56,21 @@ Obsoletes:      %{name}-scripts < %{version}-%{release}
 BuildArch:      noarch
 
 %description
-Welcome to the future! Xerces2 is the next generation of high performance,
-fully compliant XML parsers in the Apache Xerces family. This new version of
-Xerces introduces the Xerces Native Interface (XNI), a complete framework for
-building parser components and configurations that is extremely modular and
-easy to program.
+Xerces2 is an XML parser in the Apache Xerces family. This version is the
+reference implementation of the Xerces Native Interface (XNI), a modular
+framework for building parser components and configurations.
 
-The Apache Xerces2 parser is the reference implementation of XNI but other
-parser components, configurations, and parsers can be written using the Xerces
-Native Interface. For complete design and implementation documents, refer to
-the XNI Manual.
-
-Xerces2 is a fully conforming XML Schema processor. For more information,
-refer to the XML Schema page.
-
-Xerces2 also provides a complete implementation of the Document Object Model
-Level 3 Core and Load/Save W3C Recommendations and provides a complete
-implementation of the XML Inclusions (XInclude) W3C Recommendation. It also
-provides support for OASIS XML Catalogs v1.1.
-
-Xerces2 is able to parse documents written according to the XML 1.1
+Xerces2 implements the Document Object Model Level 3 Core and Load/Save W3C
+Recommendations, the XML Inclusions (XInclude) W3C Recommendation, and supports
+OASIS XML Catalogs v1.1. It can parse documents conforming to the XML 1.1
 Recommendation, except that it does not yet provide an option to enable
 normalization checking as described in section 2.13 of this specification. It
-also handles name spaces according to the XML Namespaces 1.1 Recommendation,
-and will correctly serialize XML 1.1 documents if the DOM level 3 load/save
-APIs are in use.
+handles name spaces according to the XML Namespaces 1.1 Recommendation, and
+serializes XML 1.1 documents if the DOM level 3 load/save APIs are in use.
 
 %package        javadoc
 Summary:        Javadocs for %{name}
-Group:          Development/Libraries/Java
+Group:          Documentation/HTML
 
 %description    javadoc
 This package contains the API documentation for %{name}.
@@ -99,9 +85,8 @@ Requires:       %{name} = %{version}-%{release}
 
 %prep
 %setup -q -n xerces-%{cvs_version}
-find -name '*.class' -exec rm -f '{}' \;
-find -name '*.jar' -exec rm -f '{}' \;
-find -type f -print |xargs -i dos2unix {}
+find "(" -name "*.class" -o -name "*.jar" ")" -delete
+find -type f -exec dos2unix {} \;
 %patch0 -p1
 %patch1 -p1