From c92e39f0c5a7fe27f361ab4883696fb50b338086 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mar 23 2015 09:06:16 +0000 Subject: Update to upstream version 5.0.0 --- diff --git a/.gitignore b/.gitignore index 3a61604..0e74328 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /woodstox-core-src-4.1.2.tar.gz /woodstox-core-src-4.2.0.tar.gz +/woodstox-core-5.0.0.tar.gz diff --git a/0001-stax2-api.patch b/0001-stax2-api.patch new file mode 100644 index 0000000..75042ba --- /dev/null +++ b/0001-stax2-api.patch @@ -0,0 +1,32 @@ +From 270f5cc0ad44c74009ef0cef5a8e11030404d5ac 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.1.0 + diff --git a/sources b/sources index ac7c1d4..2b5c93d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9ebfcbba9bf6e242a02cfa1b29adccff woodstox-core-src-4.2.0.tar.gz +659d3a8bd9cdf227aa93a73b33ac05ce woodstox-core-5.0.0.tar.gz diff --git a/woodstox-core-stax2-api.patch b/woodstox-core-stax2-api.patch deleted file mode 100644 index 1259aa2..0000000 --- a/woodstox-core-stax2-api.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/java/com/ctc/wstx/sr/InputElementStack.java~ 2013-04-16 23:24:26.000000000 +0200 -+++ src/java/com/ctc/wstx/sr/InputElementStack.java 2013-06-20 14:03:54.950052611 +0200 -@@ -843,9 +843,13 @@ - * element. - */ - 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); -+ } - } - - /* diff --git a/woodstox-core.spec b/woodstox-core.spec index d4fff87..3e2a763 100644 --- a/woodstox-core.spec +++ b/woodstox-core.spec @@ -1,22 +1,25 @@ %global base_name woodstox %global core_name %{base_name}-core -%global stax2_ver 3.1.1 Name: %{core_name} -Version: 4.2.0 -Release: 6%{?dist} +Version: 5.0.0 +Release: 1%{?dist} Summary: High-performance XML processor License: ASL 2.0 or LGPLv2+ or BSD -URL: http://%{base_name}.codehaus.org/ +URL: https://github.com/FasterXML/woodstox BuildArch: noarch -Source0: http://%{base_name}.codehaus.org/%{version}/%{core_name}-src-%{version}.tar.gz -Patch0: %{name}-stax2-api.patch +Source0: https://github.com/FasterXML/%{base_name}/archive/%{name}-%{version}.tar.gz +Patch0: 0001-stax2-api.patch 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) BuildRequires: mvn(net.java.dev.msv:xsdlib) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:org.osgi.core) BuildRequires: mvn(org.codehaus.woodstox:stax2-api) @@ -34,34 +37,9 @@ Summary: API documentation for %{name} This package contains the API documentation for %{name}. %prep -%setup -q -n %{base_name}-%{version} -%patch0 - -# Create POM from template -sed s/@VERSION@/%{version}/\;s/@REQ_STAX2_VERSION@/%{stax2_ver}/ \ - src/maven/%{name}-asl.pom >pom.xml - -# Remove bundled libraries. -rm -rf lib -rm -rf src/maven -rm -rf src/resources -rm -rf src/samples -rm -rf src/java/org -rm -rf src/test/org -rm -rf src/test/stax2 - -# Bundled libraries were removed, so dependencies on them need to be -# added. -%pom_add_dep net.java.dev.msv:msv-core -%pom_add_dep org.apache.felix:org.osgi.core -%pom_add_dep net.java.dev.msv:xsdlib - -# Upstream uses non-standard directory structure. -%pom_xpath_inject pom:project " - - src/java - src/test - " +%setup -q -n %{base_name}-%{name}-%{version} + +%patch0 -p1 %mvn_alias ":{woodstox-core}-asl" :@1-lgpl :wstx-asl :wstx-lgpl %mvn_file : %{name}{,-asl,-lgpl} @@ -74,12 +52,14 @@ rm -rf src/test/stax2 %mvn_install %files -f .mfiles -%doc release-notes +%doc README.md %files javadoc -f .mfiles-javadoc -%doc release-notes/asl release-notes/lgpl release-notes/bsd %changelog +* Mon Mar 23 2015 Michael Simacek - 5.0.0-1 +- Update to upstream version 5.0.0 + * Mon Aug 4 2014 Mikolaj Izdebski - 4.2.0-6 - Remove build-requires on jvnet-parent