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