diff --git a/qdox.changes b/qdox.changes index 5e507eb..b5c7e99 100644 --- a/qdox.changes +++ b/qdox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 28 08:39:19 UTC 2014 - coolo@suse.com + +- rename the conditional to junit_test and switch the default, + bootstrapping factory is more important than a single test + ------------------------------------------------------------------- Tue Aug 12 08:44:32 UTC 2014 - lnussel@suse.de diff --git a/qdox.spec b/qdox.spec index 053dfff..e6a858f 100644 --- a/qdox.spec +++ b/qdox.spec @@ -17,7 +17,7 @@ %bcond_with maven -%bcond_with java_bootstrap +%bcond_with junit_test # If you want repolib package to be built, # issue the following: 'rpmbuild --with repolib' %define _with_repolib 1 @@ -62,14 +62,14 @@ BuildRequires: saxon9-scripts BuildRequires: ant >= 1.6 #BuildRequires: ant-junit >= 1.6 BuildRequires: byaccj -%if %{with java_bootstrap} -BuildRequires: java-cup-bootstrap -BuildRequires: jflex-bootstrap -%else +%if %{with junit_test} BuildRequires: java-cup BuildRequires: jflex BuildRequires: jmock BuildRequires: junit >= 3.8.1 +%else +BuildRequires: java-cup-bootstrap +BuildRequires: jflex-bootstrap %endif BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -165,7 +165,7 @@ pushd target ../src/grammar/parser.y popd mv target/Parser.java src/java/com/thoughtworks/qdox/parser/impl -%if %{with java_bootstrap} +%if ! %{with junit_test} rm -f src/java/com/thoughtworks/qdox/junit/APITestCase.java %endif ant -Dbuild.sysclasspath=only jar javadoc