From 1161e6f735a28dd8d3cae36dfdc735bdb000b0e6856e5d814da06027b7d04cd5 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 18 Sep 2017 11:46:56 +0000
Subject: [PATCH] Fix build with jdk9

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jakarta-commons-modeler?expand=0&rev=8
---
 jakarta-commons-modeler-java14compat.patch | 22 ---------------------
 jakarta-commons-modeler.changes            | 11 +++++++++++
 jakarta-commons-modeler.spec               | 23 +++++++++++++---------
 3 files changed, 25 insertions(+), 31 deletions(-)
 delete mode 100644 jakarta-commons-modeler-java14compat.patch

diff --git a/jakarta-commons-modeler-java14compat.patch b/jakarta-commons-modeler-java14compat.patch
deleted file mode 100644
index ca975be..0000000
--- a/jakarta-commons-modeler-java14compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: commons-modeler-2.0-src/build.xml
-===================================================================
---- commons-modeler-2.0-src.orig/build.xml
-+++ commons-modeler-2.0-src/build.xml
-@@ -156,6 +156,8 @@
-     <javac  srcdir="${source.home}"
-            destdir="${build.home}/classes"
-              debug="${compile.debug}"
-+            source="1.4"
-+            target="1.4"
-        deprecation="${compile.deprecation}"
-           optimize="${compile.optimize}">
-       <classpath refid="compile.classpath"/>
-@@ -276,6 +278,8 @@
-   <target name="compile.tests" depends="compile"
-    description="Compile unit test cases">
-     <javac  srcdir="${test.home}"
-+     source="1.4"
-+     target="1.4"
-            destdir="${build.home}/tests"
-              debug="${compile.debug}"
-        deprecation="${compile.deprecation}"
diff --git a/jakarta-commons-modeler.changes b/jakarta-commons-modeler.changes
index 16c772c..0f9bac2 100644
--- a/jakarta-commons-modeler.changes
+++ b/jakarta-commons-modeler.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep 18 11:43:04 UTC 2017 - fstrba@suse.com
+
+- Removed patch:
+  * jakarta-commons-modeler-java14compat.patch
+    - Not needed, since we pass those source and target levels to 
+      ant on command-line
+- Clean spec file and fix a warning
+- Specify to ant dependencies on command-line instead of using
+  system-wide classpath
+
 -------------------------------------------------------------------
 Sat May 20 18:21:44 UTC 2017 - tchvatal@suse.com
 
diff --git a/jakarta-commons-modeler.spec b/jakarta-commons-modeler.spec
index c4f5d93..c6283af 100644
--- a/jakarta-commons-modeler.spec
+++ b/jakarta-commons-modeler.spec
@@ -26,8 +26,8 @@ License:        Apache-2.0
 Group:          Development/Libraries/Java
 Url:            http://jakarta.apache.org/commons/modeler/
 Source0:        %{short_name}-%{version}-src.tar.bz2
-Patch0:         %{name}-java14compat.patch
 BuildRequires:  ant
+BuildRequires:  fdupes
 BuildRequires:  jakarta-commons-digester
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
@@ -42,9 +42,8 @@ Requires:       jaxp_parser_impl
 Requires:       jaxp_transform_impl
 Requires:       mx4j
 Requires:       xml-commons-apis
-Provides:       %{short_name}
-Obsoletes:      %{short_name}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Provides:       %{short_name} = %{version}-%{release}
+Obsoletes:      %{short_name} < %{version}-%{release}
 BuildArch:      noarch
 
 %description
@@ -68,13 +67,20 @@ Modeler Package.
 
 %prep
 %setup -q -n %{short_name}-%{version}-src
-%patch0 -p1
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
-export CLASSPATH=$(build-classpath xml-commons-apis jaxp_parser_impl jaxp_transform_impl mx4j/mx4j-jmx junit commons-beanutils commons-collections commons-digester commons-logging)
-ant dist
+ant \
+    -Dant.jar=$(build-classpath ant) \
+    -Djaxp.parser.jar=$(build-classpath jaxp_parser_impl) \
+    -Djaxp.xalan.jar=$(build-classpath jaxp_trasform_impl) \
+    -Djmx.jar=$(build-classpath mx4j/mx4j-jmx) \
+    -Djunit.jar=$(build-classpath junit) \
+    -Dcommons-digester.jar=$(build-classpath commons-digester) \
+    -Dcommons-logging.jar=$(build-classpath commons-logging) \
+    -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
+    dist
 
 %install
 # jars
@@ -85,14 +91,13 @@ cp -a dist/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
 # javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
 cp -a dist/docs/* %{buildroot}%{_javadocdir}/%{name}
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
 %files
-%defattr(0644,root,root,0755)
 %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt xdocs
 %{_javadir}/*
 
 %files javadoc
-%defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}
 
 %changelog