Fridrich Strba 2019-11-22 05:07:51 +00:00 committed by Git OBS Bridge
parent 5e3a14e41c
commit 514c58a5a7

View File

@ -39,7 +39,7 @@ BuildRequires: plexus-containers-container-default
BuildRequires: plexus-utils
BuildRequires: snakeyaml
BuildRequires: unzip
Requires: guava20
Requires: guava
# Explicit javapackages-tools requires since modello script uses
# /usr/share/java-utils/java-functions
Requires: javapackages-tools
@ -88,7 +88,7 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml
mkdir -p lib
build-jar-repository -s lib plexus/classworlds plexus/utils plexus/plexus-build-api \
plexus-containers/plexus-container-default plexus-compiler/plexus-compiler-api junit \
plexus-compiler/plexus-compiler-javac jsoup snakeyaml guava20/guava-20.0 xbean/xbean-reflect
plexus-compiler/plexus-compiler-javac jsoup snakeyaml guava/guava xbean/xbean-reflect
# skip tests because we have too old xmlunit in openSUSE now (1.5)
%{ant} \
-Dtest.skip=true \
@ -141,7 +141,7 @@ done
%fdupes -s %{buildroot}%{_javadocdir}
# script
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:plexus-containers/plexus-container-default:plexus/classworlds:plexus/utils:plexus/plexus-build-api:xbean/xbean-reflect:guava20 %{name} true
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:plexus-containers/plexus-container-default:plexus/classworlds:plexus/utils:plexus/plexus-build-api:xbean/xbean-reflect:guava %{name} true
%files -f .mfiles
%license LICENSE