diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index fe8884b..8e39688 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ msv-20050722.tar.gz /msv-parent-2009.1.pom /LICENSE-2.0.txt /msv-2013.5.1-clean.tar.gz +/msv-2013.6.1-clean.tar.gz +/msv-2022.7.tar.gz diff --git a/0001-Disable-Apache-XercesImpl.patch b/0001-Disable-Apache-XercesImpl.patch new file mode 100644 index 0000000..0f8f777 --- /dev/null +++ b/0001-Disable-Apache-XercesImpl.patch @@ -0,0 +1,24 @@ +From a580f124197fcc2a62875e43100cd35b1fc4329e Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Thu, 17 Aug 2023 09:30:08 +0200 +Subject: [PATCH] Disable Apache XercesImpl + +--- + .../main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java b/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java +index 4a4c4be..cdeab93 100644 +--- a/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java ++++ b/xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/RegExpFactory.java +@@ -42,7 +42,6 @@ public abstract class RegExpFactory { + public static RegExpFactory createFactory() { + String[] classList = new String[] { + "com.sun.msv.datatype.regexp.InternalImpl", +- "com.sun.msv.datatype.xsd.regex.XercesImpl", + "com.sun.msv.datatype.xsd.regex.JDKImpl" + }; + +-- +2.41.0 + diff --git a/changelog b/changelog new file mode 100644 index 0000000..ed2b8d5 --- /dev/null +++ b/changelog @@ -0,0 +1,12 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 2022.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 2022.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2022.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Aug 07 2023 Marian Koncek - 2022.7-1 +- Package unretired +- Update to upstream version 2022.7 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/create-tarball.sh b/create-tarball.sh deleted file mode 100755 index dc14981..0000000 --- a/create-tarball.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -if [ $# -ne 1 ]; then - echo "Usage: ./create-tarball VERSION" - exit 1 -fi - -VERSION=${1} -NAME="msv" - -# Generate tarball from upstream source control: -svn co https://svn.java.net/svn/${NAME}~svn/tags/${NAME}-${VERSION}/ ${NAME}-${VERSION} - -# Remove things that we don't need -( - cd ${NAME}-${VERSION} - rm -Rf www/ relames/doc/ relames/schemas - rm -Rf schmit/ shared/ tahiti/ -) - -tar zcf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION} - diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100755 index 0000000..fe7bf22 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,29 @@ +#!/bin/bash +set -e + +name=msv +version="$(sed -n 's/Version:\s*//p' ./*.spec)" + +# RETRIEVE +wget "https://github.com/xmlark/msv/archive/${name}-${version}/${name}-${version}.tar.gz" -O "${name}-${version}.orig.tar.gz" + +rm -rf tarball-tmp +mkdir tarball-tmp +pushd tarball-tmp +tar -xf "../${name}-${version}.orig.tar.gz" +mv "msv-msv-${version}" "${name}-${version}" + +pushd "${name}-${version}" +mv docs/xsdlib/Apache-LICENSE-1.1.txt . +mv docs/xsdlib/license.txt . +mv docs/xsdlib/README.md README-xsdlib.md + +# CLEAN TARBALL +find . -mindepth 1 -maxdepth 1 -type d ! -name 'xsdlib' -exec rm -rf {} + +rm -rf xsdlib/src/test + +popd + +tar -czf "../${name}-${version}.tar.gz" ./* +popd +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/msv-Disable-crimson.patch b/msv-Disable-crimson.patch deleted file mode 100644 index 81038ee..0000000 --- a/msv-Disable-crimson.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 7473c0343eaaf0f9593ff26f29887f2ba7e10971 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Fri, 12 Apr 2013 08:34:07 +0200 -Subject: [PATCH] Disable crimson - ---- - relames/pom.xml | 8 ++------ - relames/src/com/sun/msv/schematron/verifier/RelmesVerifier.java | 7 ------- - 2 files changed, 2 insertions(+), 13 deletions(-) - -diff --git a/relames/pom.xml b/relames/pom.xml -index 69d8d91..0ef18ae 100644 ---- a/relames/pom.xml -+++ b/relames/pom.xml -@@ -3,12 +3,12 @@ - 4.0.0 - net.java.dev.msv - msv-relames -- 2009.1-SNAPSHOT -+ 2009.1 - MSV Schematron Plugin - - net.java.dev.msv - msv-parent -- 2009.1-SNAPSHOT -+ 2009.1 - ../parent/pom.xml - - -@@ -71,10 +71,6 @@ - isorelax - - -- crimson -- crimson -- -- - relaxngDatatype - relaxngDatatype - -diff --git a/relames/src/com/sun/msv/schematron/verifier/RelmesVerifier.java b/relames/src/com/sun/msv/schematron/verifier/RelmesVerifier.java -index cbc898c..8327180 100644 ---- a/relames/src/com/sun/msv/schematron/verifier/RelmesVerifier.java -+++ b/relames/src/com/sun/msv/schematron/verifier/RelmesVerifier.java -@@ -88,13 +88,6 @@ public class RelmesVerifier implements IVerifier { - } catch( Throwable t ) { - // ignore any error. it wasn't Xerces. - } -- try { -- // Crimson? -- ((org.apache.crimson.tree.ElementNode2)super.parent) -- .setIdAttributeName(atts.getQName(i)); -- } catch( Throwable t ) { -- // ignore any error. it wasn't Crimson. -- } - } - } - } --- -1.8.1.4 - diff --git a/msv-Use-CatalogResolver-class-from-xml-commons-resolver.patch b/msv-Use-CatalogResolver-class-from-xml-commons-resolver.patch deleted file mode 100644 index 5b3d386..0000000 --- a/msv-Use-CatalogResolver-class-from-xml-commons-resolver.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 4b691adecd92c09689b0d23b7b17cc50f4b5bee9 Mon Sep 17 00:00:00 2001 -From: Michal Srb -Date: Thu, 11 Apr 2013 16:26:09 +0200 -Subject: [PATCH] Use CatalogResolver class from xml-commons-resolver - ---- - msv/examples/schemaLookup/Main.java | 2 +- - msv/src/com/sun/msv/driver/textui/Driver.java | 2 +- - msv/test/batch/BatchTester.java | 2 +- - msv/test/batch/driver/AbstractValidatorExImpl.java | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/msv/examples/schemaLookup/Main.java b/msv/examples/schemaLookup/Main.java -index 426051d..5bcbaa3 100644 ---- a/msv/examples/schemaLookup/Main.java -+++ b/msv/examples/schemaLookup/Main.java -@@ -36,7 +36,7 @@ import java.io.IOException; - - import javax.xml.parsers.DocumentBuilderFactory; - --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.tools.CatalogResolver; - import org.iso_relax.verifier.Schema; - import org.iso_relax.verifier.Verifier; - import org.w3c.dom.Document; -diff --git a/msv/src/com/sun/msv/driver/textui/Driver.java b/msv/src/com/sun/msv/driver/textui/Driver.java -index f659b5f..63a5794 100644 ---- a/msv/src/com/sun/msv/driver/textui/Driver.java -+++ b/msv/src/com/sun/msv/driver/textui/Driver.java -@@ -39,7 +39,7 @@ import java.util.Locale; - - import javax.xml.parsers.SAXParserFactory; - --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.tools.CatalogResolver; - import org.iso_relax.dispatcher.Dispatcher; - import org.iso_relax.dispatcher.SchemaProvider; - import org.iso_relax.dispatcher.impl.DispatcherImpl; -diff --git a/msv/test/batch/BatchTester.java b/msv/test/batch/BatchTester.java -index 7fd8b88..b7bba01 100644 ---- a/msv/test/batch/BatchTester.java -+++ b/msv/test/batch/BatchTester.java -@@ -40,7 +40,7 @@ import javax.xml.parsers.SAXParserFactory; - import junit.framework.Test; - import junit.framework.TestSuite; - --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.tools.CatalogResolver; - - import batch.driver.DTDValidator; - import batch.driver.GenericValidator; -diff --git a/msv/test/batch/driver/AbstractValidatorExImpl.java b/msv/test/batch/driver/AbstractValidatorExImpl.java -index dd85d93..33121f0 100644 ---- a/msv/test/batch/driver/AbstractValidatorExImpl.java -+++ b/msv/test/batch/driver/AbstractValidatorExImpl.java -@@ -36,7 +36,7 @@ import java.io.InputStream; - - import javax.xml.parsers.SAXParserFactory; - --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.tools.CatalogResolver; - import org.xml.sax.InputSource; - import org.xml.sax.XMLReader; - --- -1.8.1.4 - diff --git a/msv.spec b/msv.spec index c4c267b..ff1ec35 100644 --- a/msv.spec +++ b/msv.spec @@ -1,463 +1,81 @@ -Name: msv -Epoch: 1 -Version: 2013.5.1 -Release: 1%{?dist} -Summary: Multi-Schema Validator -Group: Development/Libraries -License: BSD and ASL 1.1 -URL: http://msv.java.net/ +Name: msv +Version: 2022.7 +Release: %autorelease +Summary: Multi-Schema Validator Toolkit +# License breakdown +# Apache-1.1 +# * xsdlib/src/main/java/com/sun/msv/datatype/regexp - All files except for InternalImpl.java +# BSD-3-Clause-Sun +# * pom.xml +# * xsdlib/src/main/java/com/sun/msv/datatype/regexp/InternalImpl.java +# BSD-3-Clause-Sun implied by docs/xsdlib/license.txt of the original tarball +# * xsdlib/src/main/java/com/sun/msv/datatype/xsd/CommandLineTester.java +# * xsdlib/src/main/resources/com/sun/msv/datatype/xsd/Messages.properties +# * xsdlib/src/main/resources/com/sun/msv/datatype/xsd/Messages_ja.properties +# BSD-3-Clause - All other .java files +License: Apache-1.1 AND BSD-3-Clause AND BSD-3-Clause-Sun +URL: https://xmlark.github.io/msv/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -# To generate tarball from upstream source control: -# $ ./create-tarball -Source0: %{name}-%{version}-clean.tar.gz +# ./generate-tarball.sh +Source0: %{name}-%{version}.tar.gz +Source1: generate-tarball.sh -# Parent POM is no longer in svn, get it from Maven central repository -Source1: http://repo1.maven.org/maven2/net/java/dev/%{name}/%{name}-parent/2009.1/%{name}-parent-2009.1.pom +Patch: 0001-Disable-Apache-XercesImpl.patch -Source2: http://www.apache.org/licenses/LICENSE-2.0.txt - -# There is a build time dependency on crimson which needs to be stripped -# (We're using xerces-j2 instead) -Patch0: %{name}-Disable-crimson.patch - -# Use CatalogResolver from xml-commons-resolver package -Patch1: %{name}-Use-CatalogResolver-class-from-xml-commons-resolver.patch - -BuildRequires: java-devel -BuildRequires: java-javadoc -BuildRequires: jpackage-utils -BuildRequires: maven-local -BuildRequires: maven-compiler-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-site-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-surefire-provider-junit4 -BuildRequires: maven-plugin-build-helper -BuildRequires: isorelax -BuildRequires: isorelax-javadoc -BuildRequires: relaxngDatatype -BuildRequires: relaxngDatatype-javadoc -BuildRequires: xalan-j2 -BuildRequires: xerces-j2 -BuildRequires: junit -BuildRequires: jvnet-parent -BuildRequires: xml-commons-resolver -BuildRequires: isorelax - -BuildArch: noarch +BuildRequires: maven-local-openjdk25 +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) +BuildRequires: mvn(org.jdom:jdom2) +BuildRequires: mvn(relaxngDatatype:relaxngDatatype) +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 2022.7-15 %description -The Sun Multi-Schema XML Validator (MSV) is a Java technology tool to validate -XML documents against several kinds of XML schemata. It supports RELAX NG, -RELAX Namespace, RELAX Core, TREX, XML DTDs, and a subset of XML Schema Part 1. -This latest (version 1.2) release includes several bug fixes and adds better -conformance to RELAX NG/W3C XML standards and JAXP masquerading. +The Multi Schema Validation toolkit is a Java based toolkit consisting of 8 +different submodules. The core module is the Multi-Schema XML Validator (MSV) +for the validation of XML documents against several kinds of XML schemata The +core supports RELAX NG, RELAX Namespace, RELAX Core, TREX, XML DTDs, and a +subset of XML Schema Part 1. -%package msv -Summary: Multi-Schema Validator Core -Group: Development/Libraries -# src/com/sun/msv/reader/xmlschema/DOMLSInputImpl.java is under ASL 2.0 -License: BSD and ASL 1.1 and ASL 2.0 -Requires: jpackage-utils -Requires: java -Requires: isorelax -Requires: relaxngDatatype -Requires: xerces-j2 -Requires: msv-xsdlib +%package xsdlib +Summary: Java implementation of W3C’s XML Schema Part 2 -%description msv -%{summary}. - -%package relames -Summary: Multi-Schema Validator Schematron Plugin -Group: Development/Libraries -Requires: jpackage-utils -Requires: java -Requires: isorelax -Requires: relaxngDatatype -Requires: xalan-j2 -Requires: xerces-j2 -Requires: msv-msv -Requires: msv-xsdlib - -%description relames -%{summary}. - -%package rngconv -Summary: Multi-Schema Validator RNG Converter -Group: Development/Libraries -Requires: jpackage-utils -Requires: java -Requires: isorelax -Requires: relaxngDatatype -Requires: xerces-j2 -Requires: msv-msv -Requires: msv-xsdlib - -%description rngconv -%{summary}. - -%package xmlgen -Summary: Multi-Schema Validator Generator -Group: Development/Libraries -Requires: jpackage-utils -Requires: java -Requires: isorelax -Requires: relaxngDatatype -Requires: xerces-j2 -Requires: msv-msv -Requires: msv-xsdlib - -%description xmlgen -%{summary}. - -%package xsdlib -Summary: Multi-Schema Validator XML Schema Library -Group: Development/Libraries -Requires: jpackage-utils -Requires: java -Requires: isorelax -Requires: relaxngDatatype -Requires: xerces-j2 - -%description xsdlib -%{summary}. - -%package javadoc -Summary: API documentation for Multi-Schema Validator -Group: Documentation -License: BSD and ASL 1.1 and ASL 2.0 -Requires: java-javadoc -Requires: jpackage-utils -Requires: isorelax-javadoc -Requires: relaxngDatatype-javadoc - -%description javadoc -%{summary}. - -%package manual -Summary: Manual for Multi-Schema Validator -Group: Documentation -License: BSD - -%description manual -%{summary}. - -%package demo -Summary: Samples for Multi-Schema Validator -Group: Documentation -License: BSD -Requires: msv-msv -Requires: msv-xsdlib -Requires: jpackage-utils - -%description demo -%{summary}. +%description xsdlib +MSV XML Datatypes Library, Java implementation of W3C’s XML Schema Part 2, is +intended for use with applications that incorporate XML Schema Part 2. %prep -%setup -q +%autosetup -p1 -C -# We don't have this plugin -%pom_remove_plugin :buildnumber-maven-plugin +# Disable runtime dependency on Apache Xerces +rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java -# Needed becuase of patch3 -%pom_add_dep xml-resolver:xml-resolver +%pom_xpath_remove 'pom:project/pom:modules' +%pom_xpath_inject 'pom:project' 'xsdlib' -# Enable relames module -%pom_xpath_inject "pom:modules" "relames" +%pom_xpath_remove 'pom:build/pom:extensions' -cp %{SOURCE1} parent-pom.xml +%pom_remove_dep org.apache.maven.scm:maven-scm-provider-gitexe +%pom_remove_dep xerces:xercesImpl xsdlib -# ASL 2.0 license text -cp %{SOURCE2} Apache-LICENSE-2.0.txt +%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin +%pom_remove_plugin -r :maven-javadoc-plugin -# Delete anything pre-compiled -find -name '*.class' -exec rm -f '{}' \; -find -name '*.jar' -exec rm -f '{}' \; -find -name '*.zip' -exec rm -f '{}' \; - -# Delete class-path entries from manifests -for m in $(find . -name MANIFEST.MF) ; do - sed --in-place -e '/^[Cc]lass-[Pp]ath:/d' $m -done - -# Apply patches -%patch0 -p1 -%patch1 -p1 - -# Fix isorelax groupId -%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "isorelax" -%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "isorelax" generator -%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "isorelax" msv -%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "isorelax" relames -%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "isorelax" rngconverter -%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "isorelax" xsdlib - -# Change encoding of non utf-8 files -for m in $(find . -name copyright.txt) ; do - iconv -f iso-8859-1 -t utf-8 < $m > $m.utf8 - mv $m.utf8 $m -done +# We only build xsdlib +%mvn_package net.java.dev.msv:msv __noinstall %build -mvn-rpmbuild install javadoc:aggregate +%mvn_build -j -s %install -# Jars -install -pD -T msv/target/%{name}-core-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}-core.jar -install -pD -T relames/target/%{name}-relames-2009.1.jar \ - %{buildroot}%{_javadir}/%{name}-relames.jar -install -pD -T rngconverter/target/%{name}-rngconverter-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}-rngconverter.jar -install -pD -T generator/target/%{name}-generator-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}-generator.jar -install -pD -T xsdlib/target/xsdlib-%{version}.jar \ - %{buildroot}%{_javadir}/xsdlib.jar -install -pD -T testharness/target/%{name}-testharness-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}-testharness.jar +%mvn_install -# Alternate jar names -ln -s %{name}-core.jar \ - %{buildroot}%{_javadir}/%{name}-msv.jar -ln -s %{name}-rngconverter.jar \ - %{buildroot}%{_javadir}/%{name}-rngconv.jar -ln -s %{name}-generator.jar \ - %{buildroot}%{_javadir}/%{name}-xmlgen.jar -ln -s xsdlib.jar \ - %{buildroot}%{_javadir}/%{name}-xsdlib.jar - -# Poms -install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv.pom -install -pD -T -m 644 parent-pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-parent.pom -install -pD -T -m 644 msv/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-core.pom -install -pD -T -m 644 relames/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-relames.pom -install -pD -T -m 644 rngconverter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-rngconverter.pom -install -pD -T -m 644 generator/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-generator.pom -install -pD -T -m 644 testharness/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-testharness.pom -install -pD -T -m 644 xsdlib/pom.xml %{buildroot}%{_mavenpomdir}/JPP-xsdlib.pom -%add_to_maven_depmap net.java.dev.msv msv %{version} JPP msv -%add_to_maven_depmap net.java.dev.msv msv-parent %{version} JPP msv-parent -%add_to_maven_depmap net.java.dev.msv msv-core %{version} JPP msv-core -%add_to_maven_depmap net.java.dev.msv msv-relames %{version} JPP msv-relames -%add_to_maven_depmap net.java.dev.msv msv-rngconverter %{version} JPP msv-rngconverter -%add_to_maven_depmap net.java.dev.msv msv-generator %{version} JPP msv-generator -%add_to_maven_depmap net.java.dev.msv msv-testharness %{version} JPP msv-testharness -%add_to_maven_depmap net.java.dev.msv xsdlib %{version} JPP xsdlib -%add_to_maven_depmap msv msv %{version} JPP msv-core -%add_to_maven_depmap com.sun.msv.datatype.xsd xsdlib %{version} JPP xsdlib - -# Javadocs -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} - -# Manuals -install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/msv -install -m 644 msv/doc/*.html %{buildroot}%{_docdir}/%{name}-%{version}/msv -install -m 644 msv/doc/*.gif %{buildroot}%{_docdir}/%{name}-%{version}/msv -install -m 644 msv/doc/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/msv - -install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/rngconverter -install -m 644 rngconverter/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/rngconverter - -install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/generator -install -m 644 generator/*.html %{buildroot}%{_docdir}/%{name}-%{version}/generator -install -m 644 generator/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/generator - -install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/xsdlib -install -m 644 xsdlib/*.html %{buildroot}%{_docdir}/%{name}-%{version}/xsdlib -install -m 644 xsdlib/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/xsdlib - -# Examples -install -d -m 755 %{buildroot}%{_datadir}/%{name}-%{version}/msv -cp -pr msv/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/msv -install -d -m 755 %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib -cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib - -# Scripts -%jpackage_script com.sun.msv.driver.textui.Driver "" "" msv-msv:msv-xsdlib:relaxngDatatype:isorelax msv true -%jpackage_script com.sun.msv.generator.Driver "" "" msv-xmlgen:msv-msv:msv-xsdlib:relaxngDatatype:isorelax:xerces-j2 xmlgen true -%jpackage_script com.sun.msv.schematron.Driver "" "" msv-relames:msv-msv:msv-xsdlib:relaxngDatatype:isorelax:xalan-j2 relames true -%jpackage_script com.sun.msv.writer.relaxng.Driver "" "" msv-rngconv:msv-msv:msv-xsdlib:relaxngDatatype:isorelax:xerces-j2 rngconv true - -%files msv -%{_bindir}/msv -%{_mavenpomdir}/JPP-%{name}-core.pom -%{_mavenpomdir}/JPP-%{name}-testharness.pom -%{_javadir}/%{name}-core.jar -%{_javadir}/%{name}-msv.jar -%{_javadir}/%{name}-testharness* -%doc License.txt -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc Apache-LICENSE-2.0.txt - -%files relames -%{_bindir}/relames -%{_mavenpomdir}/JPP-%{name}-relames.pom -%{_javadir}/%{name}-relames.jar -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc License.txt - -%files rngconv -%{_bindir}/rngconv -%{_mavenpomdir}/JPP-%{name}-rngconverter.pom -%{_javadir}/%{name}-rngconverter.jar -%{_javadir}/%{name}-rngconv.jar -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc License.txt - -%files xmlgen -%{_bindir}/xmlgen -%{_mavenpomdir}/JPP-%{name}-generator.pom -%{_javadir}/%{name}-generator.jar -%{_javadir}/%{name}-xmlgen.jar -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc License.txt - -%files xsdlib -%{_mavenpomdir}/JPP-xsdlib.pom -%{_javadir}/xsdlib.jar -%{_javadir}/%{name}-xsdlib.jar -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc License.txt - -# This subpackage wins the parent poms and the depmap because all the other -# subpackages require this one -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavenpomdir}/JPP-%{name}-parent.pom -%{_mavendepmapfragdir}/* - -%files javadoc -%{_javadocdir}/%{name} -%doc License.txt -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc Apache-LICENSE-2.0.txt - -%files manual -%doc %{_docdir}/%{name}-%{version} -%doc License.txt - -%files demo -%{_datadir}/%{name}-%{version} +%files xsdlib -f .mfiles-xsdlib +%doc README.md README-xsdlib.md +%license Apache-LICENSE-1.1.txt license.txt %changelog -* Fri Jun 07 2013 Michal Srb - 1:2013.5.1-1 -- Update to latest upstream version 2013.5.1 -- Clean up tarball -- Fix BR/R - -* Fri Apr 12 2013 Michal Srb - 1:2013.2.3-3 -- Fix license tags in javadoc, manual, demo subpackages - -* Fri Apr 12 2013 Michal Srb - 1:2013.2.3-2 -- Fix license tag for msv subpackage -- Remove unneeded patches - -* Thu Apr 11 2013 Michal Srb - 1:2013.2.3-1 -- Update to upstream version 2013.2.3 -- Resolves: rhbz#876845 -- Fix URL and license tag - -* Mon Feb 25 2013 Mikolaj Izdebski - 1:2009.1-14 -- Add missing BR: maven-local - -* Thu Feb 14 2013 Fedora Release Engineering - 1:2009.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Fri Jul 20 2012 Fedora Release Engineering - 1:2009.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Apr 6 2012 Alexander Kurtakov 1:2009.1-11 -- Drop unneeded BR/R. - -* Fri Jan 13 2012 Fedora Release Engineering - 1:2009.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 29 2011 Alexander Kurtakov 1:2009.1-9 -- Build with maven 3. -- Adapt to current guidelines. - -* Tue Feb 08 2011 Fedora Release Engineering - 1:2009.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Nov 2 2010 Ville Skyttä - 1:2009.1-7 -- Add msv, relames, xmlgen, and rngconv command line scripts. - -* Thu Oct 28 2010 Alexander Kurtakov 1:2009.1-6 -- BR junit4. - -* Thu Oct 28 2010 Alexander Kurtakov 1:2009.1-5 -- Fix depmaps and install jars required by msv.pom. - -* Fri Sep 24 2010 Mat Booth - 1:2009.1-4 -- Really require a version of xml-commons-resolver that provides the necessary - maven pom and depmap. - -* Sun Sep 19 2010 Mat Booth - 1:2009.1-3 -- Require a version of xml-commons-resolver that provides the necessary maven - pom and depmap. - -* Sun Sep 19 2010 Mat Booth - 1:2009.1-2 -- Re-patch build to link to local javadocs. -- Install maven poms/depmap. - -* Thu Sep 16 2010 Mat Booth - 1:2009.1-1 -- Update to latest tagged release. -- Drop support for GCJ ahead of time compilation. -- Fix RHBZ #627688, RHBZ #631076 -- This project now builds with maven instead of ant. -- The new build in this release aggregates javadocs, so now we have one javadoc - package that obsoletes the many javadoc packages we had before. -- Use new jar names that upstream use, provide the old names. -- Misc other changes for guideline compliance. - -* Sat Jul 25 2009 Fedora Release Engineering - 1:1.2-0.4.20050722.3.4.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri May 08 2009 Karsten Hopp 1.2-0.3.20050722.3.4.1 -- Specify source and target as 1.4 to make it build - -* Wed Feb 25 2009 Fedora Release Engineering - 1:1.2-0.3.20050722.3.4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jul 9 2008 Tom "spot" Callaway - 1:1.2-0.2.20050722.3.4 -- drop repotag - -* Tue Feb 19 2008 Fedora Release Engineering - 1:1.2-0.2.20050722.3jpp.3 -- Autorebuild for GCC 4.3 - -* Wed Sep 12 2007 Matt Wringe 0:1,2-0.1.20050722.3jpp.3 -- Make package build with new gcj. Remove .class files from demo package and - remove demo exclude from aot-compile-rpm - -* Tue Sep 11 2007 Matt Wringe 0:1.2-0.1.20050722.3jpp.2 -- Fix unowned directories -- Change copyright files to utf-8 format -- Change license field to BSD (from BSD-Style) - -* Fri Feb 16 2007 Andrew Overholt 0:1.2-0.1.20050722.3jpp.1 -- Remove postun Requires on jpackage-utils -- Set gcj_support to 1 -- Fix groups to shut up rpmlint -- Add versions to the Provides and Obsoletes -- Add patch to take out Class-Path in MANIFEST.MF - -* Thu Feb 15 2007 Matt Wringe - 0:1.2-0.1.20050722.3jpp.1.fc7 -- Extract sources from a fresh CVS export of the given tag and add extra source - required to build the package not present in the 20050722 tag anymore -- Add a patch to remove compile time dependency on crimson -- Add a patch to enable compression of jar files -- Add jpackage-utils as a requires for the packages/subpackages - -* Mon Feb 12 2007 Ralph Apel - 0:1.2-0.20050722.3jpp -- Add bootstrap option to build without saxon nor jdom -- Add gcj_support option - -* Mon Feb 17 2006 Fernando Nasser - 0:1.2-0.20050722.2jpp -- First JPP 1.7 build - -* Wed Aug 17 2005 Ralph Apel - 0:1.2-0.20050722.1jpp -- First JPP from this code base +%autochangelog diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..ae17c0c --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 +execute: + how: tmt diff --git a/sources b/sources index e6be564..386f1d9 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -23e80cb265daeed7dd357b4e891ba096 msv-parent-2009.1.pom -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt -a71d70c8e2b038474de84049d9203b59 msv-2013.5.1-clean.tar.gz +SHA512 (msv-2022.7.tar.gz) = 1fb7600af4a589bb68687b17fd7da3bd370362e06450d81509eb343f87a85366d3843f2b42f566560637428fdc8dc4abbd2eb5bc81444ab58ebf48c16d4d353e