From 6b457330f9166db4eed230633c6992c530421df01cd28a1e47c466896dc50bdf Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 28 Jun 2021 06:02:02 +0000 Subject: [PATCH 1/5] Accepting request 902662 from home:urbic:java - Update to v20181222 - Package maven metadata - Use testng in build process - Remove unneeded patches OBS-URL: https://build.opensuse.org/request/show/902662 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jing-trang?expand=0&rev=16 --- 0000-Various-build-fixes.patch | 241 +++++++++++++ 0001-Various-build-fixes.patch | 317 ------------------ V20151127.tar.gz | 3 - _service | 5 + ...c8c8d337c2c75b6b15b281f2c69e86110e475f.zip | 3 + _service:download_files:V20181222.tar.gz | 3 + _service:download_files:jing-20181222.pom | 73 ++++ _service:download_files:trang-20181222.pom | 51 +++ dtdinst.1 | 2 +- jing-trang-20091111-datatype-sample.patch | 20 -- jing-trang-20151127-notestng.patch | 152 --------- jing-trang.changes | 8 + jing-trang.spec | 141 ++++---- 13 files changed, 463 insertions(+), 556 deletions(-) create mode 100644 0000-Various-build-fixes.patch delete mode 100644 0001-Various-build-fixes.patch delete mode 100644 V20151127.tar.gz create mode 100644 _service create mode 100644 _service:download_files:1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip create mode 100644 _service:download_files:V20181222.tar.gz create mode 100644 _service:download_files:jing-20181222.pom create mode 100644 _service:download_files:trang-20181222.pom delete mode 100644 jing-trang-20091111-datatype-sample.patch delete mode 100644 jing-trang-20151127-notestng.patch diff --git a/0000-Various-build-fixes.patch b/0000-Various-build-fixes.patch new file mode 100644 index 0000000..9d45ee1 --- /dev/null +++ b/0000-Various-build-fixes.patch @@ -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 @@ + ++ > ++ + + +@@ -428,18 +429,7 @@ + labels="Type-Archive, OpSys-All, Version-${version}"/> + + +- +- +- +- +- +- +- +- +- +- +- + + +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 @@ + + + +- +- +- +- +- +- + + + +@@ -165,7 +159,6 @@ + + + +- + + + +@@ -311,11 +304,12 @@ + + + +- ++ + + + +- ++ ++ + + + +@@ -415,6 +409,9 @@ + + + ++ ++ ++ + + + +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 @@ + + + ++ + + + +@@ -9,7 +10,7 @@ + + + +- ++ + + + +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 @@ + + + +- ++ + +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 @@ + + ++ + + +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 @@ + + + +- + + + +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 @@ + + + ++ + + + +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 @@ + + +- ++ + + +@@ -46,7 +46,8 @@ + failonerror="yes"> + + +- ++ ++ + + + +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 @@ + + + ++ + + + +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 @@ + + + +- ++ + + + +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 @@ + + + +- ++ + + + + + +- ++ + + + + + +- + + + +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 @@ + + + +- ++ + + + +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 @@ + + + ++ + + + diff --git a/0001-Various-build-fixes.patch b/0001-Various-build-fixes.patch deleted file mode 100644 index 5d89244..0000000 --- a/0001-Various-build-fixes.patch +++ /dev/null @@ -1,317 +0,0 @@ -From 212c793fe0f4b9e352e2ae9949beb187e77abe68 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -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 @@ - - - -- - - -- - -+ com.thaiopensource.datatype.xsd.regex.xerces2"> -+ -+ - -- -- -+ -+ - - - -@@ -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"/> - - - -@@ -290,7 +287,7 @@ - -+ classpath="${build.dir}/trang.jar:/usr/share/java/relaxngDatatype.jar"> - - - -@@ -360,7 +357,7 @@ - depends="version,googlecode.properties" - description="Upload files to Google Code. Run dist before this."> - -+ classpath="${lib.dir}/ant-googlecode.jar" name="gcupload"/> - - - -- -+ - - - - -- -+ - - - -@@ -111,7 +111,7 @@ - - - -- -+ - - - -@@ -151,10 +151,10 @@ - - - -- -+ - - -- -+ - - - -@@ -298,13 +298,18 @@ - - - -- -+ - -- -+ - - -+ - -- -+ -+ -+ -+ -+ - - - -@@ -373,7 +378,7 @@ - - - -- -+ - - - -@@ -402,8 +407,11 @@ - - - -- -+ - -+ -+ -+ - - - -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 @@ - - - -- -+ - -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 @@ - - -+ - - -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 @@ - - - -- - - - -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 @@ - - - -+ - - - -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 @@ - - -- -+ - - -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 @@ - - - -+ - - - -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 @@ - - - -- -+ - - - -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 @@ - - - -- -+ - -- -- - -+ lib="saxon"/> - -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 @@ - - - -- -+ - - - - - -- - - - -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 @@ - - - -- -+ - - - -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 @@ - - - -+ - - - --- -1.9.3 - diff --git a/V20151127.tar.gz b/V20151127.tar.gz deleted file mode 100644 index bbad287..0000000 --- a/V20151127.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:04cdf589abc5651d40f44fbc3415cb094672cb3c977770b2d9f6ea33e6d8932b -size 13746634 diff --git a/_service b/_service new file mode 100644 index 0000000..1138efd --- /dev/null +++ b/_service @@ -0,0 +1,5 @@ + + + yes + + diff --git a/_service:download_files:1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip b/_service:download_files:1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip new file mode 100644 index 0000000..cc92084 --- /dev/null +++ b/_service:download_files:1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a13f9f6fb4af8cd94f21db646d72e086269b7966e4f95a8e682cad30d50680ee +size 303283 diff --git a/_service:download_files:V20181222.tar.gz b/_service:download_files:V20181222.tar.gz new file mode 100644 index 0000000..b816baf --- /dev/null +++ b/_service:download_files:V20181222.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23b245faf41a8e15b054956406b0d43c0a2d5429b2195f0fa1bf429ba87a8959 +size 14847113 diff --git a/_service:download_files:jing-20181222.pom b/_service:download_files:jing-20181222.pom new file mode 100644 index 0000000..d5a8199 --- /dev/null +++ b/_service:download_files:jing-20181222.pom @@ -0,0 +1,73 @@ + + + 4.0.0 + org.relaxng + jing + 20181222 + Jing + Jing, a tool for validating documents against RelaxNG schemas. + http://www.thaiopensource.com/relaxng/jing.html + + + 3-clause BSD license + https://github.com/relaxng/jing-trang/blob/master/copying.txt + repo + + + + + jjc@jclark.com + James Clark + jjc@jclark.com + http://jclark.com/ + + + georgebina + George Bina + george@oxygenxml.com + http://www.oxygenxml.com + + + sideshowbarker + Michael[tm] Smith + mike@w3.org + https://people.w3.org/mike/ + + + + GitHub Issues + https://github.com/relaxng/jing-trang/issues + + + scm:git:git@github.com:relaxng/jing-trang.git + scm:git:git@github.com:relaxng/jing-trang.git + https://github.com/relaxng/jing-trang/ + + + Travis CI + https://travis-ci.org/relaxng/jing-trang + + + + isorelax + isorelax + 20030108 + + + net.sf.saxon + Saxon-HE + 9.6.0-4 + + + xerces + xercesImpl + 2.9.1 + + + xml-apis + xml-apis + 1.0.b2 + + + diff --git a/_service:download_files:trang-20181222.pom b/_service:download_files:trang-20181222.pom new file mode 100644 index 0000000..72607b9 --- /dev/null +++ b/_service:download_files:trang-20181222.pom @@ -0,0 +1,51 @@ + + + 4.0.0 + org.relaxng + trang + 20181222 + Trang + Trang, a multi-format schema converter based on RELAX NG. + http://www.thaiopensource.com/relaxng/trang.html + + + 3-clause BSD license + https://github.com/relaxng/jing-trang/blob/master/copying.txt + repo + + + + + jjc@jclark.com + James Clark + jjc@jclark.com + http://jclark.com/ + + + georgebina + George Bina + george@oxygenxml.com + http://www.oxygenxml.com + + + sideshowbarker + Michael[tm] Smith + mike@w3.org + https://people.w3.org/mike/ + + + + GitHub Issues + https://github.com/relaxng/jing-trang/issues + + + scm:git:git@github.com:relaxng/jing-trang.git + scm:git:git@github.com:relaxng/jing-trang.git + https://github.com/relaxng/jing-trang/ + + + Travis CI + https://travis-ci.org/relaxng/jing-trang + + diff --git a/dtdinst.1 b/dtdinst.1 index 6516881..aefa31b 100644 --- a/dtdinst.1 +++ b/dtdinst.1 @@ -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 diff --git a/jing-trang-20091111-datatype-sample.patch b/jing-trang-20091111-datatype-sample.patch deleted file mode 100644 index b468800..0000000 --- a/jing-trang-20091111-datatype-sample.patch +++ /dev/null @@ -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 @@ - - - -- -+ - - - -@@ -9,7 +9,7 @@ - - - -- -+ - - - diff --git a/jing-trang-20151127-notestng.patch b/jing-trang-20151127-notestng.patch deleted file mode 100644 index 2507270..0000000 --- a/jing-trang-20151127-notestng.patch +++ /dev/null @@ -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 @@ - - - -- -- -- -- -- - - - -@@ -153,9 +148,6 @@ - - - -- -- -- - - - -@@ -385,38 +377,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - ---- 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 @@ - - - -- -- -- - - - ---- 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 @@ - - - -- -- -- -- -- -- -- - - - ---- 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 @@ - -- -- -+ - - - ---- 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 @@ - - - -- -- -+ - ---- 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 @@ - - - -- -- -+ - ---- 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 @@ - - - -- -- -+ - ---- 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 @@ - -- -- -+ - - ---- 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 @@ - - - -- -- -+ - - - diff --git a/jing-trang.changes b/jing-trang.changes index 2b9e711..daea350 100644 --- a/jing-trang.changes +++ b/jing-trang.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jun 27 18:54:26 UTC 2021 - Anton Shvetz + +- Update to v20181222 +- Package maven metadata +- Use testng in build process +- Remove unneeded patches + ------------------------------------------------------------------- Fri Dec 7 07:31:06 UTC 2018 - Fridrich Strba diff --git a/jing-trang.spec b/jing-trang.spec index bf48d29..1ce2a10 100644 --- a/jing-trang.spec +++ b/jing-trang.spec @@ -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,35 +16,42 @@ # +%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 -BuildRequires: ant >= 1.8.2 # -BuildRequires: bsh2 +BuildRequires: ant >= 1.8.2 BuildRequires: fdupes -BuildRequires: isorelax -BuildRequires: java-devel >= 1.6 +BuildRequires: java-devel >= 1.8 BuildRequires: javacc +BuildRequires: javapackages-local BuildRequires: jpackage-utils -BuildRequires: qdox -BuildRequires: relaxngDatatype >= 2011.1 -BuildRequires: saxon9 BuildRequires: unzip -BuildRequires: xalan-j2 -BuildRequires: xml-commons-apis -BuildRequires: xml-commons-resolver +BuildRequires: xmvn-install +BuildRequires: mvn(com.github.relaxng:relaxngDatatype) >= 2011.1 +BuildRequires: mvn(com.thoughtworks.qdox:qdox) +BuildRequires: mvn(isorelax:isorelax) +BuildRequires: mvn(net.sf.saxon:saxon) +BuildRequires: mvn(org.apache-extras.beanshell:bsh) +BuildRequires: mvn(org.testng:testng) +BuildRequires: mvn(saxon:saxon) +BuildRequires: mvn(xalan:serializer) +BuildRequires: mvn(xml-apis:xml-apis) +BuildRequires: mvn(xml-resolver:xml-resolver) +# BuildArch: noarch %description @@ -58,10 +65,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,64 +95,83 @@ 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 %{SOURCE10} . mv gcj/{trang,jing}.1 . rm -r gcj mod/datatype/src/main/org $(find . -name "*.jar") %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 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 %{SOURCE2} +%pom_add_dep net.sf.saxon:saxon %{SOURCE2} + +%{mvn_file} org.relaxng:jing jing +%{mvn_file} org.relaxng:trang trang +%{mvn_file} org.relaxng:dtdinst dtdinst +%{mvn_package} org.relaxng:jing jing +%{mvn_package} org.relaxng:trang trang +%{mvn_package} org.relaxng:dtdinst dtdinst + %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 saxon6 relaxngDatatype testng beust-jcommander) \ %{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 -dm0755 %{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 +%{mvn_artifact} %{SOURCE2} jing-%{version}/bin/jing.jar +%{mvn_artifact} %{SOURCE3} trang-%{version}/trang.jar +%{mvn_artifact} org.relaxng:dtdinst:%{version} dtdinst-%{version}/dtdinst.jar +%mvn_install + +# 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 +179,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 From 740e3c0f44eef6e07c1a05d359f9fb3d0f23e848b0452dfe3c7fb78951595ac6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Jun 2021 12:45:10 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jing-trang?expand=0&rev=17 --- ...110e475f.zip => 1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip | 0 _service:download_files:V20181222.tar.gz => V20181222.tar.gz | 0 _service | 2 +- _service:download_files:jing-20181222.pom => jing-20181222.pom | 0 ...vice:download_files:trang-20181222.pom => trang-20181222.pom | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename _service:download_files:1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip => 1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip (100%) rename _service:download_files:V20181222.tar.gz => V20181222.tar.gz (100%) rename _service:download_files:jing-20181222.pom => jing-20181222.pom (100%) rename _service:download_files:trang-20181222.pom => trang-20181222.pom (100%) diff --git a/_service:download_files:1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip b/1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip similarity index 100% rename from _service:download_files:1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip rename to 1fc8c8d337c2c75b6b15b281f2c69e86110e475f.zip diff --git a/_service:download_files:V20181222.tar.gz b/V20181222.tar.gz similarity index 100% rename from _service:download_files:V20181222.tar.gz rename to V20181222.tar.gz diff --git a/_service b/_service index 1138efd..c5bb0e2 100644 --- a/_service +++ b/_service @@ -1,5 +1,5 @@ - + yes diff --git a/_service:download_files:jing-20181222.pom b/jing-20181222.pom similarity index 100% rename from _service:download_files:jing-20181222.pom rename to jing-20181222.pom diff --git a/_service:download_files:trang-20181222.pom b/trang-20181222.pom similarity index 100% rename from _service:download_files:trang-20181222.pom rename to trang-20181222.pom From 2b8053c65f20870609e444900999546dfff859fa62ee9b2edb3d4c3b65487960 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Jun 2021 12:51:02 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jing-trang?expand=0&rev=18 --- jing-trang.changes | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jing-trang.changes b/jing-trang.changes index daea350..bc160e8 100644 --- a/jing-trang.changes +++ b/jing-trang.changes @@ -4,7 +4,11 @@ Sun Jun 27 18:54:26 UTC 2021 - Anton Shvetz - Update to v20181222 - Package maven metadata - Use testng in build process -- Remove unneeded patches +- 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 From 3cfa3f33303af794804d009df6bcedf264cbac8ac6bef07b803775c911a955b6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 2 Jul 2021 09:22:38 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jing-trang?expand=0&rev=19 --- jing-trang.changes | 8 +++++ jing-trang.spec | 54 ++++++++++++++-------------- no-tests.patch | 87 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+), 26 deletions(-) create mode 100644 no-tests.patch diff --git a/jing-trang.changes b/jing-trang.changes index bc160e8..9b44c04 100644 --- a/jing-trang.changes +++ b/jing-trang.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jul 2 09:21:15 UTC 2021 - Fridrich Strba + +- 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 diff --git a/jing-trang.spec b/jing-trang.spec index 1ce2a10..3b60524 100644 --- a/jing-trang.spec +++ b/jing-trang.spec @@ -32,25 +32,24 @@ 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 BuildRequires: ant >= 1.8.2 +BuildRequires: beust-jcommander +# +BuildRequires: bsh2 BuildRequires: fdupes +BuildRequires: isorelax BuildRequires: java-devel >= 1.8 BuildRequires: javacc BuildRequires: javapackages-local -BuildRequires: jpackage-utils +BuildRequires: qdox +BuildRequires: relaxngDatatype >= 2011.1 +BuildRequires: saxon6 +BuildRequires: saxon9 BuildRequires: unzip -BuildRequires: xmvn-install -BuildRequires: mvn(com.github.relaxng:relaxngDatatype) >= 2011.1 -BuildRequires: mvn(com.thoughtworks.qdox:qdox) -BuildRequires: mvn(isorelax:isorelax) -BuildRequires: mvn(net.sf.saxon:saxon) -BuildRequires: mvn(org.apache-extras.beanshell:bsh) -BuildRequires: mvn(org.testng:testng) -BuildRequires: mvn(saxon:saxon) -BuildRequires: mvn(xalan:serializer) -BuildRequires: mvn(xml-apis:xml-apis) -BuildRequires: mvn(xml-resolver:xml-resolver) +BuildRequires: xalan-j2 +BuildRequires: xml-commons-apis +BuildRequires: xml-commons-resolver # BuildArch: noarch @@ -127,6 +126,7 @@ mv gcj/{trang,jing}.1 . rm -r gcj mod/datatype/src/main/org $(find . -name "*.jar") %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i -e 's/\r//g' lib/isorelax.copying.txt sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/dtdinst/\1"|' \ dtdinst/index.html @@ -138,24 +138,17 @@ sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/trang/\1"|' \ %pom_remove_dep net.sf.saxon:Saxon-HE %{SOURCE2} %pom_add_dep net.sf.saxon:saxon %{SOURCE2} -%{mvn_file} org.relaxng:jing jing -%{mvn_file} org.relaxng:trang trang -%{mvn_file} org.relaxng:dtdinst dtdinst -%{mvn_package} org.relaxng:jing jing -%{mvn_package} org.relaxng:trang trang -%{mvn_package} org.relaxng:dtdinst dtdinst - %build CLASSPATH=$(build-classpath \ xalan-j2 xalan-j2-serializer xerces-j2 xml-commons-apis \ - saxon9 saxon6 relaxngDatatype testng beust-jcommander) \ + saxon9 saxon6 relaxngDatatype beust-jcommander) \ %{ant} \ -Dlib.dir=%{_javadir} -Dbuild.sysclasspath=last \ -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ dist %install -install -dm0755 %{buildroot}{%{_mandir}/man1,%{_javadocdir}} +install -dm 0755 %{buildroot}{%{_mandir}/man1,%{_javadocdir}} unzip build/dist/jing-%{version}.zip unzip build/dist/trang-%{version}.zip @@ -163,10 +156,19 @@ unzip build/dist/dtdinst-%{version}.zip rm -f jing-%{version}/sample/datatype/datatype-sample.jar # JAR artifacts -%{mvn_artifact} %{SOURCE2} jing-%{version}/bin/jing.jar -%{mvn_artifact} %{SOURCE3} trang-%{version}/trang.jar -%{mvn_artifact} org.relaxng:dtdinst:%{version} dtdinst-%{version}/dtdinst.jar -%mvn_install +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 +%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 +%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 diff --git a/no-tests.patch b/no-tests.patch new file mode 100644 index 0000000..b8190b2 --- /dev/null +++ b/no-tests.patch @@ -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 @@ + + + +- + + +--- 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 @@ + + + +- +- +- +- +- + + + +--- 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 @@ + +- +- ++ + + + +--- 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 @@ + + + +- +- ++ + +--- 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 @@ + + + +- +- ++ + +--- 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 @@ + + + +- +- ++ + +--- 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 @@ + +- +- ++ + + +--- 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 @@ + + + +- +- +- ++ + + + From 84b9a86c700375232d45c8d54f7371b5d2d46d2d36451170292825a29d06ca77 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 2 Jul 2021 11:41:25 +0000 Subject: [PATCH 5/5] 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 + +- 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 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 @@ + + + +- + +@@ -39,7 +36,6 @@ + + + +- + + +