diff --git a/dom4j-enable-stax-datatypes.patch b/dom4j-enable-stax-datatypes.patch new file mode 100644 index 0000000..5b4f8a5 --- /dev/null +++ b/dom4j-enable-stax-datatypes.patch @@ -0,0 +1,14 @@ +Index: dom4j/build.xml +=================================================================== +--- dom4j.orig/build.xml ++++ dom4j/build.xml +@@ -146,9 +146,6 @@ + source="8" + deprecation="${deprecation}" + classpathref="compile.classpath"> +- +- +- + + + diff --git a/dom4j.changes b/dom4j.changes index 1b96d48..a5c9edb 100644 --- a/dom4j.changes +++ b/dom4j.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 25 11:10:16 UTC 2019 - Cédric Bosdonnat + +- Build STAXEventReader, STAXEventWriter and the data types. + [bsc#1123158] + * Added patch dom4j-enable-stax-datatypes.patch + ------------------------------------------------------------------- Tue Sep 18 10:31:28 UTC 2018 - pmonrealgonzalez@suse.com diff --git a/dom4j.spec b/dom4j.spec index f465d1d..8fecb1a 100644 --- a/dom4j.spec +++ b/dom4j.spec @@ -1,7 +1,7 @@ # # spec file for package dom4j # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -39,6 +39,8 @@ Patch1: dom4j-sourcetarget.patch Patch2: dom4j-javadoc.patch # PATCH-FIX-UPSTREAM bsc#1105443 CVE-2018-1000632 Patch3: dom4j-CVE-2018-1000632.patch +# PATCH-FIX-OPENSUSE bsc#1123158 Don't disable STAX and datatypes +Patch4: dom4j-enable-stax-datatypes.patch BuildRequires: ant >= 1.6.5 BuildRequires: ant-apache-resolver BuildRequires: ant-junit @@ -133,6 +135,7 @@ rm -f src/test/org/dom4j/io/StaxTest.java %patch1 -p1 -b .sourcetarget %patch2 -p1 -b .javadoc %patch3 -p1 +%patch4 -p1 perl -pi -e 's/\r//g' LICENSE.txt docs/clover/*.css docs/style/*.css docs/xref/*.css docs/xref-test/*.css src/doc/style/*.css docs/benchmarks/xpath/*.java pushd lib