Accepting request 244317 from Java:packages

1

OBS-URL: https://build.opensuse.org/request/show/244317
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qdox?expand=0&rev=16
This commit is contained in:
Ludwig Nussel 2014-08-14 12:57:35 +00:00 committed by Git OBS Bridge
commit 86bd41692d
2 changed files with 15 additions and 6 deletions

View File

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

View File

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