Update to upstream version 2013.2.3
- Resolves: rhbz#876845
This commit is contained in:
Michal Srb
parent
f233538cb9
commit
ab6091fa11
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,4 @@
|
||||
msv-20050722.tar.gz
|
||||
/msv-2009.1.tar.gz
|
||||
/msv-2013.2.3.tar.gz
|
||||
/msv-parent-2009.1.pom
|
||||
|
||||
@ -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 <msrb@redhat.com>
|
||||
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 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>net.java.dev.msv</groupId>
|
||||
@ -15,7 +27,7 @@
|
||||
<relativePath>../parent/pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
@@ -88,10 +88,6 @@
|
||||
@@ -71,10 +71,6 @@
|
||||
<artifactId>isorelax</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@ -26,9 +38,11 @@
|
||||
<groupId>relaxngDatatype</groupId>
|
||||
<artifactId>relaxngDatatype</artifactId>
|
||||
</dependency>
|
||||
--- 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
|
||||
|
||||
@ -0,0 +1,67 @@
|
||||
From 4b691adecd92c09689b0d23b7b17cc50f4b5bee9 Mon Sep 17 00:00:00 2001
|
||||
From: Michal Srb <msrb@redhat.com>
|
||||
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
|
||||
|
||||
74
msv.spec
74
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" "<module>relames</module>"
|
||||
|
||||
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 <msrb@redhat.com> - 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 <mizdebsk@redhat.com> - 1:2009.1-14
|
||||
- Add missing BR: maven-local
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user