Accepting request 144389 from home:mvyskocil:branches:Java:packages

- fix bnc#739498 - remove GPL covered com/icl/saxon/aelfred/XmlParser
  by file unde rmore permissive license

OBS-URL: https://build.opensuse.org/request/show/144389
OBS-URL: https://build.opensuse.org/package/show/Java:packages/saxon6?expand=0&rev=4

saxon6.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec  4 14:31:30 UTC 2012 - mvyskocil@suse.com
+
+- fix bnc#739498 - remove GPL covered com/icl/saxon/aelfred/XmlParser
+  by file unde rmore permissive license
+
 -------------------------------------------------------------------
 Thu Nov 29 15:16:28 UTC 2012 - mvyskocil@suse.com
 

saxon6.spec

@@ -30,9 +30,13 @@ Source0:        http://download.sf.net/saxon/saxon6-5-5.zip
 Source1:        %{name}.saxon.script
 Source2:        %{name}.build.script
 Source3:        %{name}.1
+Source4:        http://www.xml.com/2000/08/09/xslt/StructXmlParser.java
 Patch2:         %{name}-cmdlinefix.patch
 #PATCH-FIX-OPENSUSE: jdk7+ assumes ASCII as default encoding, so iso-8859-1 does not work by default
 Patch3:         saxon-javac-encoding.patch
+#PATCH-FIX-OPENSUSE: bnc#739498 - backport changes from com/icl/saxon/aelfred/XmlParser.java
+# to older version released under more permissive license
+Patch4:         saxon-add-fixes-from-com-isl-saxon-aelfred.patch
 BuildRequires:  jpackage-utils >= 1.6
 BuildRequires:  xml-commons-apis
 BuildRequires:  jdom >= 1.0
@@ -149,8 +153,11 @@ Utility scripts for %{name}.
 %setup -q -c
 unzip -q source.zip
 cp -p %{SOURCE2} ./build.xml
+cp -p %{SOURCE4} XmlParser.java
 %patch2 -p0
 %patch3 -p1
+%patch4 -p0
+cp XmlParser.java com/icl/saxon/aelfred/XmlParser.java
 # cleanup unnecessary stuff we'll build ourselves
 rm -rf *.jar docs/api