From 946c1d558e268a9664ab7409f9ec11a4d98e08a5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 04:33:53 -0600 Subject: [PATCH 01/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 630bd21..394bb12 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2009.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD @@ -329,6 +329,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %changelog +* 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. From a26a9f81e095542ad6015d348ba1e115e05a48d3 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 6 Apr 2012 17:19:00 +0300 Subject: [PATCH 02/58] Drop unneeded BR/R. --- msv.spec | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/msv.spec b/msv.spec index 394bb12..a37a613 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2009.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD @@ -40,9 +40,7 @@ BuildRequires: relaxngDatatype BuildRequires: relaxngDatatype-javadoc BuildRequires: xalan-j2 BuildRequires: xerces-j2 -BuildRequires: xml-commons-apis -BuildRequires: xml-commons-resolver >= 0:1.2-4 -BuildRequires: junit4 +BuildRequires: junit BuildArch: noarch @@ -61,8 +59,6 @@ Requires: java Requires: isorelax Requires: relaxngDatatype Requires: xerces-j2 -Requires: xml-commons-apis -Requires: xml-commons-resolver >= 0:1.2-4 Requires: msv-xsdlib %description msv @@ -77,8 +73,6 @@ Requires: isorelax Requires: relaxngDatatype Requires: xalan-j2 Requires: xerces-j2 -Requires: xml-commons-apis -Requires: xml-commons-resolver >= 0:1.2-4 Requires: msv-msv Requires: msv-xsdlib @@ -93,8 +87,6 @@ Requires: java Requires: isorelax Requires: relaxngDatatype Requires: xerces-j2 -Requires: xml-commons-apis -Requires: xml-commons-resolver >= 0:1.2-4 Requires: msv-msv Requires: msv-xsdlib @@ -109,8 +101,6 @@ Requires: java Requires: isorelax Requires: relaxngDatatype Requires: xerces-j2 -Requires: xml-commons-apis -Requires: xml-commons-resolver >= 0:1.2-4 Requires: msv-msv Requires: msv-xsdlib @@ -329,6 +319,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %changelog +* 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 From c47603b00639e721307bc777a2fcebbf42e23866 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 22:11:44 -0500 Subject: [PATCH 03/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index a37a613..0bee230 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2009.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD @@ -319,6 +319,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %changelog +* 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. From 195f8f4fd23d09a338920508507daf5ff3b98349 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 01:40:26 -0600 Subject: [PATCH 04/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 0bee230..d9411db 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2009.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD @@ -319,6 +319,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %changelog +* 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 From 6e443149d085dd0c2e4ac85231d6e00bf49ca92e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 25 Feb 2013 16:56:45 +0100 Subject: [PATCH 05/58] Add missing BR: maven-local --- msv.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index d9411db..ea9acb7 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2009.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD @@ -25,6 +25,7 @@ Patch2: %{name}-link-local-javadoc.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 @@ -319,6 +320,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %changelog +* 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 From 551b18c982d1b316ae3bfc947cff317fe6149ee2 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 12 Apr 2013 11:03:58 +0200 Subject: [PATCH 06/58] Update to upstream version 2013.2.3 - Resolves: rhbz#876845 --- .gitignore | 2 + ...crimson.patch => msv-Disable-crimson.patch | 29 ++++++-- ...lver-class-from-xml-commons-resolver.patch | 67 +++++++++++++++++ msv.spec | 74 ++++++++++++------- sources | 3 +- 5 files changed, 141 insertions(+), 34 deletions(-) rename msv-disable-crimson.patch => msv-Disable-crimson.patch (58%) create mode 100644 msv-Use-CatalogResolver-class-from-xml-commons-resolver.patch diff --git a/.gitignore b/.gitignore index 62e22f4..0079820 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ msv-20050722.tar.gz /msv-2009.1.tar.gz +/msv-2013.2.3.tar.gz +/msv-parent-2009.1.pom diff --git a/msv-disable-crimson.patch b/msv-Disable-crimson.patch similarity index 58% rename from msv-disable-crimson.patch rename to msv-Disable-crimson.patch index 586fdef..81038ee 100644 --- a/msv-disable-crimson.patch +++ b/msv-Disable-crimson.patch @@ -1,5 +1,17 @@ ---- relames/pom.xml.orig 2009-03-14 16:03:30.000000000 +0000 -+++ relames/pom.xml 2010-09-18 13:55:25.927247417 +0100 +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 @@ -15,7 +27,7 @@ ../parent/pom.xml -@@ -88,10 +88,6 @@ +@@ -71,10 +71,6 @@ isorelax @@ -26,9 +38,11 @@ relaxngDatatype relaxngDatatype ---- relames/src/com/sun/msv/schematron/verifier/RelmesVerifier.java.orig 2010-09-18 14:01:07.461250681 +0100 -+++ relames/src/com/sun/msv/schematron/verifier/RelmesVerifier.java 2010-09-18 14:01:18.194245268 +0100 -@@ -88,13 +88,6 @@ +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. } @@ -42,3 +56,6 @@ } } } +-- +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 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 index ea9acb7..b636a90 100644 --- a/msv.spec +++ b/msv.spec @@ -1,26 +1,26 @@ Name: msv Epoch: 1 -Version: 2009.1 -Release: 14%{?dist} +Version: 2013.2.3 +Release: 1%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries -License: BSD -URL: https://msv.dev.java.net/ +License: BSD and ASL 1.1 +URL: http://msv.java.net/ # To generate tarball from upstream source control: -# $ svn export https://msv.dev.java.net/svn/msv/tags/msv-2009.1/ --username guest -# $ tar zcf msv-2009.1.tar.gz msv-2009.1 +# $ svn co https://svn.java.net/svn/msv~svn/tags/msv-2013.2.3/ msv-2013.2.3 +# $ tar zcf msv-2013.2.3.tar.gz msv-2013.2.3 Source0: %{name}-%{version}.tar.gz -# The "maven-wagon-svn" plug-in is not in Fedora -Patch0: %{name}-disable-maven-wagon-svn.patch +# 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 # There is a build time dependency on crimson which needs to be stripped # (We're using xerces-j2 instead) -Patch1: %{name}-disable-crimson.patch +Patch0: %{name}-Disable-crimson.patch -# Link to locally installed javadocs -Patch2: %{name}-link-local-javadoc.patch +# Use CatalogResolver from xml-commons-resolver package +Patch1: %{name}-Use-CatalogResolver-class-from-xml-commons-resolver.patch BuildRequires: java-devel BuildRequires: java-javadoc @@ -42,6 +42,8 @@ BuildRequires: relaxngDatatype-javadoc BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: junit +BuildRequires: jvnet-parent +BuildRequires: xml-commons-resolver BuildArch: noarch @@ -161,6 +163,17 @@ Requires: jpackage-utils %prep %setup -q +# We don't have this plugin +%pom_remove_plugin :buildnumber-maven-plugin + +# Needed becuase of patch3 +%pom_add_dep xml-resolver:xml-resolver + +# Enable relames module +%pom_xpath_inject "pom:modules" "relames" + +cp %{SOURCE1} parent-pom.xml + # Delete anything pre-compiled find -name '*.class' -exec rm -f '{}' \; find -name '*.jar' -exec rm -f '{}' \; @@ -172,9 +185,8 @@ for m in $(find . -name MANIFEST.MF) ; do done # Apply patches -%patch0 -p0 -b .orig -%patch1 -p0 -b .orig -%patch2 -p0 -b .orig2 +%patch0 -p1 +%patch1 -p1 # Change encoding of non utf-8 files for m in $(find . -name copyright.txt) ; do @@ -189,7 +201,7 @@ mvn-rpmbuild install javadoc:aggregate # Jars install -pD -T msv/target/%{name}-core-%{version}.jar \ %{buildroot}%{_javadir}/%{name}-core.jar -install -pD -T relames/target/%{name}-relames-%{version}.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 @@ -212,7 +224,7 @@ ln -s 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 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 @@ -244,15 +256,15 @@ install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/relames install -m 644 relames/doc/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/relames install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/rngconverter -install -m 644 rngconverter/doc/README.txt %{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/doc/*.html %{buildroot}%{_docdir}/%{name}-%{version}/generator -install -m 644 generator/doc/README.txt %{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/doc/*.html %{buildroot}%{_docdir}/%{name}-%{version}/xsdlib -install -m 644 xsdlib/doc/README.txt %{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 @@ -274,35 +286,38 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_javadir}/%{name}-msv.jar %{_javadir}/%{name}-testharness* %doc msv/doc/license.txt +%doc msv/doc/Apache-LICENSE-1.1.txt %files relames %{_bindir}/relames %{_mavenpomdir}/JPP-%{name}-relames.pom %{_javadir}/%{name}-relames.jar %doc relames/doc/copyright.txt +%doc relames/doc/Apache-LICENSE-1.1.txt +%doc relames/License.txt %files rngconv %{_bindir}/rngconv %{_mavenpomdir}/JPP-%{name}-rngconverter.pom %{_javadir}/%{name}-rngconverter.jar %{_javadir}/%{name}-rngconv.jar -%doc rngconverter/doc/license.txt -%doc rngconverter/doc/copyright.txt +%doc rngconverter/License.txt +%doc rngconverter/Apache-LICENSE-1.1.txt %files xmlgen %{_bindir}/xmlgen %{_mavenpomdir}/JPP-%{name}-generator.pom %{_javadir}/%{name}-generator.jar %{_javadir}/%{name}-xmlgen.jar -%doc generator/doc/license.txt -%doc generator/doc/copyright.txt +%doc generator/License.txt +%doc generator/Apache-LICENSE-1.1.txt %files xsdlib %{_mavenpomdir}/JPP-xsdlib.pom %{_javadir}/xsdlib.jar %{_javadir}/%{name}-xsdlib.jar -%doc xsdlib/doc/license.txt -%doc xsdlib/doc/copyright.txt +%doc xsdlib/License.txt +%doc xsdlib/Apache-LICENSE-1.1.txt # This subpackage wins the parent poms and the depmap because all the other # subpackages require this one @@ -320,6 +335,11 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %changelog +* 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 diff --git a/sources b/sources index f28afa5..915de74 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -95f8ef46fe810aaa6860d916aeff3cac msv-2009.1.tar.gz +5ed67eceadc92bc27499fcf173bfd60d msv-2013.2.3.tar.gz +23e80cb265daeed7dd357b4e891ba096 msv-parent-2009.1.pom From 450e67e7926819bdd4d11b672a565a3da44d2622 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 12 Apr 2013 13:50:07 +0200 Subject: [PATCH 07/58] Fix license tag for msv subpackage - Remove unneeded patches --- msv-disable-maven-wagon-svn.patch | 24 ------------------------ msv-link-local-javadoc.patch | 14 -------------- msv.spec | 14 +++++++++++++- 3 files changed, 13 insertions(+), 39 deletions(-) delete mode 100644 msv-disable-maven-wagon-svn.patch delete mode 100644 msv-link-local-javadoc.patch diff --git a/msv-disable-maven-wagon-svn.patch b/msv-disable-maven-wagon-svn.patch deleted file mode 100644 index 2c27cf7..0000000 --- a/msv-disable-maven-wagon-svn.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- pom.xml.orig 2009-06-10 19:33:50.000000000 +0100 -+++ pom.xml 2010-09-18 13:16:55.901247026 +0100 -@@ -62,6 +62,7 @@ - msv - generator - rngconverter -+ relames - - - -@@ -188,13 +189,6 @@ - - - -- -- -- org.jvnet.wagon-svn -- wagon-svn -- 1.8 -- -- - - - diff --git a/msv-link-local-javadoc.patch b/msv-link-local-javadoc.patch deleted file mode 100644 index 2f896cb..0000000 --- a/msv-link-local-javadoc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- pom.xml.orig2 2010-09-19 17:34:07.530248002 +0100 -+++ pom.xml 2010-09-19 17:41:12.377247570 +0100 -@@ -139,6 +139,11 @@ - MSV - 1.5 - UTF-8 -+ -+ /usr/share/javadoc/java/ -+ /usr/share/javadoc/isorelax/ -+ /usr/share/javadoc/relaxngDatatype/ -+ - - - diff --git a/msv.spec b/msv.spec index b636a90..90c617b 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD and ASL 1.1 @@ -15,6 +15,8 @@ Source0: %{name}-%{version}.tar.gz # 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 +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 @@ -57,6 +59,8 @@ conformance to RELAX NG/W3C XML standards and JAXP masquerading. %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 @@ -174,6 +178,9 @@ Requires: jpackage-utils cp %{SOURCE1} parent-pom.xml +# 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 '{}' \; @@ -287,6 +294,7 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_javadir}/%{name}-testharness* %doc msv/doc/license.txt %doc msv/doc/Apache-LICENSE-1.1.txt +%doc Apache-LICENSE-2.0.txt %files relames %{_bindir}/relames @@ -335,6 +343,10 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %changelog +* 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 From b6bc597d9b6e54b5e6b0eedebce42d46e72a644f Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 12 Apr 2013 13:57:27 +0200 Subject: [PATCH 08/58] Add LICENSE-2.0.txt to sources --- .gitignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 0079820..f8ec58f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ msv-20050722.tar.gz /msv-2009.1.tar.gz /msv-2013.2.3.tar.gz /msv-parent-2009.1.pom +/LICENSE-2.0.txt diff --git a/sources b/sources index 915de74..db3c1bf 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 5ed67eceadc92bc27499fcf173bfd60d msv-2013.2.3.tar.gz 23e80cb265daeed7dd357b4e891ba096 msv-parent-2009.1.pom +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt From 865178d5759bc21f4b0a339c357a6e899c482c70 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 12 Apr 2013 14:44:48 +0200 Subject: [PATCH 09/58] Fix license tags in javadoc, manual, demo subpackages --- msv.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 90c617b..d963cd8 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD and ASL 1.1 @@ -132,6 +132,7 @@ Obsoletes: xsdlib < %{version}-%{release} %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 @@ -150,6 +151,7 @@ Obsoletes: xsdlib-javadoc < %{version}-%{release} %package manual Summary: Manual for Multi-Schema Validator Group: Documentation +License: BSD %description manual %{summary}. @@ -157,6 +159,7 @@ Group: Documentation %package demo Summary: Samples for Multi-Schema Validator Group: Documentation +License: BSD Requires: msv-msv Requires: msv-xsdlib Requires: jpackage-utils @@ -335,14 +338,21 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %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} %changelog +* 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 From 9e8ab11ee1e2ab328956063612bc148b59723220 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 10 Jun 2013 10:03:04 +0200 Subject: [PATCH 10/58] Update to latest upstream version 2013.5.1 - Clean up tarball - Fix BR/R --- .gitignore | 1 + create-tarball.sh | 22 +++++++++++++++++++ msv.spec | 55 +++++++++++++++++++++++------------------------ sources | 2 +- 4 files changed, 51 insertions(+), 29 deletions(-) create mode 100755 create-tarball.sh diff --git a/.gitignore b/.gitignore index f8ec58f..fe8884b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ msv-20050722.tar.gz /msv-2013.2.3.tar.gz /msv-parent-2009.1.pom /LICENSE-2.0.txt +/msv-2013.5.1-clean.tar.gz diff --git a/create-tarball.sh b/create-tarball.sh new file mode 100755 index 0000000..dc14981 --- /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/doc/ relames/schemas + rm -Rf schmit/ shared/ tahiti/ +) + +tar zcf ${NAME}-${VERSION}-clean.tar.gz ${NAME}-${VERSION} + diff --git a/msv.spec b/msv.spec index d963cd8..c4c267b 100644 --- a/msv.spec +++ b/msv.spec @@ -1,16 +1,15 @@ Name: msv Epoch: 1 -Version: 2013.2.3 -Release: 3%{?dist} +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/ # To generate tarball from upstream source control: -# $ svn co https://svn.java.net/svn/msv~svn/tags/msv-2013.2.3/ msv-2013.2.3 -# $ tar zcf msv-2013.2.3.tar.gz msv-2013.2.3 -Source0: %{name}-%{version}.tar.gz +# $ ./create-tarball +Source0: %{name}-%{version}-clean.tar.gz # 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 @@ -46,6 +45,7 @@ BuildRequires: xerces-j2 BuildRequires: junit BuildRequires: jvnet-parent BuildRequires: xml-commons-resolver +BuildRequires: isorelax BuildArch: noarch @@ -123,9 +123,6 @@ Requires: isorelax Requires: relaxngDatatype Requires: xerces-j2 -# Can remove these obsoletes at Fedora 17 time -Obsoletes: xsdlib < %{version}-%{release} - %description xsdlib %{summary}. @@ -138,13 +135,6 @@ Requires: jpackage-utils Requires: isorelax-javadoc Requires: relaxngDatatype-javadoc -# Can remove these obsoletes at Fedora 17 time -Obsoletes: msv-msv-javadoc < %{version}-%{release} -Obsoletes: msv-relames-javadoc < %{version}-%{release} -Obsoletes: msv-xmlgen-javadoc < %{version}-%{release} -Obsoletes: msv-xsdlib-javadoc < %{version}-%{release} -Obsoletes: xsdlib-javadoc < %{version}-%{release} - %description javadoc %{summary}. @@ -198,6 +188,14 @@ done %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 @@ -262,9 +260,6 @@ 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}/relames -install -m 644 relames/doc/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/relames - install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}/rngconverter install -m 644 rngconverter/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/rngconverter @@ -295,7 +290,7 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_javadir}/%{name}-core.jar %{_javadir}/%{name}-msv.jar %{_javadir}/%{name}-testharness* -%doc msv/doc/license.txt +%doc License.txt %doc msv/doc/Apache-LICENSE-1.1.txt %doc Apache-LICENSE-2.0.txt @@ -303,32 +298,31 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_bindir}/relames %{_mavenpomdir}/JPP-%{name}-relames.pom %{_javadir}/%{name}-relames.jar -%doc relames/doc/copyright.txt -%doc relames/doc/Apache-LICENSE-1.1.txt -%doc relames/License.txt +%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 rngconverter/License.txt -%doc rngconverter/Apache-LICENSE-1.1.txt +%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 generator/License.txt -%doc generator/Apache-LICENSE-1.1.txt +%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 xsdlib/License.txt -%doc xsdlib/Apache-LICENSE-1.1.txt +%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 @@ -350,6 +344,11 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %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 diff --git a/sources b/sources index db3c1bf..e6be564 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -5ed67eceadc92bc27499fcf173bfd60d msv-2013.2.3.tar.gz 23e80cb265daeed7dd357b4e891ba096 msv-parent-2009.1.pom 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt +a71d70c8e2b038474de84049d9203b59 msv-2013.5.1-clean.tar.gz From 5b9be8752d4d32886c4d0daa5b6fe83dcc0eccd7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 07:07:44 -0500 Subject: [PATCH 11/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index c4c267b..031d3de 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD and ASL 1.1 @@ -344,6 +344,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 1:2013.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Jun 07 2013 Michal Srb - 1:2013.5.1-1 - Update to latest upstream version 2013.5.1 - Clean up tarball From ec22f517f8eb675e2c4f9bba375a14a1ae1b3469 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 6 Aug 2013 10:23:27 +0200 Subject: [PATCH 12/58] Do not build module with unclear licensing (relames) - Replace %add_to_maven_depmap with %add_maven_depmap --- create-tarball.sh | 2 +- msv-Disable-crimson.patch | 61 --------------------------------------- msv.spec | 60 +++++++++----------------------------- sources | 2 +- 4 files changed, 16 insertions(+), 109 deletions(-) delete mode 100644 msv-Disable-crimson.patch diff --git a/create-tarball.sh b/create-tarball.sh index dc14981..ec77fea 100755 --- a/create-tarball.sh +++ b/create-tarball.sh @@ -14,7 +14,7 @@ svn co https://svn.java.net/svn/${NAME}~svn/tags/${NAME}-${VERSION}/ ${NAME}-${V # Remove things that we don't need ( cd ${NAME}-${VERSION} - rm -Rf www/ relames/doc/ relames/schemas + rm -Rf www/ relames/ .svn/ rm -Rf schmit/ shared/ tahiti/ ) 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.spec b/msv.spec index c4c267b..780385b 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD and ASL 1.1 @@ -16,10 +16,6 @@ Source1: http://repo1.maven.org/maven2/net/java/dev/%{name}/%{name}-parent 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 @@ -49,6 +45,8 @@ BuildRequires: isorelax 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, @@ -71,21 +69,6 @@ Requires: msv-xsdlib %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 @@ -166,9 +149,6 @@ Requires: jpackage-utils # Needed becuase of patch3 %pom_add_dep xml-resolver:xml-resolver -# Enable relames module -%pom_xpath_inject "pom:modules" "relames" - cp %{SOURCE1} parent-pom.xml # ASL 2.0 license text @@ -185,14 +165,12 @@ for m in $(find . -name MANIFEST.MF) ; do 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 @@ -209,8 +187,6 @@ mvn-rpmbuild install javadoc:aggregate # 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 \ @@ -234,21 +210,17 @@ ln -s xsdlib.jar \ 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 +%add_maven_depmap JPP-%{name}.pom %{name}.jar +%add_maven_depmap JPP-%{name}-parent.pom +%add_maven_depmap JPP-%{name}-core.pom %{name}-core.jar -a "msv:msv" +%add_maven_depmap JPP-%{name}-rngconverter.pom %{name}-rngconverter.jar +%add_maven_depmap JPP-%{name}-generator.pom %{name}-generator.jar +%add_maven_depmap JPP-%{name}-testharness.pom %{name}-testharness.jar +%add_maven_depmap JPP-xsdlib.pom xsdlib.jar -a "com.sun.msv.datatype.xsd:xsdlib" # Javadocs install -d -m 755 %{buildroot}%{_javadocdir}/%{name} @@ -280,7 +252,6 @@ 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 @@ -294,13 +265,6 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %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 @@ -344,6 +308,10 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %changelog +* 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 diff --git a/sources b/sources index e6be564..3d0befc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 23e80cb265daeed7dd357b4e891ba096 msv-parent-2009.1.pom 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt -a71d70c8e2b038474de84049d9203b59 msv-2013.5.1-clean.tar.gz +9a6a831c3e03c9f7872a656930e820c2 msv-2013.5.1-clean.tar.gz From 1aac9f04e0ed2a03bd799687860a156bff7dcb35 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 6 Aug 2013 10:25:00 +0200 Subject: [PATCH 13/58] Fix license tag (+Public Domain) - Add create-tarball.sh to SRPM --- msv.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/msv.spec b/msv.spec index 780385b..bb43242 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD and ASL 1.1 @@ -15,6 +15,7 @@ Source0: %{name}-%{version}-clean.tar.gz Source1: http://repo1.maven.org/maven2/net/java/dev/%{name}/%{name}-parent/2009.1/%{name}-parent-2009.1.pom 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 @@ -58,7 +59,8 @@ conformance to RELAX NG/W3C XML standards and JAXP masquerading. 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 +# 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 Requires: jpackage-utils Requires: java Requires: isorelax @@ -112,7 +114,7 @@ Requires: xerces-j2 %package javadoc Summary: API documentation for Multi-Schema Validator Group: Documentation -License: BSD and ASL 1.1 and ASL 2.0 +License: BSD and ASL 1.1 and ASL 2.0 and Public Domain Requires: java-javadoc Requires: jpackage-utils Requires: isorelax-javadoc @@ -308,6 +310,10 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %changelog +* 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 From dffdf3ca230d16f0a94dd01ee200f9039d2a7fb7 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 6 Aug 2013 15:27:27 +0200 Subject: [PATCH 14/58] Provide net.java.dev.msv:msv (Resolves: #993872) --- msv.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 6d54756..0c65fdc 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD and ASL 1.1 @@ -216,6 +216,7 @@ install -pD -T -m 644 rngconverter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-r 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_maven_depmap JPP-%{name}.pom %add_maven_depmap JPP-%{name}-parent.pom %add_maven_depmap JPP-%{name}-core.pom %{name}-core.jar -a "msv:msv" %add_maven_depmap JPP-%{name}-rngconverter.pom %{name}-rngconverter.jar @@ -309,6 +310,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %{_datadir}/%{name}-%{version} %changelog +* 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 From 065dddc0edbf308c4355b676eafd32b84bf4043f Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 7 Aug 2013 08:02:20 +0200 Subject: [PATCH 15/58] Unversioned doc dir (Resolves: #993980) - See: http://fedoraproject.org/wiki/Changes/UnversionedDocdirs --- msv.spec | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/msv.spec b/msv.spec index 0c65fdc..957040a 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.5.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multi-Schema Validator Group: Development/Libraries License: BSD and ASL 1.1 @@ -229,21 +229,21 @@ 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}/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}-%{version}/rngconverter -install -m 644 rngconverter/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/rngconverter +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}-%{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}/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}-%{version}/xsdlib -install -m 644 xsdlib/*.html %{buildroot}%{_docdir}/%{name}-%{version}/xsdlib -install -m 644 xsdlib/README.txt %{buildroot}%{_docdir}/%{name}-%{version}/xsdlib +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}-%{version}/msv @@ -303,13 +303,17 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %doc Apache-LICENSE-2.0.txt %files manual -%doc %{_docdir}/%{name}-%{version} +%doc %{_docdir}/%{name} %doc License.txt %files demo %{_datadir}/%{name}-%{version} %changelog +* 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) From 306462c004c6bf34ed95fda406c44d07a42c130c Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 23 Sep 2013 15:57:55 +0200 Subject: [PATCH 16/58] Adapt to current guidelines --- msv.spec | 136 ++++++++++++------------------------------------------- 1 file changed, 28 insertions(+), 108 deletions(-) diff --git a/msv.spec b/msv.spec index 957040a..b07c539 100644 --- a/msv.spec +++ b/msv.spec @@ -1,9 +1,8 @@ Name: msv Epoch: 1 Version: 2013.5.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multi-Schema Validator -Group: Development/Libraries License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -57,75 +56,40 @@ conformance to RELAX NG/W3C XML standards and JAXP masquerading. %package msv Summary: Multi-Schema Validator Core -Group: Development/Libraries # 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 -Requires: jpackage-utils -Requires: java -Requires: isorelax -Requires: relaxngDatatype -Requires: xerces-j2 -Requires: msv-xsdlib %description msv %{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 and Public Domain -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 @@ -133,11 +97,9 @@ License: BSD %package demo Summary: Samples for Multi-Schema Validator -Group: Documentation License: BSD Requires: msv-msv Requires: msv-xsdlib -Requires: jpackage-utils %description demo %{summary}. @@ -182,51 +144,25 @@ for m in $(find . -name copyright.txt) ; do 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}{,-core,-testharness}::{}:" %{name}-msv + %build -mvn-rpmbuild install javadoc:aggregate +%mvn_build -s %install -# Jars -install -pD -T msv/target/%{name}-core-%{version}.jar \ - %{buildroot}%{_javadir}/%{name}-core.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 +# parent 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 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_maven_depmap JPP-%{name}.pom %add_maven_depmap JPP-%{name}-parent.pom -%add_maven_depmap JPP-%{name}-core.pom %{name}-core.jar -a "msv:msv" -%add_maven_depmap JPP-%{name}-rngconverter.pom %{name}-rngconverter.jar -%add_maven_depmap JPP-%{name}-generator.pom %{name}-generator.jar -%add_maven_depmap JPP-%{name}-testharness.pom %{name}-testharness.jar -%add_maven_depmap JPP-xsdlib.pom xsdlib.jar -a "com.sun.msv.datatype.xsd: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}/msv @@ -246,58 +182,39 @@ 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}-%{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 +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 +%files msv -f .mfiles-msv-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 rngconv +%files rngconv -f .mfiles-msv-rngconverter %{_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 +%files xmlgen -f .mfiles-msv-generator %{_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 +%files xsdlib -f .mfiles-xsdlib %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}/* +%{_mavendepmapfragdir}/msv -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc License.txt %doc msv/doc/Apache-LICENSE-1.1.txt %doc Apache-LICENSE-2.0.txt @@ -307,9 +224,12 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}-%{version}/xsdlib %doc License.txt %files demo -%{_datadir}/%{name}-%{version} +%{_datadir}/%{name} %changelog +* 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 From e34297db5b6def916b41fd5c9d8aa59d2b70446e Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 25 Sep 2013 15:03:38 +0200 Subject: [PATCH 17/58] Update to upstream version 2013.6.1 --- .gitignore | 1 + msv.spec | 63 ++++++++++++++++++++---------------------------------- sources | 3 +-- 3 files changed, 25 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index fe8884b..57795d8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ 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 diff --git a/msv.spec b/msv.spec index b07c539..daca10b 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 -Version: 2013.5.1 -Release: 7%{?dist} +Version: 2013.6.1 +Release: 1%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -10,38 +10,29 @@ URL: http://msv.java.net/ # $ ./create-tarball Source0: %{name}-%{version}-clean.tar.gz -# 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 - 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: 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 +BuildRequires: maven-local +BuildRequires: mvn(isorelax:isorelax) +BuildRequires: mvn(jdom:jdom) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(net.java.dev.msv:msv-core) +BuildRequires: mvn(net.java.dev.msv:msv) +BuildRequires: mvn(net.java.dev.msv:msv-testharness) +BuildRequires: mvn(net.java.dev.msv:xsdlib) +BuildRequires: mvn(net.java:jvnet-parent) +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 @@ -72,7 +63,7 @@ Summary: Multi-Schema Validator RNG Converter %package xmlgen Summary: Multi-Schema Validator Generator -%description xmlgen +%description xmlgen %{summary}. %package xsdlib @@ -113,8 +104,6 @@ Requires: msv-xsdlib # Needed becuase of patch3 %pom_add_dep xml-resolver:xml-resolver -cp %{SOURCE1} parent-pom.xml - # ASL 2.0 license text cp %{SOURCE2} Apache-LICENSE-2.0.txt @@ -133,10 +122,7 @@ done # 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" 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 @@ -160,10 +146,6 @@ done %install %mvn_install -# parent POM -install -pD -T -m 644 parent-pom.xml %{buildroot}%{_mavenpomdir}/JPP-msv-parent.pom -%add_maven_depmap JPP-%{name}-parent.pom - # Manuals install -d -m 755 %{buildroot}%{_docdir}/%{name}/msv install -m 644 msv/doc/*.html %{buildroot}%{_docdir}/%{name}/msv @@ -211,8 +193,6 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %files xsdlib -f .mfiles-xsdlib %doc msv/doc/Apache-LICENSE-1.1.txt %doc License.txt -%{_mavenpomdir}/JPP-%{name}-parent.pom -%{_mavendepmapfragdir}/msv %files javadoc -f .mfiles-javadoc %doc License.txt @@ -227,6 +207,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 diff --git a/sources b/sources index 3d0befc..b9273c4 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -23e80cb265daeed7dd357b4e891ba096 msv-parent-2009.1.pom +a1fb4f939e291fe85711551cd7d36e33 msv-2013.6.1-clean.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt -9a6a831c3e03c9f7872a656930e820c2 msv-2013.5.1-clean.tar.gz From 3d790b41f6b484db16646b8fb8b5e025226a549b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 06:26:23 -0500 Subject: [PATCH 18/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index daca10b..578f572 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -207,6 +207,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 8aea4a7506c3871be596fe12d4adddba1c3b95b2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 4 Aug 2014 07:03:32 +0200 Subject: [PATCH 19/58] Remove unneeded build-requires - Fix build-requires on jvnet-parent --- msv.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/msv.spec b/msv.spec index 578f572..429ffcf 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -20,11 +20,7 @@ BuildRequires: maven-local BuildRequires: mvn(isorelax:isorelax) BuildRequires: mvn(jdom:jdom) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(net.java.dev.msv:msv-core) -BuildRequires: mvn(net.java.dev.msv:msv) -BuildRequires: mvn(net.java.dev.msv:msv-testharness) -BuildRequires: mvn(net.java.dev.msv:xsdlib) -BuildRequires: mvn(net.java:jvnet-parent) +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) @@ -207,6 +203,10 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 90534bfb0e26528a4565235f414bd9fad45d716c Mon Sep 17 00:00:00 2001 From: Gerard Ryan Date: Sun, 14 Sep 2014 15:37:39 +0100 Subject: [PATCH 20/58] Don't install testharness jar: pulls in ant The testharness module is only needed as a test dependency in this package. It depends on ant, so ant added as a 'Requires' and is needlessly installed. --- msv.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/msv.spec b/msv.spec index 429ffcf..5556899 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -134,7 +134,8 @@ done %mvn_alias ":xsdlib" "com.sun.msv.datatype.xsd:xsdlib" %mvn_package ":*::{tests,javadoc,sources}:" __noinstall -%mvn_package ":%{name}{,-core,-testharness}::{}:" %{name}-msv +%mvn_package ":%{name}{,-testharness}::{}:" __noinstall +%mvn_package ":%{name}{,-core}::{}:" %{name}-msv %build %mvn_build -s @@ -203,6 +204,10 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 @@ -346,7 +351,7 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib - 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 +* 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 From 1a292e6f10d1effb796e4263141c62982004bfa0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 14 May 2015 07:02:05 +0200 Subject: [PATCH 21/58] Remove maven-javadoc-plugin execution --- msv.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 5556899..b7d4585 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -97,6 +97,9 @@ Requires: msv-xsdlib # 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 @@ -204,6 +207,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From b6657cc2d482d6f5389eb842a187dc19b78a4d13 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 21:11:27 +0000 Subject: [PATCH 22/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index b7d4585..32900e4 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -207,6 +207,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 5cdc86fbe326d8c52c92881396508d80be4d7538 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 23 Sep 2015 08:09:02 +0200 Subject: [PATCH 23/58] Remove testharness sources from default package - Resolves: rhbz#1263628 --- msv.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 32900e4..8aed357 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -111,6 +111,9 @@ 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 @@ -207,6 +210,10 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 7aae89f84297666297013d30162de5fc56e8afd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 08:51:56 +0000 Subject: [PATCH 24/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 8aed357..2b13875 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -210,6 +210,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From bfe10bb64164e7dc1451ecb39a0ffc4db1503893 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 21:49:34 +0000 Subject: [PATCH 25/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index 2b13875..db8604b 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -210,6 +210,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 70135e04c889c2295e4d0ee28a129b63d9e8dea7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 22:24:11 +0000 Subject: [PATCH 26/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index db8604b..3131ec8 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -210,6 +210,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From c8be5ac8b5bed5d7d47b054ee5c58724679b04b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 03:27:02 +0000 Subject: [PATCH 27/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 3131ec8..1b73dab 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -210,6 +210,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 34eb4bcad907953a01d2a281c4349961ea208ba1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 11:09:05 +0000 Subject: [PATCH 28/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 1b73dab..f8f082f 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -210,6 +210,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 7d011e10381a152aa573159cd16abb40c475fa30 Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Tue, 31 Jul 2018 19:14:29 +0200 Subject: [PATCH 29/58] Add explicit javapackages-tools requirement --- msv.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index f8f082f..62f00de 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -46,18 +46,27 @@ 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}. @@ -210,6 +219,10 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 1bbd7bba185bd92900ecd387f40a1cccf3b660b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 11:39:22 +0000 Subject: [PATCH 30/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 62f00de..9726b49 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -219,6 +219,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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. From e03ea8eeecdf57e2c44c17ee4e9ba12f40b87156 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 17:53:53 +0000 Subject: [PATCH 31/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 9726b49..7eae3d7 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -219,6 +219,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 9214fc9f9b307bbb1a3e5a92e26ae5ab0fcc5e5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 14:15:23 +0000 Subject: [PATCH 32/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 7eae3d7..da883a7 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -219,6 +219,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 632f4ba34930aab6df576185c2fa2e1ffb05666c Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 03:08:00 +0200 Subject: [PATCH 33/58] Rebuilt for JDK-11 --- msv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msv.spec b/msv.spec index da883a7..f43f1c9 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -219,6 +219,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 15d29e8b5b02491826122c6c29decd7a750adc4a Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 18 Jul 2020 14:48:33 +0200 Subject: [PATCH 34/58] set javac source and target to 1.8 to fix Java 11 builds --- msv.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/msv.spec b/msv.spec index f43f1c9..d808df3 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Multi-Schema Validator License: BSD and ASL 1.1 URL: http://msv.java.net/ @@ -135,6 +135,10 @@ done %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 @@ -153,7 +157,7 @@ done %mvn_package ":%{name}{,-core}::{}:" %{name}-msv %build -%mvn_build -s +%mvn_build -s -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install @@ -219,6 +223,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib %{_datadir}/%{name} %changelog +* 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 From 70ffa2cb6c72930269f4dec609501879e7cf7246 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:36:04 +0000 Subject: [PATCH 35/58] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 d808df3..d853233 100644 --- a/msv.spec +++ b/msv.spec @@ -1,7 +1,7 @@ Name: msv Epoch: 1 Version: 2013.6.1 -Release: 18%{?dist} +Release: 19%{?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 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. From 272d9e219dc83839860342d1037533cdcb84e154 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:58:25 +0000 Subject: [PATCH 36/58] - 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 37/58] - 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 38/58] 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 39/58] 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 40/58] 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 41/58] 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 42/58] 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 43/58] 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 44/58] 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 45/58] 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 46/58] 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 47/58] 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 48/58] 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 49/58] 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 50/58] 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 51/58] 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 52/58] 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 53/58] 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 54/58] 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 55/58] 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 56/58] 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 57/58] 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 58/58] 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.