From a06dff3d2b1b4173636e8f49f7c3a83909656e39a56b3c328d177fe3f146a882 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Tue, 12 Aug 2014 11:44:54 +0000
Subject: [PATCH] Accepting request 244316 from openSUSE:13.2:Staging:A:DVD

- introduce %with java_bootstrap to allow bootstrapping without junit

OBS-URL: https://build.opensuse.org/request/show/244316
OBS-URL: https://build.opensuse.org/package/show/Java:packages/qdox?expand=0&rev=14
---
 qdox.changes |  5 +++++
 qdox.spec    | 16 ++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/qdox.changes b/qdox.changes
index d5dfd77..5e507eb 100644
--- a/qdox.changes
+++ b/qdox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 12 08:44:32 UTC 2014 - lnussel@suse.de
+
+- introduce %with java_bootstrap to allow bootstrapping without junit
+
 -------------------------------------------------------------------
 Thu May 15 13:11:04 UTC 2014 - darin@darins.net
 
diff --git a/qdox.spec b/qdox.spec
index e3069cf..053dfff 100644
--- a/qdox.spec
+++ b/qdox.spec
@@ -16,12 +16,8 @@
 #
 
 
-%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-%define _without_maven 1
 %bcond_with maven
+%bcond_with java_bootstrap
 # If you want repolib package to be built,
 # issue the following: 'rpmbuild --with repolib'
 %define _with_repolib 1
@@ -64,12 +60,17 @@ BuildRequires:  saxon9
 BuildRequires:  saxon9-scripts
 %endif
 BuildRequires:  ant >= 1.6
-BuildRequires:  ant-junit >= 1.6
+#BuildRequires:  ant-junit >= 1.6
 BuildRequires:  byaccj
+%if %{with java_bootstrap}
+BuildRequires:  java-cup-bootstrap
+BuildRequires:  jflex-bootstrap
+%else
 BuildRequires:  java-cup
 BuildRequires:  jflex
 BuildRequires:  jmock
 BuildRequires:  junit >= 3.8.1
+%endif
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -164,6 +165,9 @@ pushd target
     ../src/grammar/parser.y
 popd
 mv target/Parser.java src/java/com/thoughtworks/qdox/parser/impl
+%if %{with java_bootstrap}
+rm -f src/java/com/thoughtworks/qdox/junit/APITestCase.java
+%endif
 ant -Dbuild.sysclasspath=only jar javadoc
 %endif