commit 0a40a56d2001b7e620b744f5e5e14fda38ca98c0
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Thu Jun 20 13:49:45 2013 +0200
Update to upstream version 4.2.0
.gitignore | 1 +
sources | 2 +-
woodstox-core-stax2-api.patch | 18 ++++++++++++++++++
woodstox-core.spec | 15 ++++++++++-----
4 files changed, 30 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3e747e..3a61604 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/woodstox-core-src-4.1.2.tar.gz
+/woodstox-core-src-4.2.0.tar.gz
diff --git a/sources b/sources
index a1e2f73..ac7c1d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ceabf6c0f6daa7742cad71ae0a7db78 woodstox-core-src-4.1.2.tar.gz
+9ebfcbba9bf6e242a02cfa1b29adccff woodstox-core-src-4.2.0.tar.gz
diff --git a/woodstox-core-stax2-api.patch b/woodstox-core-stax2-api.patch
new file mode 100644
index 0000000..1259aa2
--- /dev/null
+++ b/woodstox-core-stax2-api.patch
@@ -0,0 +1,18 @@
+--- 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 f0a6a06..6d8949b 100644
--- a/woodstox-core.spec
+++ b/woodstox-core.spec
@@ -3,14 +3,15 @@
%global stax2_ver 3.1.1
Name: %{core_name}
-Version: 4.1.2
-Release: 6%{?dist}
+Version: 4.2.0
+Release: 1%{?dist}
Summary: High-performance XML processor
-License: ASL 2.0 or LGPLv2+
+License: ASL 2.0 or LGPLv2+ or BSD
URL: http://%{base_name}.codehaus.org/
BuildArch: noarch
Source0:
http://%{base_name}.codehaus.org/%{version}/%{core_name}-src-%{version}.tar.gz
+Patch0: %{name}-stax2-api.patch
BuildRequires: maven-local
BuildRequires: mvn(javax.xml.stream:stax-api)
@@ -37,6 +38,7 @@ 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}/ \
@@ -75,12 +77,15 @@ rm -rf src/test/stax2
%mvn_install
%files -f .mfiles
-%doc release-notes/asl/ASL2.0 release-notes/lgpl/LGPL2.1 release-notes/asl/NOTICE
+%doc release-notes
%files javadoc -f .mfiles-javadoc
-%doc release-notes/asl/ASL2.0 release-notes/lgpl/LGPL2.1 release-notes/asl/NOTICE
+%doc release-notes/asl release-notes/lgpl release-notes/bsd
%changelog
+* Thu Jun 20 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-1
+- Update to upstream version 4.2.0
+
* Thu Jun 20 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.1.2-6
- Install NOTICE file with javadoc package
- Update to current packaging guidelines
Show replies by date