From 5da51b216f5b0dbdaf6fec1c910cfdc55e85af4f0544b9e5dc2771056cdbc833 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 2 Jul 2021 09:22:38 +0000 Subject: [PATCH] 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 @@ + + + +- +- +- ++ + + +