From 93341fa3f138a705fc6e4919c16c266e88992ad29a1a149bfe2a7c39cf639922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 9 Jun 2017 09:42:14 +0000
Subject: [PATCH] - Drop the javadoc so we can be build with java bootstrapping
 reducing   the cycle/failures

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

diff --git a/antlr.changes b/antlr.changes
index df48dcf..6e59866 100644
--- a/antlr.changes
+++ b/antlr.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun  9 09:43:34 UTC 2017 - tchvatal@suse.com
+
+- Drop the javadoc so we can be build with java bootstrapping reducing
+  the cycle/failures
+
 -------------------------------------------------------------------
 Fri May 19 13:28:56 UTC 2017 - tchvatal@suse.com
 
diff --git a/antlr.spec b/antlr.spec
index de680d0..e21ffa0 100644
--- a/antlr.spec
+++ b/antlr.spec
@@ -16,7 +16,6 @@
 #
 
 
-%define section free
 Name:           antlr
 Version:        2.7.7
 Release:        0
@@ -41,6 +40,7 @@ BuildRequires:  xml-commons-apis
 Requires:       %{name}-java
 Provides:       %{name}-bootstrap = %{version}
 Obsoletes:      %{name}-bootstrap < %{version}
+Obsoletes:      %{name}-javadoc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -76,19 +76,6 @@ or Java actions (you can use PCCTS 1.xx to generate C-based parsers).
 
 This package provides the manual and examples for antlr.
 
-%package        javadoc
-Summary:        ANother Tool for Language Recognition (Java Documentation)
-Group:          Development/Tools/Other
-BuildArch:      noarch
-
-%description    javadoc
-ANTLR, Another Tool for Language Recognition, (formerly PCCTS) is a
-language tool that provides a framework for constructing recognizers,
-compilers, and translators from grammatical descriptions containing C++
-or Java actions (you can use PCCTS 1.xx to generate C-based parsers).
-
-This package provides the Javadoc for antlr.
-
 %package        devel
 Summary:        ANother Tool for Language Recognition (c++ runtime)
 Group:          Development/Tools/Other
@@ -132,7 +119,8 @@ find | grep "\(ShowString.java$\|StreamConverter.java$\)" && exit 42
 %build
 ant \
     -Dj2se.apidoc=%{_javadocdir}/java \
-    -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+    -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+    jar
 %configure
 make -j1
 %py_compile lib/python/antlr
@@ -151,10 +139,6 @@ install -d -m 0755 %{buildroot}%{_bindir}/
 install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/%{name}
 install -m 0755 scripts/%{name}-config %{buildroot}%{_bindir}/
 
-### javadoc ###
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -ar work/api/* %{buildroot}%{_javadocdir}/%{name}
-
 ### python runtime ###
 install -d -m 0755 %{buildroot}%{py_sitedir}/%{name}
 cp -a lib/python/antlr/* %{buildroot}%{py_sitedir}/%{name}
@@ -189,10 +173,6 @@ find examples -type f | xargs chmod 0644
 %defattr(0644,root,root,0755)
 %doc doc examples
 
-%files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/%{name}
-
 %files devel
 %defattr(0644,root,root,0755)
 %attr(755,root,root) %{_libdir}/libantlr.a