From 12f8e4dc81fa8cf67536ef6f7eef962c9643f6f8d5dd9c1d7c3f93c46449cfcd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 May 2024 19:25:16 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=30 --- sisu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sisu.spec b/sisu.spec index 701e3cf..9d65fe7 100644 --- a/sisu.spec +++ b/sisu.spec @@ -120,7 +120,7 @@ install -dm 0755 %{buildroot}%{_mavenpomdir} %{mvn_install_pom} %{name}-inject/org.eclipse.sisu.inject/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom %add_maven_depmap org.eclipse.sisu.inject.pom org.eclipse.sisu.inject.jar -f inject %{mvn_install_pom} %{name}-plexus/org.eclipse.sisu.plexus/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.plexus.pom -%add_maven_depmap org.eclipse.sisu.plexus.pom org.eclipse.sisu.plexus.jar -f plexus -a org.sonatype.sisu:sisu-inject-plexus +%add_maven_depmap org.eclipse.sisu.plexus.pom org.eclipse.sisu.plexus.jar -f plexus -a org.sonatype.sisu:sisu-inject-plexus,org.codehaus.plexus:plexus-container-default # javadoc for i in inject plexus; do From fb6c3333f85f629e7ed37fd54ea8be5239f378c7cfe6550a8dd649ab5efe7936 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 15 May 2024 19:39:17 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=31 --- sisu.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sisu.spec b/sisu.spec index 9d65fe7..b883c72 100644 --- a/sisu.spec +++ b/sisu.spec @@ -68,6 +68,7 @@ This package contains %{summary}. Summary: Sisu Plexus Group: Development/Libraries/Java Requires: %{name}-inject = %{version} +Obsoletes: plexus-containers-container-default %description plexus This package contains %{summary}. From c0a86638427ed072a092dd2a114a508e369b3e9019968ef820379b13e687c022 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 May 2024 04:35:44 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=32 --- sisu.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sisu.spec b/sisu.spec index b883c72..8c04d48 100644 --- a/sisu.spec +++ b/sisu.spec @@ -25,8 +25,8 @@ Summary: Eclipse dependency injection framework License: BSD-3-Clause AND EPL-1.0 Group: Development/Libraries/Java URL: https://www.eclipse.org/sisu/ -Source0: https://github.com/eclipse/sisu.inject/archive/refs/tags/%reltype/%{version}.tar.gz#/sisu-inject-%{version}.tar.gz -Source1: https://github.com/eclipse/sisu.plexus/archive/refs/tags/%reltype/%{version}.tar.gz#/sisu-plexus-%{version}.tar.gz +Source0: https://github.com/eclipse/sisu.inject/archive/refs/tags/%{reltype}/%{version}.tar.gz#/sisu-inject-%{version}.tar.gz +Source1: https://github.com/eclipse/sisu.plexus/archive/refs/tags/%{reltype}/%{version}.tar.gz#/sisu-plexus-%{version}.tar.gz Source2: %{name}-build.tar.xz Patch1: %{name}-no-dependency-on-glassfish-servlet-api.patch Patch3: %{name}-osgi-api.patch @@ -68,7 +68,8 @@ This package contains %{summary}. Summary: Sisu Plexus Group: Development/Libraries/Java Requires: %{name}-inject = %{version} -Obsoletes: plexus-containers-container-default +Obsoletes: plexus-containers-container-default < 2.2.0 +Provides: plexus-containers-container-default = 2.2.0 %description plexus This package contains %{summary}. @@ -115,6 +116,9 @@ install -pm 0644 %{name}-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu. %{buildroot}%{_javadir}/org.eclipse.sisu.inject.jar install -pm 0644 %{name}-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar \ %{buildroot}%{_javadir}/org.eclipse.sisu.plexus.jar +# Compatibility symlink +install -dm 0755 %{buildroot}%{_javadir}/plexus-containers +ln -sf %{_javadir}/org.eclipse.sisu.plexus.jar %{buildroot}%{_javadir}/plexus-containers/plexus-container-default.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir} @@ -134,6 +138,7 @@ done %license sisu-inject/LICENSE.txt %files plexus -f .mfiles-plexus +%{_javadir}/plexus-containers %files javadoc %license sisu-inject/LICENSE.txt From 249d88fd11c88e147ba4f4985a003a7d3e4805d1a3cc48d3aa435b58c8df8e32 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 May 2024 13:08:31 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=33 --- sisu.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sisu.changes b/sisu.changes index 75623a0..e4a42d1 100644 --- a/sisu.changes +++ b/sisu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 16 13:08:26 UTC 2024 - Fridrich Strba + +- Provide plexus-containers-container-default for easier update + ------------------------------------------------------------------- Sun Apr 14 09:36:52 UTC 2024 - Fridrich Strba