diff --git a/.gitignore b/.gitignore index 11b70ba..44aae22 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ +/results_* +/*.src.rpm + /woodstox-core-src-4.1.2.tar.gz /woodstox-core-src-4.2.0.tar.gz /woodstox-core-5.0.0.tar.gz /woodstox-core-5.0.1.tar.gz /woodstox-core-5.0.2.tar.gz /woodstox-core-5.0.3.tar.gz +/woodstox-core-5.2.1.tar.gz diff --git a/0001-stax2-api.patch b/0001-stax2-api.patch deleted file mode 100644 index 0c484ea..0000000 --- a/0001-stax2-api.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9a53f26d601b3971479a626d0752056be55cf702 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Mon, 23 Mar 2015 09:12:37 +0100 -Subject: [PATCH] stax2-api - ---- - src/main/java/com/ctc/wstx/sr/InputElementStack.java | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/main/java/com/ctc/wstx/sr/InputElementStack.java b/src/main/java/com/ctc/wstx/sr/InputElementStack.java -index 4aa355c..d657f40 100644 ---- a/src/main/java/com/ctc/wstx/sr/InputElementStack.java -+++ b/src/main/java/com/ctc/wstx/sr/InputElementStack.java -@@ -857,9 +857,13 @@ public final class InputElementStack - */ - @Override - public int addDefaultAttribute(String localName, String uri, String prefix, -- String value) throws XMLStreamException -+ String value) - { -- return mAttrCollector.addDefaultAttribute(localName, uri, prefix, value); -+ try { -+ return mAttrCollector.addDefaultAttribute(localName, uri, prefix, value); -+ } catch (XMLStreamException e) { -+ throw new RuntimeException(e); -+ } - } - - /* --- -2.7.4 - diff --git a/sources b/sources index a85e2ec..a265bfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1cb8d2d1ab52f75e0013bf145a385d73 woodstox-core-5.0.3.tar.gz +SHA512 (woodstox-core-5.2.1.tar.gz) = 4b7b68b94cf5469f3e5fbf8442bec27d541056757f098cb76852f75e0cd05909f60cb4fb3b30fb926eb8c0a2a27f7db9dd8158fc7b9eed992b90fc2b1044fe8a diff --git a/woodstox-core.spec b/woodstox-core.spec index 4b4898b..e46dff7 100644 --- a/woodstox-core.spec +++ b/woodstox-core.spec @@ -1,20 +1,18 @@ %global base_name woodstox -%global core_name %{base_name}-core -Name: %{core_name} -Version: 5.0.3 -Release: 7%{?dist} +Name: woodstox-core Summary: High-performance XML processor +Version: 5.2.1 +Release: 1%{?dist} License: ASL 2.0 or LGPLv2+ or BSD + URL: https://github.com/FasterXML/woodstox -BuildArch: noarch +Source0: %{url}/archive/%{name}-%{version}.tar.gz -Source0: https://github.com/FasterXML/%{base_name}/archive/%{name}-%{version}.tar.gz -Patch0: 0001-stax2-api.patch +BuildArch: noarch BuildRequires: maven-local BuildRequires: mvn(com.fasterxml:oss-parent:pom:) -BuildRequires: mvn(javax.xml.stream:stax-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.java.dev.msv:msv-core) BuildRequires: mvn(net.java.dev.msv:msv-rngconverter) @@ -30,43 +28,44 @@ XML processor means that it handles both input (== parsing) and output (== writing, serialization)), as well as supporting tasks such as validation. -%package javadoc -Summary: API documentation for %{name} -%description javadoc +%package javadoc +Summary: API documentation for %{name} + +%description javadoc This package contains the API documentation for %{name}. + %prep %setup -q -n %{base_name}-%{name}-%{version} -%patch0 -p1 - -%pom_xpath_inject 'pom:plugin[pom:artifactId="maven-bundle-plugin"]/pom:configuration' ' - - {local-packages} -' - %mvn_alias ":{woodstox-core}" :@1-lgpl :@1-asl :wstx-asl :wstx-lgpl \ org.codehaus.woodstox:@1 org.codehaus.woodstox:@1-asl \ org.codehaus.woodstox:@1-lgpl org.codehaus.woodstox:wstx-lgpl \ org.codehaus.woodstox:wstx-asl + %mvn_file : %{name}{,-asl,-lgpl} -# Fails even when using online maven build -rm ./src/test/java/org/codehaus/stax/test/stream/TestNamespaces.java %build %mvn_build + %install %mvn_install + %files -f .mfiles %doc README.md +%license LICENSE %files javadoc -f .mfiles-javadoc + %changelog +* Thu Aug 01 2019 Fabio Valentini - 5.2.1-1 +- Update to version 5.2.1. + * Sat Jul 27 2019 Fedora Release Engineering - 5.0.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild @@ -144,3 +143,4 @@ rm ./src/test/java/org/codehaus/stax/test/stream/TestNamespaces.java * Tue Sep 13 2011 Jaromir Capik - 4.1.2-1 - Initial version +