Hello community, here is the log from the commit of package qdox for openSUSE:Factory checked in at 2014-08-14 14:57:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qdox (Old) and /work/SRC/openSUSE:Factory/.qdox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qdox" Changes: -------- --- /work/SRC/openSUSE:Factory/qdox/qdox.changes 2014-05-17 06:43:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qdox.new/qdox.changes 2014-08-14 14:57:37.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 12 08:44:32 UTC 2014 - [email protected] + +- introduce %with java_bootstrap to allow bootstrapping without junit + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qdox.spec ++++++ --- /var/tmp/diff_new_pack.fs7HEK/_old 2014-08-14 14:57:39.000000000 +0200 +++ /var/tmp/diff_new_pack.fs7HEK/_new 2014-08-14 14:57:39.000000000 +0200 @@ -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-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 @@ ../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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
