diff --git a/apache-commons-collections.changes b/apache-commons-collections.changes
index 6739a37..01aa840 100644
--- a/apache-commons-collections.changes
+++ b/apache-commons-collections.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 14 11:07:55 UTC 2017 - fstrba@suse.com
+
+- Fix build with jdk9 by specifying java source and target 1.6
+- Added patch:
+ * commons-collections-3.2.2-tf.javadoc.patch
+ - Fix unresolved symbols when building tf.javadoc
+
-------------------------------------------------------------------
Fri May 19 08:49:50 UTC 2017 - tchvatal@suse.com
diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index a97c1f3..1d42e88 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -33,6 +33,7 @@ Patch1: commons-collections-3.2-build_xml.patch
Patch2: java8-compat.patch
# PATCH-FIX-UPSTREAM add missing MANIFEST.MF file
Patch3: commons-collections-missing-MF.patch
+Patch4: commons-collections-3.2.2-tf.javadoc.patch
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: apache-commons-parent
@@ -98,15 +99,17 @@ find . -name "*.class" -exec rm -f {} \;
%patch1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
# Substitute version into testframework pom
cp -p %{SOURCE1} pom-testframework.xml
sed -i 's/@VERSION@/%{version}/' pom-testframework.xml
%build
-export CLASSPATH=$(build-classpath junit)
+echo "junit.jar=$(build-classpath junit)" >>build.properties
ant \
- -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+ -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
+ -Dant.build.javadoc.source=1.6 \
-Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc
%install
diff --git a/commons-collections-3.2.2-tf.javadoc.patch b/commons-collections-3.2.2-tf.javadoc.patch
new file mode 100644
index 0000000..71771f0
--- /dev/null
+++ b/commons-collections-3.2.2-tf.javadoc.patch
@@ -0,0 +1,13 @@
+--- commons-collections-3.2.2-src/build.xml 2017-09-14 12:45:40.626106146 +0200
++++ commons-collections-3.2.2-src/build.xml 2017-09-14 13:04:45.932517074 +0200
+@@ -460,6 +460,10 @@
+ doctitle="${tf.title} ${tf.version} API;"
+ windowtitle="${tf.title} ${tf.version} API"
+ bottom="Copyright © 2001-${year} Apache Software Foundation. All Rights Reserved.">
++
++
++
++
+
+
+