From 6c8d498ea73b28e3eba524e51165d0221a51225cf37e2c2db44d99ad2fe3e3bb Mon Sep 17 00:00:00 2001 From: Michal Vyskocil Date: Mon, 2 Apr 2012 13:00:42 +0000 Subject: [PATCH] - add junit4 to fix a build fail OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-codec?expand=0&rev=4 --- apache-commons-codec.changes | 5 +++++ apache-commons-codec.spec | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apache-commons-codec.changes b/apache-commons-codec.changes index 8bbe476..5403d84 100644 --- a/apache-commons-codec.changes +++ b/apache-commons-codec.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 2 13:00:19 UTC 2012 - mvyskocil@suse.cz + +- add junit4 to fix a build fail + ------------------------------------------------------------------- Tue Feb 28 09:59:47 UTC 2012 - mvyskocil@suse.cz diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 1fb77d6..6240e27 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -62,6 +62,7 @@ Source4: MANIFEST.MF BuildRequires: ant >= 1.7 BuildRequires: ant-junit >= 1.7 +BuildRequires: junit4 BuildRequires: java-devel >= 1.6.0 %if %with maven @@ -136,12 +137,12 @@ export MAVEN_OPTS="-Dmaven2.jpp.mode=true -Dmaven2.jpp.depmap.file=%{SOURCE2} -D install javadoc:javadoc %else -export CLASSPATH=$(build-classpath junit) -ant -Dbuild.sysclasspath=first \ +export CLASSPATH=$(build-classpath junit4) +ant -v -d -Dbuild.sysclasspath=first \ -Dconf.home=src/conf \ -Dbuild.home=build \ - -Dsource.home=src/java \ - -Dtest.home=src/test \ + -Dsource.home=src/main/java \ + -Dtest.home=src/test/java \ -Ddist.home=dist \ -Dcomponent.title=%{short_name} \ -Dcomponent.version=%{version} \