From 272d9e219dc83839860342d1037533cdcb84e154 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:58:25 +0000 Subject: [PATCH 01/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index d853233..47560e7 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -223,6 +223,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1:2013.6.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1:2013.6.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0b21e69d38a9f7f488581842111aed6aee7dee8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:33:14 +0000 Subject: [PATCH 02/23] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 47560e7..8af7a43 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -223,6 +223,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1:2013.6.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1:2013.6.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d64a3747a979f709029501929c8ffe97be3e4238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 18 Aug 2021 10:34:36 +0200 Subject: [PATCH 03/23] Retired, failed to install for 8+ weeks https://pagure.io/releng/issue/10268 https://docs.fedoraproject.org/en-US/fesco/Fails_to_build_from_source_Fails_to_install/ --- .gitignore | 7 - create-tarball.sh | 22 - dead.package | 4 + ...lver-class-from-xml-commons-resolver.patch | 67 --- msv.spec | 430 ------------------ sources | 2 - 6 files changed, 4 insertions(+), 528 deletions(-) delete mode 100644 .gitignore delete mode 100755 create-tarball.sh create mode 100644 dead.package delete mode 100644 msv-Use-CatalogResolver-class-from-xml-commons-resolver.patch delete mode 100644 msv.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 57795d8..0000000 --- a/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -msv-20050722.tar.gz -/msv-2009.1.tar.gz -/msv-2013.2.3.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 diff --git a/create-tarball.sh b/create-tarball.sh deleted file mode 100755 index ec77fea..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/ .svn/ - rm -Rf schmit/ shared/ tahiti/ -) - -tar zcf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION} - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3df8bda --- /dev/null +++ b/dead.package @@ -0,0 +1,4 @@ +Retired, failed to install for 8+ weeks + +https://pagure.io/releng/issue/10268 +https://docs.fedoraproject.org/en-US/fesco/Fails_to_build_from_source_Fails_to_install/ 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 deleted file mode 100644 index 8af7a43..0000000 --- a/msv.spec +++ /dev/null @@ -1,430 +0,0 @@ -Name: msv -Epoch: 1 -Version: 2013.6.1 -Release: 21%{?dist} -Summary: Multi-Schema Validator -License: BSD and ASL 1.1 -URL: http://msv.java.net/ - -# To generate tarball from upstream source control: -# $ ./create-tarball -Source0: %{name}-%{version}-clean.tar.gz - -Source2: http://www.apache.org/licenses/LICENSE-2.0.txt -Source3: create-tarball.sh - -# Use CatalogResolver from xml-commons-resolver package -Patch1: %{name}-Use-CatalogResolver-class-from-xml-commons-resolver.patch - -BuildRequires: maven-local -BuildRequires: mvn(isorelax:isorelax) -BuildRequires: mvn(jdom:jdom) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(net.java:jvnet-parent:pom:) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(relaxngDatatype:relaxngDatatype) -BuildRequires: mvn(xerces:xercesImpl) -BuildRequires: mvn(xml-resolver:xml-resolver) - -BuildArch: noarch - -Obsoletes: %{name}-relames < %{version}-%{release} - -%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. - -%package msv -Summary: Multi-Schema Validator Core -# src/com/sun/msv/reader/xmlschema/DOMLSInputImpl.java is under ASL 2.0 -# msv/src/com/sun/msv/writer/ContentHandlerAdaptor.java is partially under Public Domain -License: BSD and ASL 1.1 and ASL 2.0 and Public Domain -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Requires: javapackages-tools - -%description msv -%{summary}. - -%package rngconv -Summary: Multi-Schema Validator RNG Converter -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Requires: javapackages-tools - -%description rngconv -%{summary}. - -%package xmlgen -Summary: Multi-Schema Validator Generator -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Requires: javapackages-tools - -%description xmlgen -%{summary}. - -%package xsdlib -Summary: Multi-Schema Validator XML Schema Library - -%description xsdlib -%{summary}. - -%package javadoc -Summary: API documentation for Multi-Schema Validator -License: BSD and ASL 1.1 and ASL 2.0 and Public Domain - -%description javadoc -%{summary}. - -%package manual -Summary: Manual for Multi-Schema Validator -License: BSD - -%description manual -%{summary}. - -%package demo -Summary: Samples for Multi-Schema Validator -License: BSD -Requires: msv-msv -Requires: msv-xsdlib - -%description demo -%{summary}. - -%prep -%setup -q - -# We don't have this plugin -%pom_remove_plugin :buildnumber-maven-plugin - -# javadoc generation fails due to strict doclint in JDK 8 -%pom_remove_plugin :maven-javadoc-plugin - -# Needed becuase of patch3 -%pom_add_dep xml-resolver:xml-resolver - -# ASL 2.0 license text -cp %{SOURCE2} Apache-LICENSE-2.0.txt - -# Delete anything pre-compiled -find -name '*.class' -exec rm -f '{}' \; -find -name '*.jar' -exec rm -f '{}' \; -find -name '*.zip' -exec rm -f '{}' \; - -# Test sources in default package break BND -rm -f testharness/src/*.java - -# 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 -%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" msv - -# remove maven-compiler-plugin configuration that is broken with Java 11 -%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration/pom:source' -%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration/pom:target' - -# 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 - -%mvn_file ":%{name}-core" %{name}-core %{name}-%{name} -%mvn_file ":%{name}-rngconverter" %{name}-rngconverter %{name}-rngconv -%mvn_file ":%{name}-generator" %{name}-generator %{name}-xmlgen -%mvn_file ":xsdlib" xsdlib %{name}-xsdlib - -%mvn_alias ":xsdlib" "com.sun.msv.datatype.xsd:xsdlib" - -%mvn_package ":*::{tests,javadoc,sources}:" __noinstall -%mvn_package ":%{name}{,-testharness}::{}:" __noinstall -%mvn_package ":%{name}{,-core}::{}:" %{name}-msv - -%build -%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 - -%install -%mvn_install - -# Manuals -install -d -m 755 %{buildroot}%{_docdir}/%{name}/msv -install -m 644 msv/doc/*.html %{buildroot}%{_docdir}/%{name}/msv -install -m 644 msv/doc/*.gif %{buildroot}%{_docdir}/%{name}/msv -install -m 644 msv/doc/README.txt %{buildroot}%{_docdir}/%{name}/msv - -install -d -m 755 %{buildroot}%{_docdir}/%{name}/rngconverter -install -m 644 rngconverter/README.txt %{buildroot}%{_docdir}/%{name}/rngconverter - -install -d -m 755 %{buildroot}%{_docdir}/%{name}/generator -install -m 644 generator/*.html %{buildroot}%{_docdir}/%{name}/generator -install -m 644 generator/README.txt %{buildroot}%{_docdir}/%{name}/generator - -install -d -m 755 %{buildroot}%{_docdir}/%{name}/xsdlib -install -m 644 xsdlib/*.html %{buildroot}%{_docdir}/%{name}/xsdlib -install -m 644 xsdlib/README.txt %{buildroot}%{_docdir}/%{name}/xsdlib - -# Examples -install -d -m 755 %{buildroot}%{_datadir}/%{name}/msv -cp -pr msv/examples/* %{buildroot}%{_datadir}/%{name}/msv -install -d -m 755 %{buildroot}%{_datadir}/%{name}/xsdlib -cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/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.writer.relaxng.Driver "" "" msv-rngconv:msv-msv:msv-xsdlib:relaxngDatatype:isorelax:xerces-j2 rngconv true - -%files msv -f .mfiles-msv-msv -%{_bindir}/msv -%doc License.txt -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc Apache-LICENSE-2.0.txt - -%files rngconv -f .mfiles-msv-rngconverter -%{_bindir}/rngconv -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc License.txt - -%files xmlgen -f .mfiles-msv-generator -%{_bindir}/xmlgen -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc License.txt - -%files xsdlib -f .mfiles-xsdlib -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc License.txt - -%files javadoc -f .mfiles-javadoc -%doc License.txt -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc Apache-LICENSE-2.0.txt - -%files manual -%doc %{_docdir}/%{name} -%doc License.txt - -%files demo -%{_datadir}/%{name} - -%changelog -* Thu Jul 22 2021 Fedora Release Engineering - 1:2013.6.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1:2013.6.1-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1:2013.6.1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 18 2020 Fabio Valentini - 1:2013.6.1-18 -- Set javac source and target to 1.8 to fix Java 11 builds. - -* Sat Jul 11 2020 Jiri Vanek - 1:2013.6.1-17 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jan 29 2020 Fedora Release Engineering - 1:2013.6.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1:2013.6.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1:2013.6.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 31 2018 Severin Gehwolf - 1:2013.6.1-13 -- Add explicit javapackages-tools requirement since scripts use - java-functions. - -* Fri Jul 13 2018 Fedora Release Engineering - 1:2013.6.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 1:2013.6.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1:2013.6.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1:2013.6.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 1:2013.6.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Sep 23 2015 Mikolaj Izdebski - 1:2013.6.1-7 -- Remove testharness sources from default package -- Resolves: rhbz#1263628 - -* Wed Jun 17 2015 Fedora Release Engineering - 1:2013.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 14 2015 Mikolaj Izdebski - 1:2013.6.1-5 -- Remove maven-javadoc-plugin execution - -* Sun Sep 14 2014 Gerard Ryan - 1:2013.6.1-4 -- Don't install testharness jar: pulls in ant -- Fix changelog bogus date warning - -* Mon Aug 4 2014 Mikolaj Izdebski - 1:2013.6.1-3 -- Remove unneeded build-requires -- Fix build-requires on jvnet-parent - -* Sat Jun 07 2014 Fedora Release Engineering - 1:2013.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Sep 23 2013 Michal Srb - 1:2013.6.1-1 -- Update to upstream version 2013.6.1 - -* Mon Sep 23 2013 Michal Srb - 1:2013.5.1-7 -- Adapt to current guidelines - -* Wed Aug 07 2013 Michal Srb - 1:2013.5.1-6 -- Unversioned doc dir (Resolves: #993980) -- See: http://fedoraproject.org/wiki/Changes/UnversionedDocdirs - -* Tue Aug 06 2013 Michal Srb - 1:2013.5.1-5 -- Provide net.java.dev.msv:msv (Resolves: #993872) - -* Sat Aug 03 2013 Fedora Release Engineering - 1:2013.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Aug 01 2013 Michal Srb - 1:2013.5.1-3 -- Fix license tag (+Public Domain) -- Add create-tarball.sh to SRPM - -* Wed Jul 31 2013 Michal Srb - 1:2013.5.1-2 -- Do not build module with unclear licensing (relames) -- Replace %%add_to_maven_depmap with %%add_maven_depmap - -* 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 - -* Fri 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 diff --git a/sources b/sources deleted file mode 100644 index b9273c4..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -a1fb4f939e291fe85711551cd7d36e33 msv-2013.6.1-clean.tar.gz -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt From e83921d6a7871e80bf6c4e6e90adc1565ec1024d Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Thu, 23 Nov 2023 09:01:44 +0100 Subject: [PATCH 04/23] Unretirement request: https://pagure.io/releng/issue/11791 --- .gitignore | 7 + create-tarball.sh | 22 + dead.package | 4 - ...lver-class-from-xml-commons-resolver.patch | 67 +++ msv.spec | 430 ++++++++++++++++++ sources | 2 + 6 files changed, 528 insertions(+), 4 deletions(-) create mode 100644 .gitignore create mode 100755 create-tarball.sh delete mode 100644 dead.package create mode 100644 msv-Use-CatalogResolver-class-from-xml-commons-resolver.patch create mode 100644 msv.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57795d8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +msv-20050722.tar.gz +/msv-2009.1.tar.gz +/msv-2013.2.3.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 diff --git a/create-tarball.sh b/create-tarball.sh new file mode 100755 index 0000000..ec77fea --- /dev/null +++ b/create-tarball.sh @@ -0,0 +1,22 @@ +#!/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/ .svn/ + rm -Rf schmit/ shared/ tahiti/ +) + +tar zcf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION} + diff --git a/dead.package b/dead.package deleted file mode 100644 index 3df8bda..0000000 --- a/dead.package +++ /dev/null @@ -1,4 +0,0 @@ -Retired, failed to install for 8+ weeks - -https://pagure.io/releng/issue/10268 -https://docs.fedoraproject.org/en-US/fesco/Fails_to_build_from_source_Fails_to_install/ diff --git a/msv-Use-CatalogResolver-class-from-xml-commons-resolver.patch b/msv-Use-CatalogResolver-class-from-xml-commons-resolver.patch new file mode 100644 index 0000000..5b3d386 --- /dev/null +++ b/msv-Use-CatalogResolver-class-from-xml-commons-resolver.patch @@ -0,0 +1,67 @@ +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 new file mode 100644 index 0000000..8af7a43 --- /dev/null +++ b/msv.spec @@ -0,0 +1,430 @@ +Name: msv +Epoch: 1 +Version: 2013.6.1 +Release: 21%{?dist} +Summary: Multi-Schema Validator +License: BSD and ASL 1.1 +URL: http://msv.java.net/ + +# To generate tarball from upstream source control: +# $ ./create-tarball +Source0: %{name}-%{version}-clean.tar.gz + +Source2: http://www.apache.org/licenses/LICENSE-2.0.txt +Source3: create-tarball.sh + +# Use CatalogResolver from xml-commons-resolver package +Patch1: %{name}-Use-CatalogResolver-class-from-xml-commons-resolver.patch + +BuildRequires: maven-local +BuildRequires: mvn(isorelax:isorelax) +BuildRequires: mvn(jdom:jdom) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(net.java:jvnet-parent:pom:) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(relaxngDatatype:relaxngDatatype) +BuildRequires: mvn(xerces:xercesImpl) +BuildRequires: mvn(xml-resolver:xml-resolver) + +BuildArch: noarch + +Obsoletes: %{name}-relames < %{version}-%{release} + +%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. + +%package msv +Summary: Multi-Schema Validator Core +# src/com/sun/msv/reader/xmlschema/DOMLSInputImpl.java is under ASL 2.0 +# msv/src/com/sun/msv/writer/ContentHandlerAdaptor.java is partially under Public Domain +License: BSD and ASL 1.1 and ASL 2.0 and Public Domain +# Explicit javapackages-tools requires since scripts use +# /usr/share/java-utils/java-functions +Requires: javapackages-tools + +%description msv +%{summary}. + +%package rngconv +Summary: Multi-Schema Validator RNG Converter +# Explicit javapackages-tools requires since scripts use +# /usr/share/java-utils/java-functions +Requires: javapackages-tools + +%description rngconv +%{summary}. + +%package xmlgen +Summary: Multi-Schema Validator Generator +# Explicit javapackages-tools requires since scripts use +# /usr/share/java-utils/java-functions +Requires: javapackages-tools + +%description xmlgen +%{summary}. + +%package xsdlib +Summary: Multi-Schema Validator XML Schema Library + +%description xsdlib +%{summary}. + +%package javadoc +Summary: API documentation for Multi-Schema Validator +License: BSD and ASL 1.1 and ASL 2.0 and Public Domain + +%description javadoc +%{summary}. + +%package manual +Summary: Manual for Multi-Schema Validator +License: BSD + +%description manual +%{summary}. + +%package demo +Summary: Samples for Multi-Schema Validator +License: BSD +Requires: msv-msv +Requires: msv-xsdlib + +%description demo +%{summary}. + +%prep +%setup -q + +# We don't have this plugin +%pom_remove_plugin :buildnumber-maven-plugin + +# javadoc generation fails due to strict doclint in JDK 8 +%pom_remove_plugin :maven-javadoc-plugin + +# Needed becuase of patch3 +%pom_add_dep xml-resolver:xml-resolver + +# ASL 2.0 license text +cp %{SOURCE2} Apache-LICENSE-2.0.txt + +# Delete anything pre-compiled +find -name '*.class' -exec rm -f '{}' \; +find -name '*.jar' -exec rm -f '{}' \; +find -name '*.zip' -exec rm -f '{}' \; + +# Test sources in default package break BND +rm -f testharness/src/*.java + +# 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 +%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" msv + +# remove maven-compiler-plugin configuration that is broken with Java 11 +%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration/pom:source' +%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration/pom:target' + +# 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 + +%mvn_file ":%{name}-core" %{name}-core %{name}-%{name} +%mvn_file ":%{name}-rngconverter" %{name}-rngconverter %{name}-rngconv +%mvn_file ":%{name}-generator" %{name}-generator %{name}-xmlgen +%mvn_file ":xsdlib" xsdlib %{name}-xsdlib + +%mvn_alias ":xsdlib" "com.sun.msv.datatype.xsd:xsdlib" + +%mvn_package ":*::{tests,javadoc,sources}:" __noinstall +%mvn_package ":%{name}{,-testharness}::{}:" __noinstall +%mvn_package ":%{name}{,-core}::{}:" %{name}-msv + +%build +%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 + +%install +%mvn_install + +# Manuals +install -d -m 755 %{buildroot}%{_docdir}/%{name}/msv +install -m 644 msv/doc/*.html %{buildroot}%{_docdir}/%{name}/msv +install -m 644 msv/doc/*.gif %{buildroot}%{_docdir}/%{name}/msv +install -m 644 msv/doc/README.txt %{buildroot}%{_docdir}/%{name}/msv + +install -d -m 755 %{buildroot}%{_docdir}/%{name}/rngconverter +install -m 644 rngconverter/README.txt %{buildroot}%{_docdir}/%{name}/rngconverter + +install -d -m 755 %{buildroot}%{_docdir}/%{name}/generator +install -m 644 generator/*.html %{buildroot}%{_docdir}/%{name}/generator +install -m 644 generator/README.txt %{buildroot}%{_docdir}/%{name}/generator + +install -d -m 755 %{buildroot}%{_docdir}/%{name}/xsdlib +install -m 644 xsdlib/*.html %{buildroot}%{_docdir}/%{name}/xsdlib +install -m 644 xsdlib/README.txt %{buildroot}%{_docdir}/%{name}/xsdlib + +# Examples +install -d -m 755 %{buildroot}%{_datadir}/%{name}/msv +cp -pr msv/examples/* %{buildroot}%{_datadir}/%{name}/msv +install -d -m 755 %{buildroot}%{_datadir}/%{name}/xsdlib +cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/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.writer.relaxng.Driver "" "" msv-rngconv:msv-msv:msv-xsdlib:relaxngDatatype:isorelax:xerces-j2 rngconv true + +%files msv -f .mfiles-msv-msv +%{_bindir}/msv +%doc License.txt +%doc msv/doc/Apache-LICENSE-1.1.txt +%doc Apache-LICENSE-2.0.txt + +%files rngconv -f .mfiles-msv-rngconverter +%{_bindir}/rngconv +%doc msv/doc/Apache-LICENSE-1.1.txt +%doc License.txt + +%files xmlgen -f .mfiles-msv-generator +%{_bindir}/xmlgen +%doc msv/doc/Apache-LICENSE-1.1.txt +%doc License.txt + +%files xsdlib -f .mfiles-xsdlib +%doc msv/doc/Apache-LICENSE-1.1.txt +%doc License.txt + +%files javadoc -f .mfiles-javadoc +%doc License.txt +%doc msv/doc/Apache-LICENSE-1.1.txt +%doc Apache-LICENSE-2.0.txt + +%files manual +%doc %{_docdir}/%{name} +%doc License.txt + +%files demo +%{_datadir}/%{name} + +%changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1:2013.6.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1:2013.6.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1:2013.6.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 18 2020 Fabio Valentini - 1:2013.6.1-18 +- Set javac source and target to 1.8 to fix Java 11 builds. + +* Sat Jul 11 2020 Jiri Vanek - 1:2013.6.1-17 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 1:2013.6.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1:2013.6.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1:2013.6.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 31 2018 Severin Gehwolf - 1:2013.6.1-13 +- Add explicit javapackages-tools requirement since scripts use + java-functions. + +* Fri Jul 13 2018 Fedora Release Engineering - 1:2013.6.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 1:2013.6.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1:2013.6.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1:2013.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1:2013.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Sep 23 2015 Mikolaj Izdebski - 1:2013.6.1-7 +- Remove testharness sources from default package +- Resolves: rhbz#1263628 + +* Wed Jun 17 2015 Fedora Release Engineering - 1:2013.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 14 2015 Mikolaj Izdebski - 1:2013.6.1-5 +- Remove maven-javadoc-plugin execution + +* Sun Sep 14 2014 Gerard Ryan - 1:2013.6.1-4 +- Don't install testharness jar: pulls in ant +- Fix changelog bogus date warning + +* Mon Aug 4 2014 Mikolaj Izdebski - 1:2013.6.1-3 +- Remove unneeded build-requires +- Fix build-requires on jvnet-parent + +* Sat Jun 07 2014 Fedora Release Engineering - 1:2013.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Sep 23 2013 Michal Srb - 1:2013.6.1-1 +- Update to upstream version 2013.6.1 + +* Mon Sep 23 2013 Michal Srb - 1:2013.5.1-7 +- Adapt to current guidelines + +* Wed Aug 07 2013 Michal Srb - 1:2013.5.1-6 +- Unversioned doc dir (Resolves: #993980) +- See: http://fedoraproject.org/wiki/Changes/UnversionedDocdirs + +* Tue Aug 06 2013 Michal Srb - 1:2013.5.1-5 +- Provide net.java.dev.msv:msv (Resolves: #993872) + +* Sat Aug 03 2013 Fedora Release Engineering - 1:2013.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Aug 01 2013 Michal Srb - 1:2013.5.1-3 +- Fix license tag (+Public Domain) +- Add create-tarball.sh to SRPM + +* Wed Jul 31 2013 Michal Srb - 1:2013.5.1-2 +- Do not build module with unclear licensing (relames) +- Replace %%add_to_maven_depmap with %%add_maven_depmap + +* 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 + +* Fri 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 diff --git a/sources b/sources new file mode 100644 index 0000000..b9273c4 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +a1fb4f939e291fe85711551cd7d36e33 msv-2013.6.1-clean.tar.gz +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt From 9348943be31a4b963b24a29bd39aa6563294e907 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 23 Nov 2023 13:48:06 +0100 Subject: [PATCH 05/23] Package unretired Update to upstream version 2022.7 --- .gitignore | 1 + 0001-Disable-Apache-XercesImpl.patch | 24 + create-tarball.sh | 22 - generate-tarball.sh | 29 ++ ...lver-class-from-xml-commons-resolver.patch | 67 --- msv.spec | 456 +++--------------- sources | 3 +- 7 files changed, 114 insertions(+), 488 deletions(-) create mode 100644 0001-Disable-Apache-XercesImpl.patch delete mode 100755 create-tarball.sh create mode 100755 generate-tarball.sh delete mode 100644 msv-Use-CatalogResolver-class-from-xml-commons-resolver.patch diff --git a/.gitignore b/.gitignore index 57795d8..8e39688 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ msv-20050722.tar.gz /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/create-tarball.sh b/create-tarball.sh deleted file mode 100755 index ec77fea..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/ .svn/ - rm -Rf schmit/ shared/ tahiti/ -) - -tar zcf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION} - 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-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 8af7a43..5062646 100644 --- a/msv.spec +++ b/msv.spec @@ -1,430 +1,92 @@ -Name: msv -Epoch: 1 -Version: 2013.6.1 -Release: 21%{?dist} -Summary: Multi-Schema Validator -License: BSD and ASL 1.1 -URL: http://msv.java.net/ +Name: msv +Version: 2022.7 +Release: 1%{?dist} +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 -Source2: http://www.apache.org/licenses/LICENSE-2.0.txt -Source3: create-tarball.sh +Source1: generate-tarball.sh -# Use CatalogResolver from xml-commons-resolver package -Patch1: %{name}-Use-CatalogResolver-class-from-xml-commons-resolver.patch +Patch1: 0001-Disable-Apache-XercesImpl.patch BuildRequires: maven-local -BuildRequires: mvn(isorelax:isorelax) -BuildRequires: mvn(jdom:jdom) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(net.java:jvnet-parent:pom:) -BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) +BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(relaxngDatatype:relaxngDatatype) -BuildRequires: mvn(xerces:xercesImpl) -BuildRequires: mvn(xml-resolver:xml-resolver) - -BuildArch: noarch - -Obsoletes: %{name}-relames < %{version}-%{release} %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 -# src/com/sun/msv/reader/xmlschema/DOMLSInputImpl.java is under ASL 2.0 -# msv/src/com/sun/msv/writer/ContentHandlerAdaptor.java is partially under Public Domain -License: BSD and ASL 1.1 and ASL 2.0 and Public Domain -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Requires: javapackages-tools +%package javadoc +Summary: API documentation for %{name} -%description msv -%{summary}. +%description javadoc +This package provides %{summary}. -%package rngconv -Summary: Multi-Schema Validator RNG Converter -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Requires: javapackages-tools +%package xsdlib +Summary: Java implementation of W3C’s XML Schema Part 2 -%description rngconv -%{summary}. - -%package xmlgen -Summary: Multi-Schema Validator Generator -# Explicit javapackages-tools requires since scripts use -# /usr/share/java-utils/java-functions -Requires: javapackages-tools - -%description xmlgen -%{summary}. - -%package xsdlib -Summary: Multi-Schema Validator XML Schema Library - -%description xsdlib -%{summary}. - -%package javadoc -Summary: API documentation for Multi-Schema Validator -License: BSD and ASL 1.1 and ASL 2.0 and Public Domain - -%description javadoc -%{summary}. - -%package manual -Summary: Manual for Multi-Schema Validator -License: BSD - -%description manual -%{summary}. - -%package demo -Summary: Samples for Multi-Schema Validator -License: BSD -Requires: msv-msv -Requires: msv-xsdlib - -%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 -# We don't have this plugin -%pom_remove_plugin :buildnumber-maven-plugin +# Disable runtime dependency on Apache Xerces +%patch 1 -p1 +rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java -# javadoc generation fails due to strict doclint in JDK 8 -%pom_remove_plugin :maven-javadoc-plugin +%pom_xpath_remove 'pom:project/pom:modules' +%pom_xpath_inject 'pom:project' 'xsdlib' -# Needed becuase of patch3 -%pom_add_dep xml-resolver:xml-resolver +%pom_xpath_remove 'pom:build/pom:extensions' -# ASL 2.0 license text -cp %{SOURCE2} Apache-LICENSE-2.0.txt +%pom_remove_dep org.apache.maven.scm:maven-scm-provider-gitexe +%pom_remove_dep xerces:xercesImpl xsdlib -# Delete anything pre-compiled -find -name '*.class' -exec rm -f '{}' \; -find -name '*.jar' -exec rm -f '{}' \; -find -name '*.zip' -exec rm -f '{}' \; +%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin +%pom_remove_plugin -r :maven-javadoc-plugin -# Test sources in default package break BND -rm -f testharness/src/*.java - -# 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 -%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" msv - -# remove maven-compiler-plugin configuration that is broken with Java 11 -%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration/pom:source' -%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-compiler-plugin"]/pom:configuration/pom:target' - -# 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 - -%mvn_file ":%{name}-core" %{name}-core %{name}-%{name} -%mvn_file ":%{name}-rngconverter" %{name}-rngconverter %{name}-rngconv -%mvn_file ":%{name}-generator" %{name}-generator %{name}-xmlgen -%mvn_file ":xsdlib" xsdlib %{name}-xsdlib - -%mvn_alias ":xsdlib" "com.sun.msv.datatype.xsd:xsdlib" - -%mvn_package ":*::{tests,javadoc,sources}:" __noinstall -%mvn_package ":%{name}{,-testharness}::{}:" __noinstall -%mvn_package ":%{name}{,-core}::{}:" %{name}-msv +# We only build xsdlib +%mvn_package net.java.dev.msv:msv __noinstall %build -%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 +%mvn_build -s %install %mvn_install -# Manuals -install -d -m 755 %{buildroot}%{_docdir}/%{name}/msv -install -m 644 msv/doc/*.html %{buildroot}%{_docdir}/%{name}/msv -install -m 644 msv/doc/*.gif %{buildroot}%{_docdir}/%{name}/msv -install -m 644 msv/doc/README.txt %{buildroot}%{_docdir}/%{name}/msv - -install -d -m 755 %{buildroot}%{_docdir}/%{name}/rngconverter -install -m 644 rngconverter/README.txt %{buildroot}%{_docdir}/%{name}/rngconverter - -install -d -m 755 %{buildroot}%{_docdir}/%{name}/generator -install -m 644 generator/*.html %{buildroot}%{_docdir}/%{name}/generator -install -m 644 generator/README.txt %{buildroot}%{_docdir}/%{name}/generator - -install -d -m 755 %{buildroot}%{_docdir}/%{name}/xsdlib -install -m 644 xsdlib/*.html %{buildroot}%{_docdir}/%{name}/xsdlib -install -m 644 xsdlib/README.txt %{buildroot}%{_docdir}/%{name}/xsdlib - -# Examples -install -d -m 755 %{buildroot}%{_datadir}/%{name}/msv -cp -pr msv/examples/* %{buildroot}%{_datadir}/%{name}/msv -install -d -m 755 %{buildroot}%{_datadir}/%{name}/xsdlib -cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/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.writer.relaxng.Driver "" "" msv-rngconv:msv-msv:msv-xsdlib:relaxngDatatype:isorelax:xerces-j2 rngconv true - -%files msv -f .mfiles-msv-msv -%{_bindir}/msv -%doc License.txt -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc Apache-LICENSE-2.0.txt - -%files rngconv -f .mfiles-msv-rngconverter -%{_bindir}/rngconv -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc License.txt - -%files xmlgen -f .mfiles-msv-generator -%{_bindir}/xmlgen -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc License.txt +%files javadoc -f .mfiles-javadoc +%license Apache-LICENSE-1.1.txt license.txt %files xsdlib -f .mfiles-xsdlib -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc License.txt - -%files javadoc -f .mfiles-javadoc -%doc License.txt -%doc msv/doc/Apache-LICENSE-1.1.txt -%doc Apache-LICENSE-2.0.txt - -%files manual -%doc %{_docdir}/%{name} -%doc License.txt - -%files demo -%{_datadir}/%{name} +%doc README.md README-xsdlib.md +%license Apache-LICENSE-1.1.txt license.txt %changelog -* Thu Jul 22 2021 Fedora Release Engineering - 1:2013.6.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1:2013.6.1-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1:2013.6.1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 18 2020 Fabio Valentini - 1:2013.6.1-18 -- Set javac source and target to 1.8 to fix Java 11 builds. - -* Sat Jul 11 2020 Jiri Vanek - 1:2013.6.1-17 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jan 29 2020 Fedora Release Engineering - 1:2013.6.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1:2013.6.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1:2013.6.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jul 31 2018 Severin Gehwolf - 1:2013.6.1-13 -- Add explicit javapackages-tools requirement since scripts use - java-functions. - -* Fri Jul 13 2018 Fedora Release Engineering - 1:2013.6.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 1:2013.6.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1:2013.6.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1:2013.6.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 1:2013.6.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Sep 23 2015 Mikolaj Izdebski - 1:2013.6.1-7 -- Remove testharness sources from default package -- Resolves: rhbz#1263628 - -* Wed Jun 17 2015 Fedora Release Engineering - 1:2013.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 14 2015 Mikolaj Izdebski - 1:2013.6.1-5 -- Remove maven-javadoc-plugin execution - -* Sun Sep 14 2014 Gerard Ryan - 1:2013.6.1-4 -- Don't install testharness jar: pulls in ant -- Fix changelog bogus date warning - -* Mon Aug 4 2014 Mikolaj Izdebski - 1:2013.6.1-3 -- Remove unneeded build-requires -- Fix build-requires on jvnet-parent - -* Sat Jun 07 2014 Fedora Release Engineering - 1:2013.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Sep 23 2013 Michal Srb - 1:2013.6.1-1 -- Update to upstream version 2013.6.1 - -* Mon Sep 23 2013 Michal Srb - 1:2013.5.1-7 -- Adapt to current guidelines - -* Wed Aug 07 2013 Michal Srb - 1:2013.5.1-6 -- Unversioned doc dir (Resolves: #993980) -- See: http://fedoraproject.org/wiki/Changes/UnversionedDocdirs - -* Tue Aug 06 2013 Michal Srb - 1:2013.5.1-5 -- Provide net.java.dev.msv:msv (Resolves: #993872) - -* Sat Aug 03 2013 Fedora Release Engineering - 1:2013.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Aug 01 2013 Michal Srb - 1:2013.5.1-3 -- Fix license tag (+Public Domain) -- Add create-tarball.sh to SRPM - -* Wed Jul 31 2013 Michal Srb - 1:2013.5.1-2 -- Do not build module with unclear licensing (relames) -- Replace %%add_to_maven_depmap with %%add_maven_depmap - -* 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 - -* Fri 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 +* Mon Aug 07 2023 Marian Koncek - 2022.7-1 +- Package unretired +- Update to upstream version 2022.7 diff --git a/sources b/sources index b9273c4..386f1d9 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a1fb4f939e291fe85711551cd7d36e33 msv-2013.6.1-clean.tar.gz -3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +SHA512 (msv-2022.7.tar.gz) = 1fb7600af4a589bb68687b17fd7da3bd370362e06450d81509eb343f87a85366d3843f2b42f566560637428fdc8dc4abbd2eb5bc81444ab58ebf48c16d4d353e From 791855ccccfeda106228411b7f8e707cffeca506 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 5 Dec 2023 15:54:02 +0100 Subject: [PATCH 06/23] Add javapackages test plan --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf 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/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/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/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..a2cdaba --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f40 +execute: + how: tmt From af6b90803d903d781f9524f035f80cc648a47005 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:50:58 +0000 Subject: [PATCH 07/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 5062646..a4ac93a 100644 --- a/msv.spec +++ b/msv.spec @@ -1,6 +1,6 @@ Name: msv Version: 2022.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multi-Schema Validator Toolkit # License breakdown # Apache-1.1 @@ -87,6 +87,9 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %license Apache-LICENSE-1.1.txt license.txt %changelog +* 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 From 69ac32591fb7f37601029d71336e9d044da396ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:17:13 +0000 Subject: [PATCH 08/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index a4ac93a..576257b 100644 --- a/msv.spec +++ b/msv.spec @@ -1,6 +1,6 @@ Name: msv Version: 2022.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multi-Schema Validator Toolkit # License breakdown # Apache-1.1 @@ -87,6 +87,9 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %license Apache-LICENSE-1.1.txt license.txt %changelog +* 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 From ec8da848db276dac3f94b04f0729b54145819e5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:51:59 +0000 Subject: [PATCH 09/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 576257b..300078e 100644 --- a/msv.spec +++ b/msv.spec @@ -1,6 +1,6 @@ Name: msv Version: 2022.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multi-Schema Validator Toolkit # License breakdown # Apache-1.1 @@ -87,6 +87,9 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %license Apache-LICENSE-1.1.txt license.txt %changelog +* 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 From 4ee585fe1dbfe865a0ee6198edbf18ae2b6c7062 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:30 +0200 Subject: [PATCH 10/23] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 81c96ec0f4fc21e38876a1e4f516e5cdc0f7911b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:57 +0200 Subject: [PATCH 11/23] Switch from %setup to %autosetup --- msv.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/msv.spec b/msv.spec index 300078e..b105dec 100644 --- a/msv.spec +++ b/msv.spec @@ -53,10 +53,9 @@ 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 # Disable runtime dependency on Apache Xerces -%patch 1 -p1 rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %pom_xpath_remove 'pom:project/pom:modules' From c99471e4b81561bd88c7f96e7e868d9b2abc1286 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:19 +0200 Subject: [PATCH 12/23] Switch to non-numdered patches --- msv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index b105dec..da689e1 100644 --- a/msv.spec +++ b/msv.spec @@ -23,7 +23,7 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh -Patch1: 0001-Disable-Apache-XercesImpl.patch +Patch: 0001-Disable-Apache-XercesImpl.patch BuildRequires: maven-local BuildRequires: mvn(junit:junit) From 97d9c929acb0acc7535a79694b48a605d5b86981 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:15 +0200 Subject: [PATCH 13/23] Convert to %autorelease and %autochangelog --- changelog | 12 ++++++++++++ msv.spec | 15 ++------------- 2 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 changelog 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/msv.spec b/msv.spec index da689e1..1b99212 100644 --- a/msv.spec +++ b/msv.spec @@ -1,6 +1,6 @@ Name: msv Version: 2022.7 -Release: 4%{?dist} +Release: %autorelease Summary: Multi-Schema Validator Toolkit # License breakdown # Apache-1.1 @@ -86,15 +86,4 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %license Apache-LICENSE-1.1.txt license.txt %changelog -* 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 +%autochangelog From 02ee52996f5ab86d21128a4b712aa633597248a2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 14/23] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 3cdfaa1cd9f665c361061127dd50fdac529683be Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:19 +0100 Subject: [PATCH 15/23] Unify spec style with the rest of Java/Maven packages [skip changelog] --- msv.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/msv.spec b/msv.spec index 1b99212..ba8be1b 100644 --- a/msv.spec +++ b/msv.spec @@ -20,7 +20,6 @@ ExclusiveArch: %{java_arches} noarch # ./generate-tarball.sh Source0: %{name}-%{version}.tar.gz - Source1: generate-tarball.sh Patch: 0001-Disable-Apache-XercesImpl.patch @@ -39,16 +38,16 @@ 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 javadoc +%package javadoc Summary: API documentation for %{name} -%description javadoc +%description javadoc This package provides %{summary}. -%package xsdlib +%package xsdlib Summary: Java implementation of W3C’s XML Schema Part 2 -%description xsdlib +%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. From 659e398304a4404361207233ecb89a7d7b436268 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 16/23] Update javadoc package description [skip changelog] --- msv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index ba8be1b..b06ea8e 100644 --- a/msv.spec +++ b/msv.spec @@ -42,7 +42,7 @@ subset of XML Schema Part 1. Summary: API documentation for %{name} %description javadoc -This package provides %{summary}. +API documentation for %{name}. %package xsdlib Summary: Java implementation of W3C’s XML Schema Part 2 From a426cc605147cb7fd739dd7d3a0414647d32c606 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:21:10 +0000 Subject: [PATCH 17/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9154eadca92d90998276a96be725f284433c9f88 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 18/23] Remove javadoc subpackage --- msv.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/msv.spec b/msv.spec index b06ea8e..f1ce7d0 100644 --- a/msv.spec +++ b/msv.spec @@ -30,6 +30,8 @@ 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 Multi Schema Validation toolkit is a Java based toolkit consisting of 8 @@ -38,12 +40,6 @@ 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 javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %package xsdlib Summary: Java implementation of W3C’s XML Schema Part 2 @@ -72,14 +68,11 @@ rm xsdlib/src/main/java/com/sun/msv/datatype/xsd/regex/XercesImpl.java %mvn_package net.java.dev.msv:msv __noinstall %build -%mvn_build -s +%mvn_build -j -s %install %mvn_install -%files javadoc -f .mfiles-javadoc -%license Apache-LICENSE-1.1.txt license.txt - %files xsdlib -f .mfiles-xsdlib %doc README.md README-xsdlib.md %license Apache-LICENSE-1.1.txt license.txt From f688858bda0728d7b1d257516d9e5c885dad872f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 19/23] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 3eba56b68fa3c1f4f2b7d8959303450fa8c54aaf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:32 +0200 Subject: [PATCH 20/23] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 464c0242e83d7d448485bf2f12518b63b0626711 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:52 +0200 Subject: [PATCH 21/23] Build with OpenJDK 25 --- msv.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index f1ce7d0..ff1ec35 100644 --- a/msv.spec +++ b/msv.spec @@ -24,7 +24,7 @@ Source1: generate-tarball.sh Patch: 0001-Disable-Apache-XercesImpl.patch -BuildRequires: maven-local +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) From cb41d9294e904ae809f58f6d86edce3f24f029d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:28:00 +0000 Subject: [PATCH 22/23] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 27822741e3e8cf8e876f4915b315268a1d00d792 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:47:05 +0200 Subject: [PATCH 23/23] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that.