diff --git a/xmlstreambuffer.spec b/xmlstreambuffer.spec index 5c4d272..fa24b15 100644 --- a/xmlstreambuffer.spec +++ b/xmlstreambuffer.spec @@ -1,8 +1,8 @@ Name: xmlstreambuffer Version: 1.5.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: XML Stream Buffer -License: CDDL or GPLv2 with exceptions +License: CDDL-1.1 or GPLv2 with exceptions Url: http://java.net/projects/xmlstreambuffer/ # svn export https://svn.java.net/svn/xmlstreambuffer~svn/tags/streambuffer-1.5.4/ xmlstreambuffer-1.5.4 # find xmlstreambuffer-1.5.4/ -name '*.class' -delete @@ -71,10 +71,12 @@ sed -i 's/\r//' LICENSE.txt rm -r test/com/sun/xml/stream/buffer/stax/InscopeNamespaceTest.java +# Don't hard-code compiler configuration +%pom_remove_plugin :maven-compiler-plugin + %mvn_file :streambuffer %{name} %build - %mvn_build %install @@ -87,6 +89,9 @@ rm -r test/com/sun/xml/stream/buffer/stax/InscopeNamespaceTest.java %license LICENSE.txt %changelog +* Fri Aug 07 2020 Mat Booth - 1.5.4-15 +- Allow building on JDK 11 and correct license tag + * Sat Aug 01 2020 Fedora Release Engineering - 1.5.4-14 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild