From 6476478ba80d7baf751cffba29372e4a690f0eba6ed4e989b1c6bf458d623e60 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 2 Jul 2021 11:41:25 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/jing-trang?expand=0&rev=20

---
 jing-trang.changes |  8 ++++++++
 jing-trang.spec    | 18 +++++++++++-------
 old-saxon.patch    | 20 ++++++++++++++++++++
 3 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 old-saxon.patch

diff --git a/jing-trang.changes b/jing-trang.changes
index 9b44c04..8b98764 100644
--- a/jing-trang.changes
+++ b/jing-trang.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul  2 11:40:01 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * old-saxon.patch
+    + Avoid building old saxon validator in order to avoid
+      dependency on old saxon6
+
 -------------------------------------------------------------------
 Fri Jul  2 09:21:15 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/jing-trang.spec b/jing-trang.spec
index 3b60524..122232e 100644
--- a/jing-trang.spec
+++ b/jing-trang.spec
@@ -33,8 +33,8 @@ Source10:       dtdinst.1
 Patch0:         0000-Various-build-fixes.patch
 Patch1:         0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch
 Patch2:         no-tests.patch
+Patch3:         old-saxon.patch
 BuildRequires:  ant >= 1.8.2
-BuildRequires:  beust-jcommander
 #
 BuildRequires:  bsh2
 BuildRequires:  fdupes
@@ -44,7 +44,6 @@ BuildRequires:  javacc
 BuildRequires:  javapackages-local
 BuildRequires:  qdox
 BuildRequires:  relaxngDatatype >= 2011.1
-BuildRequires:  saxon6
 BuildRequires:  saxon9
 BuildRequires:  unzip
 BuildRequires:  xalan-j2
@@ -120,6 +119,8 @@ rmdir relaxng.org
 unzip %{SOURCE1}
 mv relaxng.org-%{relaxng_hash} relaxng.org
 
+cp %{SOURCE2} jing.pom
+cp %{SOURCE3} trang.pom
 cp %{SOURCE10} .
 mv gcj/{trang,jing}.1 .
 
@@ -127,6 +128,9 @@ rm -r gcj mod/datatype/src/main/org $(find . -name "*.jar")
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+rm -f \
+  mod/schematron/src/main/com/thaiopensource/validate/schematron/OldSaxonSchemaReaderFactory.java
 sed -i -e 's/\r//g' lib/isorelax.copying.txt
 sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/dtdinst/\1"|' \
     dtdinst/index.html
@@ -135,13 +139,13 @@ sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/trang/\1"|' \
 
 # The saxon9 package provides mvn(net.sf.saxon:saxon)
 # instead of mvn(net.sf.saxon:Saxon-HE)
-%pom_remove_dep net.sf.saxon:Saxon-HE %{SOURCE2}
-%pom_add_dep net.sf.saxon:saxon %{SOURCE2}
+%pom_remove_dep net.sf.saxon:Saxon-HE jing.pom
+%pom_add_dep net.sf.saxon:saxon jing.pom
 
 %build
 CLASSPATH=$(build-classpath \
     xalan-j2 xalan-j2-serializer xerces-j2 xml-commons-apis \
-	saxon9 saxon6 relaxngDatatype beust-jcommander) \
+	saxon9 relaxngDatatype) \
 %{ant} \
 	-Dlib.dir=%{_javadir} -Dbuild.sysclasspath=last \
 	-Dant.build.javac.source=8 -Dant.build.javac.target=8 \
@@ -160,11 +164,11 @@ install -dm 0755 %{buildroot}%{_javadir}
 install -dm 0755 %{buildroot}%{_mavenpomdir}
 
 install -pm 0644 jing-%{version}/bin/jing.jar %{buildroot}%{_javadir}/jing.jar
-install -pm 0644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/jing.pom
+install -pm 0644 jing.pom %{buildroot}%{_mavenpomdir}/jing.pom
 %add_maven_depmap jing.pom jing.jar -f jing
 
 install -pm 0644 trang-%{version}/trang.jar %{buildroot}%{_javadir}/trang.jar
-install -pm 0644 %{SOURCE3}  %{buildroot}%{_mavenpomdir}/trang.pom
+install -pm 0644 trang.pom  %{buildroot}%{_mavenpomdir}/trang.pom
 %add_maven_depmap trang.pom trang.jar -f trang
 
 install -pm 0644 dtdinst-%{version}/dtdinst.jar %{buildroot}%{_javadir}/dtdinst.jar
diff --git a/old-saxon.patch b/old-saxon.patch
new file mode 100644
index 0000000..7a541c4
--- /dev/null
+++ b/old-saxon.patch
@@ -0,0 +1,20 @@
+--- jing-trang-20181222/mod/schematron/mod.xml	2018-12-21 23:36:19.000000000 +0100
++++ jing-trang-20181222/mod/schematron/mod.xml	2021-07-02 13:29:44.941625566 +0200
+@@ -6,9 +6,6 @@
+   <depends lib="xalan-j2"/>
+   <depends lib="saxon"/>
+   <depends lib="saxon9"/>
+-  <test name="old-saxon" in="mod/schematron/test/schematrontest.xml"
+-	type="validate" schema="test/schematrontest.nrl"
+-	lib="saxon"/>
+   <test name="new-saxon" in="mod/schematron/test/schematrontest.xml"
+ 	type="validate" schema="test/schematrontest.nrl"
+ 	lib="saxon9"/>
+@@ -39,7 +36,6 @@
+   <compile/>
+   <service type="com.thaiopensource.validate.SchemaReaderFactory">
+     <provider classname="com.thaiopensource.validate.schematron.NewSaxonSchemaReaderFactory"/>
+-    <provider classname="com.thaiopensource.validate.schematron.OldSaxonSchemaReaderFactory"/>
+     <provider classname="com.thaiopensource.validate.schematron.XalanSchemaReaderFactory"/>
+     <provider classname="com.thaiopensource.validate.schematron.SchematronSchemaReaderFactory"/>
+   </service>