commit 75ec8d82de8f6322efd988d07a24e8fbdf28323a Author: Michal Srb msrb@redhat.com Date: Thu Jan 22 16:53:10 2015 +0100
Incorporate multiverse
groovy.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/groovy.spec b/groovy.spec index d090f35..60551a4 100644 --- a/groovy.spec +++ b/groovy.spec @@ -36,6 +36,7 @@ BuildRequires: antlr-tool BuildRequires: ant-antlr BuildRequires: aqute-bnd BuildRequires: gpars +BuildRequires: multiverse BuildRequires: apache-parent BuildRequires: testng BuildRequires: jline @@ -132,6 +133,9 @@ ln -sf ../../java/%{name}/groovy-all.jar %{buildroot}%{_datadir}/%{name}/embedda find %{buildroot}%{_datadir}/%{name}/lib/ ! -name "groovy*" -type f -print -delete xmvn-subst %{buildroot}%{_datadir}/%{name}/
+# $GROOVY_HOME/lib probably contains much more JARs (optional deps?) than is actually needed. +# These extra JARs can cause problems, e.g. rhbz#1184269. +# From that reason, let's symlink needed JARs manually for now. ln -sf `build-classpath ant/ant` %{buildroot}%{_datadir}/%{name}/lib/ant.jar ln -sf `build-classpath ant/ant-antlr` %{buildroot}%{_datadir}/%{name}/lib/ant-antlr.jar ln -sf `build-classpath ant/ant-junit` %{buildroot}%{_datadir}/%{name}/lib/ant-junit.jar @@ -149,8 +153,7 @@ ln -sf `build-classpath glassfish-jsp-api` %{buildroot}%{_datadir}/%{name}/lib/j # part of JDK7+ (?) #ln -sf `build-classpath jsr166y` %{buildroot}%{_datadir}/%{name}/lib/jsr166y.jar ln -sf `build-classpath junit` %{buildroot}%{_datadir}/%{name}/lib/junit.jar -# TODO: do we need this? -#ln -sf `build-classpath multiverse-core` %{buildroot}%{_datadir}/%{name}/lib/multiverse-core.jar +ln -sf `build-classpath multiverse/multiverse-core` %{buildroot}%{_datadir}/%{name}/lib/multiverse-core.jar # Android support, removed by patch #ln -sf `build-classpath openbeans` %{buildroot}%{_datadir}/%{name}/lib/openbeans.jar ln -sf `build-classpath qdox` %{buildroot}%{_datadir}/%{name}/lib/qdox.jar
java-sig-commits@lists.fedoraproject.org