Accepting request 1174351 from Java:packages

Package both relevant licenses

OBS-URL: https://build.opensuse.org/request/show/1174351
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/modello?expand=0&rev=17
This commit is contained in:
Ana Guerrero 2024-05-16 15:15:57 +00:00 committed by Git OBS Bridge
commit f1edeee7f7
4 changed files with 17 additions and 7 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 16 05:23:46 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Package both relevant licenses
-------------------------------------------------------------------
Sat May 4 12:02:36 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -86,7 +86,7 @@ API documentation for %{name}.
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 2 -p1
cp -p %{SOURCE1} LICENSE
cp -p %{SOURCE1} .
%pom_remove_plugin :maven-site-plugin
%pom_remove_plugin :maven-enforcer-plugin
@ -114,9 +114,9 @@ popd
%fdupes -s %{buildroot}%{_javadocdir}
%files -f %{name}/.mfiles
%license LICENSE
%license LICENSE.txt LICENSE-2.0.txt
%files javadoc -f %{name}/.mfiles-javadoc
%license LICENSE
%license LICENSE.txt LICENSE-2.0.txt
%changelog

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 16 05:23:46 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Package both relevant licenses
-------------------------------------------------------------------
Sat May 4 12:02:36 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -99,7 +99,7 @@ API documentation for %{name}.
%patch -P 0 -p1
%patch -P 1 -p1
%patch -P 2 -p1
cp -p %{SOURCE1} LICENSE
cp -p %{SOURCE1} .
%pom_remove_plugin :maven-site-plugin
%pom_remove_plugin :maven-enforcer-plugin
@ -166,14 +166,14 @@ done
%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:aopalliance:atinject:google-guice:guava:jackson-core:javadoc-parser:plexus/plexus-build-api:plexus/plexus-build-api0:plexus/classworlds:plexus-containers/plexus-component-annotations:plexus/utils:plexus/xml:org.eclipse.sisu.inject:org.eclipse.sisu.plexus:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true
%files -f .mfiles -f .mfiles-core
%license LICENSE
%license LICENSE.txt LICENSE-2.0.txt
%{_bindir}/*
%files test -f .mfiles-test
%license LICENSE
%license LICENSE.txt LICENSE-2.0.txt
%files javadoc
%license LICENSE
%license LICENSE.txt LICENSE-2.0.txt
%{_javadocdir}/%{name}
%changelog