rpm/jing-trang
SHA256
1
0
Fork 0
forked from pool/jing-trang
Code Pull Requests Activity

Accepting request 903702 from Java:packages

Browse Source 
20181222

OBS-URL: https://build.opensuse.org/request/show/903702
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jing-trang?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2021-07-04 20:10:40 +00:00 committed by Git OBS Bridge
commit b5f7751f44
15 changed files with 586 additions and 546 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

241
0000-Various-build-fixes.patch Normal file
View File

@ -0,0 +1,241 @@
diff -up jing-trang-20181222/build.xml.fix jing-trang-20181222/build.xml
--- jing-trang-20181222/build.xml.fix 2021-06-27 13:22:19.392361564 +0300
+++ jing-trang-20181222/build.xml 2021-06-27 14:52:11.847571826 +0300
@@ -152,7 +152,8 @@
<javadoc sourcepath="mod/datatype/src/main" destdir="${build.dir}/api/datatype"
additionalparam="-html5 -Xdoclint:none"
doctitle="RELAX NG Datatype API" windowtitle="RELAX NG Datatype API"
- packagenames="org.relaxng.datatype,org.relaxng.datatype.helpers">
+ >
+ <!--packagenames="org.relaxng.datatype,org.relaxng.datatype.helpers"> -->
<link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/"
packagelistLoc="extapidoc/jdk/1.5"/>
<classpath>
@@ -428,18 +429,7 @@
labels="Type-Archive, OpSys-All, Version-${version}"/>
</target>
-<target name="clean"
- description="Remove almost all files created during the build process">
- <delete dir="${build.dir}"/>
- <exec executable="git">
- <arg value="clean"/>
- <arg value="-d"/>
- <arg value="--force"/>
- <arg value="${doc.dir}"/>
- </exec>
-</target>
-
-<target name="realclean" depends="clean"
+<target name="realclean"
description="Remove all files created during the build process">
<delete>
<fileset dir="mod" includes="*/*.iml"/>
diff -up jing-trang-20181222/build.xsl.fix jing-trang-20181222/build.xsl
--- jing-trang-20181222/build.xsl.fix 2021-06-27 13:36:13.594166963 +0300
+++ jing-trang-20181222/build.xsl 2021-06-27 19:53:56.176573385 +0300
@@ -23,12 +23,6 @@
<target name="dummy"/>
<target name="init">
<mkdir dir="{$build}"/>
- <exec executable="git">
- <arg value="submodule"/>
- <arg value="update"/>
- <arg value="--init"/>
- <arg value="--recursive"/>
- </exec>
<copy todir="{$doc}">
<fileset dir="relaxng.org/jclark" includes="**"/>
</copy>
@@ -165,7 +159,6 @@
<pathelement location="${{lib.dir}}/{@lib}.jar"/>
</xsl:for-each>
<xsl:if test="test[@type='testng']">
- <pathelement location="${{lib.dir}}/testng.jar"/>
</xsl:if>
</classpath>
</javac>
@@ -311,11 +304,12 @@
<xsl:if test="@lib">
<pathelement location="${{lib.dir}}/{@lib}.jar"/>
<xsl:if test="@lib='xalan'">
- <pathelement location="${{lib.dir}}/serializer.jar"/>
+ <pathelement location="${{lib.dir}}/xalan-j2-serializer.jar"/>
</xsl:if>
</xsl:if>
<xsl:if test="$app = 'jing'">
- <pathelement location="${{lib.dir}}/xercesImpl.jar"/>
+ <pathelement location="${{lib.dir}}/xerces-j2.jar"/>
+ <pathelement location="${{lib.dir}}/relaxngDatatype.jar"/>
</xsl:if>
</classpath>
</java>
@@ -415,6 +409,9 @@
<xsl:for-each select="../depends[@lib]">
<pathelement location="${{lib.dir}}/{@lib}.jar"/>
</xsl:for-each>
+ <!-- Upstream testng.jar includes bsh and qdox -->
+ <pathelement location="${{lib.dir}}/bsh.jar"/>
+ <pathelement location="${{lib.dir}}/qdox.jar"/>
</classpath>
</testng>
</target>
diff -up jing-trang-20181222/datatype-sample/build.xml.fix jing-trang-20181222/datatype-sample/build.xml
--- jing-trang-20181222/datatype-sample/build.xml.fix 2021-06-27 20:51:29.945542964 +0300
+++ jing-trang-20181222/datatype-sample/build.xml 2021-06-27 20:51:59.946177241 +0300
@@ -2,6 +2,7 @@
<property name="build.dir" value="build"/>
<property name="jing.jar" value="jing.jar"/>
+<property name="datatype.jar" value="relaxngDatatype.jar"/>
<target name="init">
<mkdir dir="${build.dir}"/>
@@ -9,7 +10,7 @@
<target name="compile" depends="init">
<mkdir dir="${build.dir}/classes"/>
- <javac srcdir="src" destdir="${build.dir}/classes" classpath="${jing.jar}"/>
+ <javac srcdir="src" destdir="${build.dir}/classes" classpath="${datatype.jar}"/>
</target>
<target name="jar" depends="compile">
diff -up jing-trang-20181222/mod/catalog/mod.xml.fix jing-trang-20181222/mod/catalog/mod.xml
--- jing-trang-20181222/mod/catalog/mod.xml.fix 2021-06-27 19:39:16.877996996 +0300
+++ jing-trang-20181222/mod/catalog/mod.xml 2021-06-27 19:39:41.998527709 +0300
@@ -3,5 +3,5 @@
<test name="unit" type="testng"/>
<depends module="util"/>
<depends module="resolver"/>
- <depends lib="resolver"/>
+ <depends lib="xml-commons-resolver"/>
</module>
diff -up jing-trang-20181222/mod/datatype/mod.xml.fix jing-trang-20181222/mod/datatype/mod.xml
--- jing-trang-20181222/mod/datatype/mod.xml.fix 2021-06-27 19:38:37.897173469 +0300
+++ jing-trang-20181222/mod/datatype/mod.xml 2021-06-27 19:38:56.329562870 +0300
@@ -1,4 +1,5 @@
<module>
<depends module="util"/>
+ <depends lib="relaxngDatatype"/>
<compile/>
</module>
diff -up jing-trang-20181222/mod/jing/mod.xml.fix jing-trang-20181222/mod/jing/mod.xml
--- jing-trang-20181222/mod/jing/mod.xml.fix 2021-06-27 15:35:37.171239266 +0300
+++ jing-trang-20181222/mod/jing/mod.xml 2021-06-27 15:35:57.163667091 +0300
@@ -21,8 +21,6 @@
<jar>
<manifest>
<attribute name="Main-Class" value="com/thaiopensource/relaxng/util/Driver"/>
- <attribute name="Class-Path"
- value="xercesImpl.jar xml-apis.jar saxon.jar saxon9.jar xalan.jar isorelax.jar resolver.jar"/>
</manifest>
<service type="com.thaiopensource.datatype.xsd.regex.RegexEngine"/>
<service type="org.relaxng.datatype.DatatypeLibraryFactory"/>
diff -up jing-trang-20181222/mod/pattern/mod.xml.fix jing-trang-20181222/mod/pattern/mod.xml
--- jing-trang-20181222/mod/pattern/mod.xml.fix 2021-06-27 19:37:53.488235284 +0300
+++ jing-trang-20181222/mod/pattern/mod.xml 2021-06-27 19:38:11.800622151 +0300
@@ -3,6 +3,7 @@
<depends module="resolver"/>
<depends module="datatype"/>
<depends module="rng-parse"/>
+ <depends lib="relaxngDatatype"/>
<compile test="yes"/>
<test name="unit" type="testng"/>
</module>
diff -up jing-trang-20181222/mod/regex/mod.xml.fix jing-trang-20181222/mod/regex/mod.xml
--- jing-trang-20181222/mod/regex/mod.xml.fix 2021-06-27 14:31:19.700847624 +0300
+++ jing-trang-20181222/mod/regex/mod.xml 2021-06-27 19:37:25.491643818 +0300
@@ -1,6 +1,6 @@
<module>
<depends module="util"/>
- <depends lib="xercesImpl"/>
+ <depends lib="xerces-j2"/>
<compile test="yes"/>
<test name="xerces" type="java"
class="com.thaiopensource.datatype.xsd.regex.test.TestDriver">
@@ -46,7 +46,8 @@
failonerror="yes">
<arg value="com.thaiopensource.datatype.xsd.regex.java.Categories"/>
<arg value="${build.dir}/mod/regex/gensrc/main"/>
- <arg value="${lib.dir}/UnicodeData-3.1.0.txt"/>
+ <!--arg value="${lib.dir}/UnicodeData-3.1.0.txt"/-->
+ <arg value="lib/UnicodeData-3.1.0.txt"/>
<classpath>
<pathelement location="${build.dir}/mod/regex-gen/classes/main"/>
<pathelement location="${build.dir}/mod/util/classes/main"/>
diff -up jing-trang-20181222/mod/rng-jaxp/mod.xml.fix jing-trang-20181222/mod/rng-jaxp/mod.xml
--- jing-trang-20181222/mod/rng-jaxp/mod.xml.fix 2021-06-27 19:36:17.810211941 +0300
+++ jing-trang-20181222/mod/rng-jaxp/mod.xml 2021-06-27 19:36:39.150663808 +0300
@@ -7,6 +7,7 @@
<depends module="rng-parse"/>
<depends module="pattern"/>
<depends module="jaxp"/>
+ <depends lib="relaxngDatatype"/>
<compile test="yes"/>
<test name="unit" type="testng"/>
</module>
diff -up jing-trang-20181222/mod/rng-validate/mod.xml.fix jing-trang-20181222/mod/rng-validate/mod.xml
--- jing-trang-20181222/mod/rng-validate/mod.xml.fix 2021-06-27 19:35:27.297142380 +0300
+++ jing-trang-20181222/mod/rng-validate/mod.xml 2021-06-27 19:35:47.453569174 +0300
@@ -7,7 +7,7 @@
<depends module="pattern"/>
<depends module="validate"/>
<depends lib="ant"/>
- <depends lib="resolver"/>
+ <depends lib="xml-commons-resolver"/>
<test name="spec" type="validate" schema="eg/testSuite.rng"/>
<compile/>
<version package="com/thaiopensource/relaxng/util"/>
diff -up jing-trang-20181222/mod/schematron/mod.xml.fix jing-trang-20181222/mod/schematron/mod.xml
--- jing-trang-20181222/mod/schematron/mod.xml.fix 2021-06-27 18:47:59.700956461 +0300
+++ jing-trang-20181222/mod/schematron/mod.xml 2021-06-27 19:34:28.267892497 +0300
@@ -3,7 +3,7 @@
<depends module="resolver"/>
<depends module="validate"/>
<depends module="rng-validate"/>
- <depends lib="xalan"/>
+ <depends lib="xalan-j2"/>
<depends lib="saxon"/>
<depends lib="saxon9"/>
<test name="old-saxon" in="mod/schematron/test/schematrontest.xml"
diff -up jing-trang-20181222/mod/trang/mod.xml.fix jing-trang-20181222/mod/trang/mod.xml
--- jing-trang-20181222/mod/trang/mod.xml.fix 2021-06-27 18:47:17.064117947 +0300
+++ jing-trang-20181222/mod/trang/mod.xml 2021-06-27 18:47:26.984313043 +0300
@@ -13,13 +13,12 @@
<depends module="convert-to-xsd"/>
<depends module="convert-from-dtd"/>
<depends module="convert-to-dtd"/>
- <depends lib="resolver"/>
+ <depends lib="xml-commons-resolver"/>
<compile/>
<version package="com/thaiopensource/relaxng/translate"/>
<jar>
<manifest>
<attribute name="Main-Class" value="com/thaiopensource/relaxng/translate/Driver"/>
- <attribute name="Class-Path" value="resolver.jar"/>
</manifest>
<service type="com.thaiopensource.datatype.xsd.regex.RegexEngine">
<provider classname="com.thaiopensource.datatype.xsd.regex.xerces2.RegexEngineImpl"/>
diff -up jing-trang-20181222/mod/xerces/mod.xml.fix jing-trang-20181222/mod/xerces/mod.xml
--- jing-trang-20181222/mod/xerces/mod.xml.fix 2021-06-27 18:45:15.669730591 +0300
+++ jing-trang-20181222/mod/xerces/mod.xml 2021-06-27 18:45:44.434296268 +0300
@@ -1,7 +1,7 @@
<module>
<depends module="util"/>
<depends module="validate"/>
- <depends lib="xercesImpl"/>
+ <depends lib="xerces-j2"/>
<compile/>
<service type="com.thaiopensource.validate.SchemaReaderFactory">
<provider classname="com.thaiopensource.validate.xerces.XsdSchemaReaderFactory"/>
diff -up jing-trang-20181222/mod/xsd-datatype/mod.xml.fix jing-trang-20181222/mod/xsd-datatype/mod.xml
--- jing-trang-20181222/mod/xsd-datatype/mod.xml.fix 2021-06-27 18:43:59.364107956 +0300
+++ jing-trang-20181222/mod/xsd-datatype/mod.xml 2021-06-27 18:44:44.349067255 +0300
@@ -2,6 +2,7 @@
<depends module="util"/>
<depends module="datatype"/>
<depends module="regex"/>
+ <depends lib="relaxngDatatype"/>
<test name="xsd" type="validate" transform="xsdtest.xsl" schema="test/xsdtest.rnc"/>
<test name="unit" type="testng"/>
<compile test="yes"/>

317
0001-Various-build-fixes.patch
View File

@ -1,317 +0,0 @@
From 212c793fe0f4b9e352e2ae9949beb187e77abe68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 9 Jun 2014 09:54:16 +0300
Subject: [PATCH 1/2] Various build fixes
---
build.xml | 19 ++++++++-----------
build.xsl | 28 ++++++++++++++++++----------
mod/catalog/mod.xml | 2 +-
mod/datatype/mod.xml | 1 +
mod/jing/mod.xml | 2 --
mod/pattern/mod.xml | 1 +
mod/regex/mod.xml | 2 +-
mod/rng-jaxp/mod.xml | 1 +
mod/rng-validate/mod.xml | 2 +-
mod/schematron/mod.xml | 8 ++------
mod/trang/mod.xml | 3 +--
mod/xerces/mod.xml | 2 +-
mod/xsd-datatype/mod.xml | 1 +
13 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/build.xml b/build.xml
index a2bc499..ee0f061 100644
--- a/build.xml
+++ b/build.xml
@@ -145,22 +145,19 @@
<target name="javadoc" depends="init">
<mkdir dir="${build.dir}/api"/>
- <mkdir dir="${build.dir}/api/datatype"/>
<mkdir dir="${build.dir}/api/jing"/>
<mkdir dir="${build.dir}/api/regex"/>
- <javadoc sourcepath="mod/datatype/src/main" destdir="${build.dir}/api/datatype"
- doctitle="RELAX NG Datatype API" windowtitle="RELAX NG Datatype API"
- packagenames="org.relaxng.datatype,org.relaxng.datatype.helpers"/>
<javadoc sourcepath="mod/util/src/main:mod/regex/src/main" destdir="${build.dir}/api/regex"
packagenames="com.thaiopensource.datatype.xsd.regex,
com.thaiopensource.datatype.xsd.regex.java,
- com.thaiopensource.datatype.xsd.regex.xerces2"/>
+ com.thaiopensource.datatype.xsd.regex.xerces2">
+ <link href="/usr/share/javadoc/java"/>
+ </javadoc>
<javadoc sourcepathref="javadoc.sourcepath" destdir="${build.dir}/api/jing"
doctitle="Jing API" windowtitle="Jing API"
packagenames="${javadoc.packagenames}">
- <link offline="true" href="../datatype" packagelistLoc="${build.dir}/api/datatype"/>
- <link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/"
- packagelistLoc="extapidoc/jdk/1.5"/>
+ <link href="/usr/share/javadoc/java"/>
+ <link href="/usr/share/javadoc/relaxngDatatype"/>
</javadoc>
</target>
@@ -170,7 +167,7 @@
destdir="${build.dir}/doccheck"
packagenames="${javadoc.packagenames}"
doclet="com.sun.tools.doclets.doccheck.DocCheck"
- docletpath="lib/doccheck.jar"/>
+ docletpath="${lib.dir}/doccheck.jar"/>
</target>
<target name="datatype-sample" depends="jar">
@@ -290,7 +287,7 @@
<java classname="com.thaiopensource.relaxng.translate.Driver"
fork="true"
failonerror="yes"
- classpath="${build.dir}/trang.jar">
+ classpath="${build.dir}/trang.jar:/usr/share/java/relaxngDatatype.jar">
<arg value="dtdinst/dtdinst.rnc"/>
<arg value="${build.dir}/dtdinst/dtdinst.rng"/>
</java>
@@ -360,7 +357,7 @@
depends="version,googlecode.properties"
description="Upload files to Google Code. Run dist before this.">
<taskdef classname="net.bluecow.googlecode.ant.GoogleCodeUploadTask"
- classpath="lib/ant-googlecode.jar" name="gcupload"/>
+ classpath="${lib.dir}/ant-googlecode.jar" name="gcupload"/>
<gcupload username="${googlecode.username}"
password="${googlecode.password}"
projectname="jing-trang"
diff --git a/build.xsl b/build.xsl
index d76508f..e084fca 100644
--- a/build.xsl
+++ b/build.xsl
@@ -10,12 +10,12 @@
<project>
<xmlproperty file="version.xml"/>
<property name="build.dir" value="${{basedir}}/build"/>
- <property name="javacc.dir" value="lib"/>
+ <property name="javacc.dir" value="${{lib.dir}}"/>
<property name="ant.build.javac.source" value="1.5"/>
<property name="ant.build.javac.target" value="1.5"/>
<taskdef name="testng" classname="org.testng.TestNGAntTask">
<classpath>
- <pathelement location="lib/testng.jar"/>
+ <pathelement location="${{lib.dir}}/testng.jar"/>
</classpath>
</taskdef>
<target name="dummy"/>
@@ -111,7 +111,7 @@
<pathelement location="{$build}/mod/{@module}/classes/main"/>
</xsl:for-each>
<xsl:for-each select="depends[@lib]">
- <pathelement location="lib/{@lib}.jar"/>
+ <pathelement location="${{lib.dir}}/{@lib}.jar"/>
</xsl:for-each>
</classpath>
</javac>
@@ -151,10 +151,10 @@
<pathelement location="{$build}/mod/{@module}/classes/main"/>
</xsl:for-each>
<xsl:for-each select="depends[@lib]">
- <pathelement location="lib/{@lib}.jar"/>
+ <pathelement location="${{lib.dir}}/{@lib}.jar"/>
</xsl:for-each>
<xsl:if test="test[@type='testng']">
- <pathelement location="lib/testng.jar"/>
+ <pathelement location="${{lib.dir}}/testng.jar"/>
</xsl:if>
</classpath>
</javac>
@@ -298,13 +298,18 @@
<classpath>
<pathelement location="{$build}/{$app}.jar"/>
<xsl:if test="@lib">
- <pathelement location="lib/{@lib}.jar"/>
+ <pathelement location="${{lib.dir}}/{@lib}.jar"/>
<xsl:if test="@lib='xalan'">
- <pathelement location="lib/serializer.jar"/>
+ <pathelement location="${{lib.dir}}/xalan-j2-serializer.jar"/>
</xsl:if>
</xsl:if>
+ <!-- Upstream build assumes Class-Path in jing, trang manifests -->
<xsl:if test="$app = 'jing'">
- <pathelement location="lib/xercesImpl.jar"/>
+ <pathelement location="${{lib.dir}}/xerces-j2.jar"/>
+ <pathelement location="${{lib.dir}}/relaxngDatatype.jar"/>
+ </xsl:if>
+ <xsl:if test="$app = 'trang'">
+ <pathelement location="${{lib.dir}}/relaxngDatatype.jar"/>
</xsl:if>
</classpath>
</java>
@@ -373,7 +378,7 @@
<pathelement location="mod/{@module}/src/main"/>
</xsl:for-each>
<xsl:for-each select="../depends[@lib]">
- <pathelement location="lib/{@lib}.jar"/>
+ <pathelement location="${{lib.dir}}/{@lib}.jar"/>
</xsl:for-each>
</classpath>
</java>
@@ -402,8 +407,11 @@
<pathelement location="mod/{@module}/src/main"/>
</xsl:for-each>
<xsl:for-each select="../depends[@lib]">
- <pathelement location="lib/{@lib}.jar"/>
+ <pathelement location="${{lib.dir}}/{@lib}.jar"/>
</xsl:for-each>
+ <!-- Upstream testng.jar includes bsh and qdox -->
+ <pathelement location="${{lib.dir}}/bsh.jar"/>
+ <pathelement location="${{lib.dir}}/qdox.jar"/>
</classpath>
</testng>
</target>
diff --git a/mod/catalog/mod.xml b/mod/catalog/mod.xml
index c8e2feb..5398646 100644
--- a/mod/catalog/mod.xml
+++ b/mod/catalog/mod.xml
@@ -3,5 +3,5 @@
<test name="unit" type="testng"/>
<depends module="util"/>
<depends module="resolver"/>
- <depends lib="resolver"/>
+ <depends lib="xml-commons-resolver"/>
</module>
diff --git a/mod/datatype/mod.xml b/mod/datatype/mod.xml
index cd79499..cdb420a 100644
--- a/mod/datatype/mod.xml
+++ b/mod/datatype/mod.xml
@@ -1,4 +1,5 @@
<module>
<depends module="util"/>
+ <depends lib="relaxngDatatype"/>
<compile/>
</module>
diff --git a/mod/jing/mod.xml b/mod/jing/mod.xml
index 86583f8..8b2ec82 100644
--- a/mod/jing/mod.xml
+++ b/mod/jing/mod.xml
@@ -21,8 +21,6 @@
<jar>
<manifest>
<attribute name="Main-Class" value="com/thaiopensource/relaxng/util/Driver"/>
- <attribute name="Class-Path"
- value="xercesImpl.jar xml-apis.jar saxon.jar saxon9.jar xalan.jar isorelax.jar resolver.jar"/>
</manifest>
<service type="com.thaiopensource.datatype.xsd.regex.RegexEngine"/>
<service type="org.relaxng.datatype.DatatypeLibraryFactory"/>
diff --git a/mod/pattern/mod.xml b/mod/pattern/mod.xml
index 777f484..875f1cb 100644
--- a/mod/pattern/mod.xml
+++ b/mod/pattern/mod.xml
@@ -3,6 +3,7 @@
<depends module="resolver"/>
<depends module="datatype"/>
<depends module="rng-parse"/>
+ <depends lib="relaxngDatatype"/>
<compile test="yes"/>
<test name="unit" type="testng"/>
</module>
diff --git a/mod/regex/mod.xml b/mod/regex/mod.xml
index 3d1f73f..b682d6d 100644
--- a/mod/regex/mod.xml
+++ b/mod/regex/mod.xml
@@ -1,6 +1,6 @@
<module>
<depends module="util"/>
- <depends lib="xercesImpl"/>
+ <depends lib="xerces-j2"/>
<compile test="yes"/>
<test name="xerces" type="java"
class="com.thaiopensource.datatype.xsd.regex.test.TestDriver">
diff --git a/mod/rng-jaxp/mod.xml b/mod/rng-jaxp/mod.xml
index 10a8c6d..48c5d8c 100644
--- a/mod/rng-jaxp/mod.xml
+++ b/mod/rng-jaxp/mod.xml
@@ -7,6 +7,7 @@
<depends module="rng-parse"/>
<depends module="pattern"/>
<depends module="jaxp"/>
+ <depends lib="relaxngDatatype"/>
<compile test="yes"/>
<test name="unit" type="testng"/>
</module>
diff --git a/mod/rng-validate/mod.xml b/mod/rng-validate/mod.xml
index 109543b..b05b996 100644
--- a/mod/rng-validate/mod.xml
+++ b/mod/rng-validate/mod.xml
@@ -7,7 +7,7 @@
<depends module="pattern"/>
<depends module="validate"/>
<depends lib="ant"/>
- <depends lib="resolver"/>
+ <depends lib="xml-commons-resolver"/>
<test name="spec" type="validate" schema="eg/testSuite.rng"/>
<compile/>
<version package="com/thaiopensource/relaxng/util"/>
diff --git a/mod/schematron/mod.xml b/mod/schematron/mod.xml
index 51d85cd..3786625 100644
--- a/mod/schematron/mod.xml
+++ b/mod/schematron/mod.xml
@@ -3,15 +3,11 @@
<depends module="resolver"/>
<depends module="validate"/>
<depends module="rng-validate"/>
- <depends lib="xalan"/>
+ <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"/>
+ lib="saxon"/>
<test name="xalan" in="mod/schematron/test/schematrontest.xml"
type="validate" schema="test/schematrontest.nrl"
lib="xalan"/>
diff --git a/mod/trang/mod.xml b/mod/trang/mod.xml
index 69b5cc0..fa2d6d0 100644
--- a/mod/trang/mod.xml
+++ b/mod/trang/mod.xml
@@ -13,13 +13,12 @@
<depends module="convert-to-xsd"/>
<depends module="convert-from-dtd"/>
<depends module="convert-to-dtd"/>
- <depends lib="resolver"/>
+ <depends lib="xml-commons-resolver"/>
<compile/>
<version package="com/thaiopensource/relaxng/translate"/>
<jar>
<manifest>
<attribute name="Main-Class" value="com/thaiopensource/relaxng/translate/Driver"/>
- <attribute name="Class-Path" value="resolver.jar"/>
</manifest>
<service type="com.thaiopensource.datatype.xsd.regex.RegexEngine">
<provider classname="com.thaiopensource.datatype.xsd.regex.xerces2.RegexEngineImpl"/>
diff --git a/mod/xerces/mod.xml b/mod/xerces/mod.xml
index b7dc603..56bc85f 100644
--- a/mod/xerces/mod.xml
+++ b/mod/xerces/mod.xml
@@ -1,7 +1,7 @@
<module>
<depends module="util"/>
<depends module="validate"/>
- <depends lib="xercesImpl"/>
+ <depends lib="xerces-j2"/>
<compile/>
<service type="com.thaiopensource.validate.SchemaReaderFactory">
<provider classname="com.thaiopensource.validate.xerces.XsdSchemaReaderFactory"/>
diff --git a/mod/xsd-datatype/mod.xml b/mod/xsd-datatype/mod.xml
index f81eb3c..cc7645b 100644
--- a/mod/xsd-datatype/mod.xml
+++ b/mod/xsd-datatype/mod.xml
@@ -2,6 +2,7 @@
<depends module="util"/>
<depends module="datatype"/>
<depends module="regex"/>
+ <depends lib="relaxngDatatype"/>
<test name="xsd" type="validate" transform="xsdtest.xsl" schema="test/xsdtest.rnc"/>
<test name="unit" type="testng"/>
<compile test="yes"/>
--
1.9.3

3
1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a13f9f6fb4af8cd94f21db646d72e086269b7966e4f95a8e682cad30d50680ee
size 303283

3
V20151127.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:04cdf589abc5651d40f44fbc3415cb094672cb3c977770b2d9f6ea33e6d8932b
size 13746634

3
V20181222.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:23b245faf41a8e15b054956406b0d43c0a2d5429b2195f0fa1bf429ba87a8959
size 14847113

5
_service Normal file
View File

@ -0,0 +1,5 @@
<services>
<service name="download_files" mode="disabled">
<param name="recompress">yes</param>
</service>
</services>

2
dtdinst.1
View File

@ -1,4 +1,4 @@
.TH DTDINST "1" "September 2009" "DTDinst" "User Commands"
.TH DTDINST "1" "@VERSION@" "DTDinst" "User Commands"
.SH NAME
dtdinst \- XML DTD to XML instance format converter
.SH SYNOPSIS

73
jing-20181222.pom Normal file
View File

@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.relaxng</groupId>
<artifactId>jing</artifactId>
<version>20181222</version>
<name>Jing</name>
<description>Jing, a tool for validating documents against RelaxNG schemas.</description>
<url>http://www.thaiopensource.com/relaxng/jing.html</url>
<licenses>
<license>
<name>3-clause BSD license</name>
<url>https://github.com/relaxng/jing-trang/blob/master/copying.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>jjc@jclark.com</id>
<name>James Clark</name>
<email>jjc@jclark.com</email>
<url>http://jclark.com/</url>
</developer>
<developer>
<id>georgebina</id>
<name>George Bina</name>
<email>george@oxygenxml.com</email>
<url>http://www.oxygenxml.com</url>
</developer>
<developer>
<id>sideshowbarker</id>
<name>Michael[tm] Smith</name>
<email>mike@w3.org</email>
<url>https://people.w3.org/mike/</url>
</developer>
</developers>
<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/relaxng/jing-trang/issues</url>
</issueManagement>
<scm>
<connection>scm:git:git@github.com:relaxng/jing-trang.git</connection>
<developerConnection>scm:git:git@github.com:relaxng/jing-trang.git</developerConnection>
<url>https://github.com/relaxng/jing-trang/</url>
</scm>
<ciManagement>
<system>Travis CI</system>
<url>https://travis-ci.org/relaxng/jing-trang</url>
</ciManagement>
<dependencies>
<dependency>
<groupId>isorelax</groupId>
<artifactId>isorelax</artifactId>
<version>20030108</version>
</dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>9.6.0-4</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
</dependency>
</dependencies>
</project>

20
jing-trang-20091111-datatype-sample.patch
View File

@ -1,20 +0,0 @@
--- jing-trang-20091111/datatype-sample/build.xml~ 2001-09-22 07:10:47.000000000 +0300
+++ jing-trang-20091111/datatype-sample/build.xml 2010-11-30 22:49:33.352540838 +0200
@@ -1,7 +1,7 @@
<project name="RELAX NG Datatype Sample" default="jar" basedir=".">
<property name="build.dir" value="build"/>
-<property name="jing.jar" value="jing.jar"/>
+<property name="datatype.jar" value="/usr/share/java/relaxngDatatype.jar"/>
<target name="init">
<mkdir dir="${build.dir}"/>
@@ -9,7 +9,7 @@
<target name="compile" depends="init">
<mkdir dir="${build.dir}/classes"/>
- <javac srcdir="src" destdir="${build.dir}/classes" classpath="${jing.jar}"/>
+ <javac srcdir="src" destdir="${build.dir}/classes" classpath="${datatype.jar}"/>
</target>
<target name="jar" depends="compile">

152
jing-trang-20151127-notestng.patch
View File

@ -1,152 +0,0 @@
--- jing-trang-20151127/build.xsl 2017-11-30 15:06:42.700567381 +0100
+++ jing-trang-20151127/build.xsl 2017-11-30 15:07:43.208567609 +0100
@@ -13,11 +13,6 @@
<property name="javacc.dir" value="${{lib.dir}}"/>
<property name="ant.build.javac.source" value="1.5"/>
<property name="ant.build.javac.target" value="1.5"/>
- <taskdef name="testng" classname="org.testng.TestNGAntTask">
- <classpath>
- <pathelement location="${{lib.dir}}/testng.jar"/>
- </classpath>
- </taskdef>
<target name="dummy"/>
<target name="init">
<mkdir dir="{$build}"/>
@@ -153,9 +148,6 @@
<xsl:for-each select="depends[@lib]">
<pathelement location="${{lib.dir}}/{@lib}.jar"/>
</xsl:for-each>
- <xsl:if test="test[@type='testng']">
- <pathelement location="${{lib.dir}}/testng.jar"/>
- </xsl:if>
</classpath>
</javac>
</xsl:if>
@@ -385,38 +377,6 @@
</target>
</xsl:template>
-<xsl:template match="test[@type='testng']">
- <xsl:param name="name"/>
- <target name="mod.{$name}.test-{@name}" depends="mod.{$name}.compile-test">
- <mkdir dir="{$build}/mod/{$name}/test-{@name}"/>
- <testng workingDir="{$build}/mod/{$name}/test-{@name}"
- outputdir="{$build}/mod/{$name}/test-{@name}/report"
- haltonfailure="true"
- suiteName="mod.{$name}.test-{@name}"
- listeners="org.testng.reporters.DotTestListener">
- <classfileset dir="{$build}/mod/{$name}/classes/test" includes="**/*.class"/>
- <classpath>
- <pathelement location="{$build}/mod/{$name}/classes/test"/>
- <pathelement location="{$build}/mod/{$name}/classes/main"/>
- <pathelement location="mod/{$name}/src/test"/>
- <pathelement location="mod/{$name}/src/main"/>
- <xsl:for-each select="../depends[@module]">
- <pathelement location="{$build}/mod/{@module}/classes/test"/>
- <pathelement location="{$build}/mod/{@module}/classes/main"/>
- <pathelement location="mod/{@module}/src/test"/>
- <pathelement location="mod/{@module}/src/main"/>
- </xsl:for-each>
- <xsl:for-each select="../depends[@lib]">
- <pathelement location="${{lib.dir}}/{@lib}.jar"/>
- </xsl:for-each>
- <!-- Upstream testng.jar includes bsh and qdox -->
- <pathelement location="${{lib.dir}}/bsh.jar"/>
- <pathelement location="${{lib.dir}}/qdox.jar"/>
- </classpath>
- </testng>
- </target>
-</xsl:template>
-
<xsl:template match="service" mode="jar">
<xsl:param name="root"/>
<xsl:copy>
--- jing-trang-20151127/iml.xsl 2017-11-30 15:06:42.704567381 +0100
+++ jing-trang-20151127/iml.xsl 2017-11-30 15:07:52.776567646 +0100
@@ -27,9 +27,6 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <xsl:if test="test[@type='testng']">
- <orderEntry type="library" name="testng" level="project"/>
- </xsl:if>
<xsl:apply-templates select="depends"/>
<orderEntryProperties />
</component>
--- jing-trang-20151127/jing-trang.ipr 2017-11-30 15:06:42.704567381 +0100
+++ jing-trang-20151127/jing-trang.ipr 2017-11-30 15:08:20.208567749 +0100
@@ -499,13 +499,6 @@
<JAVADOC />
<SOURCES />
</library>
- <library name="testng">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/lib/testng.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
<library name="resolver">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/resolver.jar!/" />
--- jing-trang-20151127/mod/catalog/mod.xml 2017-11-30 15:06:42.748567381 +0100
+++ jing-trang-20151127/mod/catalog/mod.xml 2017-11-30 15:59:15.311548956 +0100
@@ -1,6 +1,5 @@
<module>
- <compile test="yes"/>
- <test name="unit" type="testng"/>
+ <compile/>
<depends module="util"/>
<depends module="resolver"/>
<depends lib="xml-commons-resolver"/>
--- jing-trang-20151127/mod/infer/mod.xml 2017-11-30 15:06:42.716567381 +0100
+++ jing-trang-20151127/mod/infer/mod.xml 2017-11-30 16:01:51.157015411 +0100
@@ -4,6 +4,5 @@
<depends module="datatype"/>
<depends module="xsd-datatype"/>
<depends module="regex"/>
- <compile test="yes"/>
- <test name="unit" type="testng"/>
+ <compile/>
</module>
--- jing-trang-20151127/mod/pattern/mod.xml 2017-11-30 15:06:42.736567381 +0100
+++ jing-trang-20151127/mod/pattern/mod.xml 2017-11-30 16:00:31.269015109 +0100
@@ -4,6 +4,5 @@
<depends module="datatype"/>
<depends module="rng-parse"/>
<depends lib="relaxngDatatype"/>
- <compile test="yes"/>
- <test name="unit" type="testng"/>
+ <compile/>
</module>
--- jing-trang-20151127/mod/rng-jaxp/mod.xml 2017-11-30 15:06:42.740567381 +0100
+++ jing-trang-20151127/mod/rng-jaxp/mod.xml 2017-11-30 16:02:00.329015446 +0100
@@ -8,6 +8,5 @@
<depends module="pattern"/>
<depends module="jaxp"/>
<depends lib="relaxngDatatype"/>
- <compile test="yes"/>
- <test name="unit" type="testng"/>
+ <compile/>
</module>
--- jing-trang-20151127/mod/util/mod.xml 2017-11-30 15:06:42.748567381 +0100
+++ jing-trang-20151127/mod/util/mod.xml 2017-11-30 15:57:22.367548530 +0100
@@ -1,5 +1,4 @@
<module>
- <compile test="yes"/>
- <test name="unit" type="testng"/>
+ <compile/>
</module>
--- jing-trang-20151127/mod/xsd-datatype/mod.xml 2017-11-30 15:06:42.748567381 +0100
+++ jing-trang-20151127/mod/xsd-datatype/mod.xml 2017-11-30 16:01:40.053015369 +0100
@@ -4,8 +4,7 @@
<depends module="regex"/>
<depends lib="relaxngDatatype"/>
<test name="xsd" type="validate" transform="xsdtest.xsl" schema="test/xsdtest.rnc"/>
- <test name="unit" type="testng"/>
- <compile test="yes"/>
+ <compile/>
<service type="org.relaxng.datatype.DatatypeLibraryFactory">
<provider classname="com.thaiopensource.datatype.xsd.DatatypeLibraryFactoryImpl"/>
</service>

28
jing-trang.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
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>
- Do not use xmvn-tools, since this is a ring package
- Added patch:
* no-tests.patch
+ avoid unnecessary dependency on testng
-------------------------------------------------------------------
Sun Jun 27 18:54:26 UTC 2021 - Anton Shvetz <shvetz.anton@gmail.com>
- Update to v20181222
- Package maven metadata
- Use testng in build process
- Remove unneeded patches:
* jing-trang-20091111-datatype-sample.patch
* jing-trang-20151127-notestng.patch
- Modified patch:
* 0001-Various-build-fixes.patch -> 0000-Various-build-fixes.patch
-------------------------------------------------------------------
Fri Dec 7 07:31:06 UTC 2018 - Fridrich Strba <fstrba@suse.com>

127
jing-trang.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package jing-trang
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,28 +16,32 @@
#
%global relaxng_hash 1fc8c8d337c2c75b6b15b281f2c69e86110e475f
Name: jing-trang
Version: 20151127
Version: 20181222
Release: 0
Summary: Schema validation and conversion based on RELAX NG
License: BSD-3-Clause
Group: Productivity/Text/Utilities
Url: https://github.com/relaxng/jing-trang
Source0: https://github.com/relaxng/jing-trang/archive/V%{version}.tar.gz
Source1: dtdinst.1
URL: https://github.com/relaxng/%{name}
Source0: https://github.com/relaxng/%{name}/archive/V%{version}.tar.gz
Source1: https://github.com/relaxng/relaxng.org/archive/%{relaxng_hash}.zip
Source2: https://repo1.maven.org/maven2/org/relaxng/jing/%{version}/jing-%{version}.pom
Source3: https://repo1.maven.org/maven2/org/relaxng/trang/%{version}/trang-%{version}.pom
Source10: dtdinst.1
#
Patch0: 0001-Various-build-fixes.patch
Patch0: 0000-Various-build-fixes.patch
Patch1: 0002-Use-Xalan-instead-of-Saxon-for-the-build-655601.patch
Patch2: %{name}-20091111-datatype-sample.patch
Patch3: %{name}-%{version}-notestng.patch
Patch2: no-tests.patch
Patch3: old-saxon.patch
BuildRequires: ant >= 1.8.2
#
BuildRequires: bsh2
BuildRequires: fdupes
BuildRequires: isorelax
BuildRequires: java-devel >= 1.6
BuildRequires: java-devel >= 1.8
BuildRequires: javacc
BuildRequires: jpackage-utils
BuildRequires: javapackages-local
BuildRequires: qdox
BuildRequires: relaxngDatatype >= 2011.1
BuildRequires: saxon9
@ -45,6 +49,7 @@ BuildRequires: unzip
BuildRequires: xalan-j2
BuildRequires: xml-commons-apis
BuildRequires: xml-commons-resolver
#
BuildArch: noarch
%description
@ -58,10 +63,8 @@ Summary: RELAX NG validator in Java
Group: Productivity/Text/Utilities
Requires: java-headless
Requires: jpackage-utils
Requires: relaxngDatatype
Requires: xerces-j2
Requires: xml-commons-resolver
Recommends: saxon9
Requires: mvn(com.github.relaxng:relaxngDatatype) >= 2011.1
Requires: mvn(xml-resolver:xml-resolver)
%description -n jing
jing is an XML validator implemented in Java. It validates against the
@ -90,32 +93,35 @@ Summary: Multi-format schema converter based on RELAX NG
Group: Productivity/Text/Utilities
Requires: java-headless
Requires: jpackage-utils
Requires: relaxngDatatype
Requires: xerces-j2
Requires: xml-commons-resolver
Requires: mvn(com.github.relaxng:relaxngDatatype) >= 2011.1
Requires: mvn(xerces:xercesImpl)
Requires: mvn(xml-resolver:xml-resolver)
%description -n trang
Trang converts between different schema languages for XML. It
supports the following languages: RELAX NG (both XML and compact
syntax), XML 1.0 DTDs, W3C XML Schema. A schema written in any of the
supported schema languages can be converted into any of the other
supported schema languages, except that W3C XML Schema is supported
for output only, not for input.
Trang converts between different schema languages for XML. It supports the
following languages: RELAX NG (both XML and compact syntax), XML 1.0 DTDs, W3C
XML Schema. A schema written in any of the supported schema languages can be
converted into any of the other supported schema languages, except that W3C XML
Schema is supported for output only, not for input.
%package -n dtdinst
Summary: XML DTD to XML instance format converter
Group: Productivity/Text/Utilities
Requires: java-headless >= 1.5.0
Requires: java-headless
Requires: jpackage-utils
%description -n dtdinst
DTDinst is a program for converting XML DTDs into an XML instance
format.
DTDinst is a program for converting XML DTDs into an XML instance format.
%prep
%setup -q
%setup -q -a 0
rmdir relaxng.org
unzip %{SOURCE1}
mv relaxng.org-%{relaxng_hash} relaxng.org
cp %{SOURCE1} .
cp %{SOURCE2} jing.pom
cp %{SOURCE3} trang.pom
cp %{SOURCE10} .
mv gcj/{trang,jing}.1 .
rm -r gcj mod/datatype/src/main/org $(find . -name "*.jar")
@ -123,31 +129,55 @@ rm -r gcj mod/datatype/src/main/org $(find . -name "*.jar")
%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
find . -name "OldSaxon*.java" -delete # No "old" saxon available in SUSE
sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/dtdinst/\1"|' \
dtdinst/index.html
sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/trang/\1"|' \
trang/doc/trang.html trang/doc/trang-manual.html
# 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 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 relaxngDatatype) \
xalan-j2 xalan-j2-serializer xerces-j2 xml-commons-apis \
saxon9 relaxngDatatype) \
%{ant} \
-Dlib.dir=%{_javadir} -Dbuild.sysclasspath=last \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
-Dant.build.javac.source=8 -Dant.build.javac.target=8 \
dist
%install
rm -rf %{buildroot} *-%{version}
install -dm 755 $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir},%{_mandir}/man1}
install -dm 0755 %{buildroot}{%{_mandir}/man1,%{_javadocdir}}
unzip build/dist/jing-%{version}.zip
install -Dpm 644 jing-%{version}/bin/jing.jar %{buildroot}%{_javadir}
mv jing-%{version}/doc/api %{buildroot}%{_javadocdir}/jing
unzip build/dist/trang-%{version}.zip
unzip build/dist/dtdinst-%{version}.zip
rm -f jing-%{version}/sample/datatype/datatype-sample.jar
# JAR artifacts
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 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 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
%add_maven_depmap org.relaxng:dtdinst:%{version} dtdinst.jar -f dtdinst
# API cocumentation
mv jing-%{version}/doc/api %{buildroot}%{_javadocdir}/jing
%fdupes %{buildroot}%{_javadocdir}
# We need to redefine name here to make jpackage_script aware of
# the correct name, otherwise it would use "jing-trang" in configuration names etc.
%define name jing
@ -155,46 +185,37 @@ rm -f jing-%{version}/sample/datatype/datatype-sample.jar
mkdir -p jing-%{version}/_licenses
mv jing-%{version}/doc/*copying.* jing-%{version}/_licenses
unzip build/dist/trang-%{version}.zip
install -pm 644 trang-%{version}/trang.jar %{buildroot}%{_javadir}
%define name trang
%jpackage_script com.thaiopensource.relaxng.translate.Driver "" "" trang:relaxngDatatype:xml-commons-resolver:xerces-j2 trang true
unzip build/dist/dtdinst-%{version}.zip
install -pm 644 dtdinst-%{version}/dtdinst.jar %{buildroot}%{_javadir}
%define name dtdinst
%jpackage_script com.thaiopensource.xml.dtd.app.Driver "" "" dtdinst dtdinst true
# Install manpages and replace @VERSION@
install -D -m 0644 {dtdinst,jing,trang}.1 %{buildroot}%{_mandir}/man1/
install -Dm0644 {dtdinst,jing,trang}.1 %{buildroot}%{_mandir}/man1/
sed -i 's/@VERSION@/%{version}/g' %{buildroot}%{_mandir}/man1/*.1
%fdupes %{buildroot}%{_javadocdir}
%files -n jing
%files -n jing -f .mfiles-jing
%license jing-%{version}/_licenses/*
%doc jing-%{version}/{readme.html,doc,sample}
%{_mandir}/man1/jing.1%{ext_man}
%{_mandir}/man1/jing.1%{?ext_man}
%{_bindir}/jing
%{_javadir}/jing.jar
%files -n jing-javadoc
%{_javadocdir}/jing
%license jing-%{version}/_licenses/*
%{_javadocdir}/jing/
%files -n trang
%files -n trang -f .mfiles-trang
%license trang-%{version}/copying.txt
%doc trang-%{version}/*.html
%{_bindir}/trang
%{_javadir}/trang.jar
%{_mandir}/man1/trang.1%{ext_man}
%{_mandir}/man1/trang.1%{?ext_man}
%files -n dtdinst
%files -n dtdinst -f .mfiles-dtdinst
%license dtdinst-%{version}/copying.txt
%doc dtdinst-%{version}/*.{html,rng,xsl}
%doc dtdinst-%{version}/{dtdinst.rnc.txt,teixml.dtd.txt,example}
%{_bindir}/dtdinst
%{_javadir}/dtdinst.jar
%{_mandir}/man1/dtdinst.1%{ext_man}
%{_mandir}/man1/dtdinst.1%{?ext_man}
%changelog

87
no-tests.patch Normal file
View File

@ -0,0 +1,87 @@
--- jing-trang-20181222/build.xml 2021-07-01 11:39:52.944475295 +0200
+++ jing-trang-20181222/build.xml 2021-07-01 11:41:13.792611378 +0200
@@ -386,7 +386,7 @@
<gzip zipfile="${build.dir}/dist/relaxng.tar.gz" src="${build.dir}/relaxng.tar"/>
</target>
-<target name="dist" depends="test,validate,jing-dist,trang-dist,dtdinst-dist,website"
+<target name="dist" depends="validate,jing-dist,trang-dist,dtdinst-dist,website"
description="Make a distribution, leaving artifacts in ${build.dir}/dist"/>
<target name="googlecode.properties.available">
--- jing-trang-20181222/build.xsl 2021-07-01 11:39:52.944475295 +0200
+++ jing-trang-20181222/build.xsl 2021-07-01 11:45:58.721090950 +0200
@@ -15,11 +15,6 @@
<property name="javacc.dir" value="${{lib.dir}}"/>
<property name="ant.build.javac.source" value="7"/>
<property name="ant.build.javac.target" value="1.7"/>
- <taskdef name="testng" classname="org.testng.TestNGAntTask">
- <classpath>
- <pathelement location="${{lib.dir}}/testng.jar"/>
- </classpath>
- </taskdef>
<target name="dummy"/>
<target name="init">
<mkdir dir="{$build}"/>
--- jing-trang-20181222/mod/catalog/mod.xml 2021-07-01 11:39:52.948475302 +0200
+++ jing-trang-20181222/mod/catalog/mod.xml 2021-07-01 11:42:11.328708210 +0200
@@ -1,6 +1,5 @@
<module>
- <compile test="yes"/>
- <test name="unit" type="testng"/>
+ <compile test="no"/>
<depends module="util"/>
<depends module="resolver"/>
<depends lib="xml-commons-resolver"/>
--- jing-trang-20181222/mod/infer/mod.xml 2021-07-01 11:39:52.960475322 +0200
+++ jing-trang-20181222/mod/infer/mod.xml 2021-07-01 11:42:17.348718337 +0200
@@ -4,6 +4,5 @@
<depends module="datatype"/>
<depends module="xsd-datatype"/>
<depends module="regex"/>
- <compile test="yes"/>
- <test name="unit" type="testng"/>
+ <compile test="no"/>
</module>
--- jing-trang-20181222/mod/pattern/mod.xml 2021-07-01 11:39:52.960475322 +0200
+++ jing-trang-20181222/mod/pattern/mod.xml 2021-07-01 11:42:23.344728421 +0200
@@ -4,6 +4,5 @@
<depends module="datatype"/>
<depends module="rng-parse"/>
<depends lib="relaxngDatatype"/>
- <compile test="yes"/>
- <test name="unit" type="testng"/>
+ <compile test="no"/>
</module>
--- jing-trang-20181222/mod/rng-jaxp/mod.xml 2021-07-01 11:39:52.964475329 +0200
+++ jing-trang-20181222/mod/rng-jaxp/mod.xml 2021-07-01 11:42:29.884739430 +0200
@@ -8,6 +8,5 @@
<depends module="pattern"/>
<depends module="jaxp"/>
<depends lib="relaxngDatatype"/>
- <compile test="yes"/>
- <test name="unit" type="testng"/>
+ <compile test="no"/>
</module>
--- jing-trang-20181222/mod/util/mod.xml 2021-07-01 11:39:52.972475342 +0200
+++ jing-trang-20181222/mod/util/mod.xml 2021-07-01 11:42:35.516748907 +0200
@@ -1,5 +1,4 @@
<module>
- <compile test="yes"/>
- <test name="unit" type="testng"/>
+ <compile test="no"/>
</module>
--- jing-trang-20181222/mod/xsd-datatype/mod.xml 2021-07-01 11:39:52.972475342 +0200
+++ jing-trang-20181222/mod/xsd-datatype/mod.xml 2021-07-01 11:42:48.676771055 +0200
@@ -3,9 +3,7 @@
<depends module="datatype"/>
<depends module="regex"/>
<depends lib="relaxngDatatype"/>
- <test name="xsd" type="validate" transform="xsdtest.xsl" schema="test/xsdtest.rnc"/>
- <test name="unit" type="testng"/>
- <compile test="yes"/>
+ <compile test="no"/>
<service type="org.relaxng.datatype.DatatypeLibraryFactory">
<provider classname="com.thaiopensource.datatype.xsd.DatatypeLibraryFactoryImpl"/>
</service>

20
old-saxon.patch Normal file
View File

@ -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>

51
trang-20181222.pom Normal file
View File

@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.relaxng</groupId>
<artifactId>trang</artifactId>
<version>20181222</version>
<name>Trang</name>
<description>Trang, a multi-format schema converter based on RELAX NG.</description>
<url>http://www.thaiopensource.com/relaxng/trang.html</url>
<licenses>
<license>
<name>3-clause BSD license</name>
<url>https://github.com/relaxng/jing-trang/blob/master/copying.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>jjc@jclark.com</id>
<name>James Clark</name>
<email>jjc@jclark.com</email>
<url>http://jclark.com/</url>
</developer>
<developer>
<id>georgebina</id>
<name>George Bina</name>
<email>george@oxygenxml.com</email>
<url>http://www.oxygenxml.com</url>
</developer>
<developer>
<id>sideshowbarker</id>
<name>Michael[tm] Smith</name>
<email>mike@w3.org</email>
<url>https://people.w3.org/mike/</url>
</developer>
</developers>
<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/relaxng/jing-trang/issues</url>
</issueManagement>
<scm>
<connection>scm:git:git@github.com:relaxng/jing-trang.git</connection>
<developerConnection>scm:git:git@github.com:relaxng/jing-trang.git</developerConnection>
<url>https://github.com/relaxng/jing-trang/</url>
</scm>
<ciManagement>
<system>Travis CI</system>
<url>https://travis-ci.org/relaxng/jing-trang</url>
</ciManagement>
</project>