Fridrich Strba 2024-04-15 07:32:42 +00:00 committed by Git OBS Bridge
parent 9942d89e8b
commit 5d6d466c39
3 changed files with 9 additions and 7 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:73aaa91e5257affba64b5ce72eae0a8f40e999bd48bd2c1caf5ec792bb781c14
size 4472
oid sha256:b8d4a4762a66a6f86ad5569afb60e38b0de736799f2f3a97d72f5eac207c50fb
size 4736

View File

@ -111,12 +111,15 @@ rm -f modello-maven-plugin/src/main/java/org/codehaus/modello/maven/ModelloVeloc
%build
pushd %{name}
%{mvn_file} :{*} %{parent}/@1
%{mvn_build} -f -- -Dsource=8
popd
%install
pushd %{name}
%mvn_install
popd
%fdupes -s %{buildroot}%{_javadocdir}

View File

@ -35,6 +35,7 @@ BuildRequires: atinject
BuildRequires: fdupes
BuildRequires: google-guice
BuildRequires: guava
BuildRequires: jackson-core
BuildRequires: javadoc-parser
BuildRequires: javapackages-local >= 6
BuildRequires: jsoup
@ -52,6 +53,7 @@ Requires: aopalliance
Requires: atinject
Requires: google-guice
Requires: guava
Requires: jackson-core
Requires: javadoc-parser
Requires: javapackages-tools
Requires: plexus-build-api
@ -95,12 +97,8 @@ cp -p %{SOURCE1} LICENSE
%pom_remove_dep :jackson-bom
%pom_disable_module modello-plugin-jackson modello-plugins
%pom_disable_module modello-plugin-jsonschema modello-plugins
%pom_disable_module modello-plugin-snakeyaml modello-plugins
%pom_disable_module modello-plugin-velocity modello-plugins
%pom_remove_dep :modello-plugin-jackson modello-maven-plugin
%pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin
%pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin
%pom_remove_dep :modello-plugin-velocity modello-maven-plugin
@ -115,6 +113,7 @@ build-jar-repository -s lib \
atinject \
guava/guava \
guice/google-guice \
jackson-core \
javadoc-parser \
jsoup \
org.eclipse.sisu.inject \
@ -172,7 +171,7 @@ done
%fdupes -s %{buildroot}%{_javadocdir}
# script
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:objectweb-asm:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:javadoc-parser:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/xml:plexus/plexus-build-api:guava:slf4j/api:slf4j/simple %{name} true
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:objectweb-asm:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:jackson-core:javadoc-parser:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/xml:plexus/plexus-build-api:guava:slf4j/api:slf4j/simple %{name} true
%files -f .mfiles
%license LICENSE