diff --git a/jing-trang.changes b/jing-trang.changes index f03a7d1..cd712aa 100644 --- a/jing-trang.changes +++ b/jing-trang.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Fri Dec 1 09:33:20 UTC 2017 - thomas.schraitle@suse.com - -- Fix bsc#1069796 to combine jing and trang into a single jing-trang - source package ------------------------------------------------------------------- Wed Nov 15 13:50:44 UTC 2017 - thomas.schraitle@suse.com diff --git a/jing-trang.spec b/jing-trang.spec index b0ef011..a655221 100644 --- a/jing-trang.spec +++ b/jing-trang.spec @@ -21,7 +21,8 @@ Version: 20151127 Release: 0 Summary: Schema validation and conversion based on RELAX NG License: BSD-3-Clause -URL: https://github.com/relaxng/jing-trang +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 # @@ -29,23 +30,24 @@ Patch0: 0001-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: bsh +BuildRequires: fdupes BuildRequires: isorelax BuildRequires: java-devel >= 1.6 BuildRequires: javacc BuildRequires: jpackage-utils -BuildRequires: qdox unzip +BuildRequires: qdox BuildRequires: relaxngDatatype >= 2011.1 BuildRequires: saxon9 +BuildRequires: unzip BuildRequires: xalan-j2 BuildRequires: xerces-j2-xml-apis BuildRequires: xml-apis >= 2.0 BuildRequires: xml-commons-resolver #!BuildIgnore: xml-commons-jaxp-1.3-apis -BuildRequires: fdupes BuildArch: noarch -BuildRequires: ant >= 1.8.2 %description %{summary}: @@ -53,7 +55,6 @@ BuildRequires: ant >= 1.8.2 jing: Schema validator trang: Multi-format schema converter - %package -n jing Summary: RELAX NG validator in Java Group: Productivity/Text/Utilities @@ -131,7 +132,6 @@ sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/dtdinst/\1"|' \ sed -i -e 's|"\(copying\.txt\)"|"%{_licensedir}/trang/\1"|' \ trang/doc/trang.html trang/doc/trang-manual.html - %build CLASSPATH=$(build-classpath \ xalan-j2 xalan-j2-serializer xerces-j2 xml-commons-apis saxon9 relaxngDatatype) \ @@ -140,7 +140,6 @@ CLASSPATH=$(build-classpath \ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ dist - %install rm -rf %{buildroot} *-%{version} @@ -172,7 +171,6 @@ install -pm 644 dtdinst-%{version}/dtdinst.jar %{buildroot}%{_javadir} install -D -m 0644 {dtdinst,jing,trang}.1 %{buildroot}%{_mandir}/man1/ sed -i 's/@VERSION@/%{version}/g' %{buildroot}%{_mandir}/man1/*.1 - %fdupes %{buildroot}%{_javadocdir} %files -n jing