Accepting request 246707 from openSUSE:Factory:Staging:H:DVD

- rename the conditional to junit_test and switch the default,
  bootstrapping factory is more important than a single test

OBS-URL: https://build.opensuse.org/request/show/246707
OBS-URL: https://build.opensuse.org/package/show/Java:packages/qdox?expand=0&rev=16
This commit is contained in:
Factory Maintainer 2014-08-28 17:05:47 +00:00 committed by Git OBS Bridge
parent a06dff3d2b
commit 13b9500d52
2 changed files with 12 additions and 6 deletions

View File

@ -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

View File

@ -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