From 0c41a24c33b1659c911459206a3e2661131a8fc920f5ea274f48f69edd7e1652 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 19 Sep 2017 08:37:15 +0000
Subject: [PATCH] Fix build with jdk9

OBS-URL: https://build.opensuse.org/package/show/Java:packages/velocity?expand=0&rev=26
---
 velocity.changes | 5 +++++
 velocity.spec    | 9 ++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/velocity.changes b/velocity.changes
index 926e3b2..de2f4a5 100644
--- a/velocity.changes
+++ b/velocity.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 19 08:36:49 UTC 2017 - fstrba@suse.com
+
+- Fix buid with jdk9: specify java source and target level 1.6
+
 -------------------------------------------------------------------
 Fri May 19 16:41:19 UTC 2017 - tchvatal@suse.com
 
diff --git a/velocity.spec b/velocity.spec
index a796bd3..8476352 100644
--- a/velocity.spec
+++ b/velocity.spec
@@ -47,13 +47,12 @@ BuildRequires:  werken-xpath
 Requires:       avalon-logkit
 Requires:       commons-collections
 Requires:       commons-lang
-Requires:       java >= 1.5.0
+Requires:       java >= 1.6.0
 Requires:       jdom >= 1.0-1
 Requires:       log4j >= 1.1
 Requires:       oro
 Requires:       servletapi4
 Requires:       werken-xpath
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -194,7 +193,7 @@ export OPT_JAR_LIST="ant/ant-junit junit"
 #FIXME: tests failed on CommonsExtPropTestCase
 #but resulting files seems to be same
 ant \
-  -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+  -Djavac.source=1.6 -Djavac.target=1.6 \
   -buildfile build/build.xml \
   jar javadocs #test
 
@@ -218,22 +217,18 @@ cp -pr examples test %{buildroot}%{_datadir}/%{name}
 %fdupes -s %{buildroot}
 
 %files
-%defattr(0644,root,root,0755)
 %doc LICENSE NOTICE README.txt
 %{_javadir}/*.jar
 %{_mavenpomdir}/*
 %{_datadir}/maven-metadata/%{name}.xml
 
 %files manual
-%defattr(0644,root,root,0755)
 %doc docs/*
 
 %files javadoc
-%defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}
 
 %files demo
-%defattr(0644,root,root,0755)
 %{_datadir}/%{name}
 
 %changelog