pool/jing-trang
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jing-trang?expand=0&rev=19

Browse Source
This commit is contained in:
Fridrich Strba 2021-07-02 09:22:38 +00:00 committed by Git OBS Bridge
parent 5160ab7651
commit 5da51b216f
3 changed files with 123 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jing-trang.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
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>

54
jing-trang.spec
View File

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

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>