From e704af2016df8771ffb8cac21f03632e17bdf3b77aeec5af4453a0e8266bb50f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 May 2024 18:22:36 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-velocity?expand=0&rev=12 --- plexus-velocity.spec | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/plexus-velocity.spec b/plexus-velocity.spec index 98bed2f..63764c0 100644 --- a/plexus-velocity.spec +++ b/plexus-velocity.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-velocity # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,12 +30,9 @@ BuildRequires: ant BuildRequires: apache-commons-collections BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local -BuildRequires: plexus-containers-container-default +BuildRequires: javapackages-local >= 6 +BuildRequires: sisu-plexus BuildRequires: velocity -Requires: mvn(commons-collections:commons-collections) -Requires: mvn(org.codehaus.plexus:plexus-container-default) -Requires: mvn(velocity:velocity) BuildArch: noarch %description @@ -58,11 +55,10 @@ find -name '*.jar' -delete cp -p %{SOURCE1} build.xml cp -p %{SOURCE2} LICENSE -%pom_xpath_inject pom:project "org.codehaus.plexus" -%pom_remove_parent +%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus mkdir -p lib -build-jar-repository -s lib commons-collections plexus-containers/plexus-container-default velocity +build-jar-repository -s lib commons-collections org.eclipse.sisu.plexus velocity %build ant jar javadoc @@ -73,7 +69,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name} install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} From 02c5f4f1fd5c9afa3e485c8279cc3462d4a73699132229c415b424192636d325 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 May 2024 19:41:45 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-velocity?expand=0&rev=13 --- plexus-velocity.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/plexus-velocity.spec b/plexus-velocity.spec index 63764c0..456f252 100644 --- a/plexus-velocity.spec +++ b/plexus-velocity.spec @@ -55,8 +55,6 @@ find -name '*.jar' -delete cp -p %{SOURCE1} build.xml cp -p %{SOURCE2} LICENSE -%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus - mkdir -p lib build-jar-repository -s lib commons-collections org.eclipse.sisu.plexus velocity From 29aa8af8f92b40060c2abc468cdb499be81fd0236deffc5a359280ad7715ff79 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 May 2024 05:07:12 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-velocity?expand=0&rev=14 --- plexus-velocity.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-velocity.changes b/plexus-velocity.changes index dfa8c68..9a90f39 100644 --- a/plexus-velocity.changes +++ b/plexus-velocity.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 16 05:07:02 UTC 2024 - Fridrich Strba + +- Use sisu-plexus instead of plexus-containers-container-default +- Clean up the spec file + ------------------------------------------------------------------- Tue Mar 29 14:22:10 UTC 2022 - Fridrich Strba