pool/sisu
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=23

Browse Source
This commit is contained in:
Fridrich Strba 2024-02-21 17:35:51 +00:00 committed by Git OBS Bridge
parent a1cae13252
commit a352aa3630
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sisu.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 21 17:35:46 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 5 13:09:17 UTC 2023 - Fridrich Strba <fstrba@suse.com> Tue Sep 5 13:09:17 UTC 2023 - Fridrich Strba <fstrba@suse.com>

20
sisu.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package sisu # spec file for package sisu
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -42,7 +42,7 @@ BuildRequires: fdupes
BuildRequires: glassfish-annotation-api BuildRequires: glassfish-annotation-api
BuildRequires: google-guice BuildRequires: google-guice
BuildRequires: guice-servlet BuildRequires: guice-servlet
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: junit BuildRequires: junit
BuildRequires: osgi-core BuildRequires: osgi-core
BuildRequires: plexus-classworlds BuildRequires: plexus-classworlds
@ -94,18 +94,16 @@ tar xf %{SOURCE2}
cp %{SOURCE100} sisu-inject/pom.xml cp %{SOURCE100} sisu-inject/pom.xml
cp %{SOURCE101} sisu-plexus/pom.xml cp %{SOURCE101} sisu-plexus/pom.xml
%patch0 %patch -P 0
%patch1 %patch -P 1
%patch2 %patch -P 2
%patch3 %patch -P 3
%patch4 -p1 %patch -P 4 -p1
%pom_remove_dep :servlet-api sisu-inject %pom_remove_dep :servlet-api sisu-inject
for i in inject plexus; do for i in inject plexus; do
%pom_xpath_set -r /pom:project/pom:version %{version} %{name}-${i} %pom_xpath_set -r /pom:project/pom:version %{version} %{name}-${i}
%pom_remove_dep :::provided: %{name}-${i}
%pom_xpath_remove pom:project/pom:build %{name}-${i}
done done
%pom_change_dep :org.eclipse.sisu.inject org.eclipse.sisu:org.eclipse.sisu.inject:%{version} %{name}-plexus %pom_change_dep :org.eclipse.sisu.inject org.eclipse.sisu:org.eclipse.sisu.inject:%{version} %{name}-plexus
@ -134,9 +132,9 @@ install -pm 0644 %{name}-plexus/target/org.eclipse.sisu.plexus-%{version}.jar %{
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir} install -dm 0755 %{buildroot}%{_mavenpomdir}
install -pm 0644 %{name}-inject/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom %mvn_install_pom %{name}-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 %add_maven_depmap org.eclipse.sisu.inject.pom org.eclipse.sisu.inject.jar -f inject
install -pm 0644 %{name}-plexus/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.plexus.pom %mvn_install_pom %{name}-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
# javadoc # javadoc