OBS-URL: https://build.opensuse.org/package/show/Java:packages/tanukiwrapper?expand=0&rev=36

tanukiwrapper.changes

@@ -8,8 +8,9 @@ Fri Apr 13 13:44:56 UTC 2018 - mc@suse.com
 -------------------------------------------------------------------
 Fri Apr 13 13:29:00 UTC 2018 - fstrba@suse.com
 
-- Require ant >= 1.9.8 in order to be able to use the nativeheader
-  attribute
+- Apply tanukiwrapper-nojavah.patch only if building with java 10
+  or above, that does not have the javah tool.
+- Relax the java-devel requirement to any version >= 1.6
 
 -------------------------------------------------------------------
 Wed Jan 10 14:32:34 UTC 2018 - bwiedemann@suse.com

tanukiwrapper.spec

@@ -17,7 +17,6 @@
 #
 
 
-%global antversion 1.9.8
 Name:           tanukiwrapper
 Version:        3.5.32
 Release:        0
@@ -29,13 +28,13 @@ Source0:        http://download.sourceforge.net/wrapper/wrapper_%{version}_src.t
 Source1:        wrapper.1
 Patch0:         %{name}-additional-makefiles.patch
 Patch1:         %{name}-nojavah.patch
-BuildRequires:  ant >= %{antversion}
+BuildRequires:  ant >= 1.6.1
 BuildRequires:  ant-junit
-BuildRequires:  ant-nodeps >= %{antversion}
+BuildRequires:  ant-nodeps >= 1.6.1
 BuildRequires:  cunit-devel
 BuildRequires:  fdupes
 BuildRequires:  glibc-devel
-BuildRequires:  java-devel >= 1.8
+BuildRequires:  java-devel >= 1.6
 BuildRequires:  javapackages-tools
 BuildRequires:  perl
 BuildRequires:  xerces-j2
@@ -70,7 +69,9 @@ This package contains the manuals for %{name}
 %prep
 %setup -q -n wrapper_%{version}_src
 %patch0 -p1
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 10}%{!?pkg_vcmp:0}
 %patch1 -p1
+%endif
 
 find . -name "*.jar" -exec rm -f {} \;
 perl -p -i -e 's|-O3|%{optflags}|' src/c/Makefile*