From cc0e5f835900275a705752bb6ef165188183e65539b4bde7b63c4b48a2addd7f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 May 2024 19:40:10 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=53 --- modello-maven-plugin.spec | 6 +++--- modello.spec | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modello-maven-plugin.spec b/modello-maven-plugin.spec index 93187b9..e5d9070 100644 --- a/modello-maven-plugin.spec +++ b/modello-maven-plugin.spec @@ -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 diff --git a/modello.spec b/modello.spec index da3141b..0a17c45 100644 --- a/modello.spec +++ b/modello.spec @@ -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 From 9ec9a53ef0dd440621e0df61e1a50dbd791231f299db295bbe4cd11d3a7d71ed Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 May 2024 05:24:37 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=54 --- modello-maven-plugin.changes | 5 +++++ modello.changes | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/modello-maven-plugin.changes b/modello-maven-plugin.changes index 1907a5a..3c9b585 100644 --- a/modello-maven-plugin.changes +++ b/modello-maven-plugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 16 05:23:46 UTC 2024 - Fridrich Strba + +- Package both relevant licenses + ------------------------------------------------------------------- Sat May 4 12:02:36 UTC 2024 - Fridrich Strba diff --git a/modello.changes b/modello.changes index da9a159..46b3527 100644 --- a/modello.changes +++ b/modello.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 16 05:23:46 UTC 2024 - Fridrich Strba + +- Package both relevant licenses + ------------------------------------------------------------------- Sat May 4 12:02:36 UTC 2024 - Fridrich Strba