diff --git a/org.eclipse.sisu.inject-0.3.3.tar.xz b/org.eclipse.sisu.inject-0.3.3.tar.xz deleted file mode 100644 index 0f6e2d7..0000000 --- a/org.eclipse.sisu.inject-0.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3485561cd3bfe874b70aa773fac0d2de9038c25b794ea21594b05b20c172ade -size 213620 diff --git a/org.eclipse.sisu.inject-0.3.4.tar.gz b/org.eclipse.sisu.inject-0.3.4.tar.gz new file mode 100644 index 0000000..8968e80 --- /dev/null +++ b/org.eclipse.sisu.inject-0.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f505141dfd24c1f9ebafc8efbf6c65bfcc28ca88e65e874dfade454f1a88a0ef +size 296627 diff --git a/org.eclipse.sisu.plexus-0.3.3.tar.xz b/org.eclipse.sisu.plexus-0.3.3.tar.xz deleted file mode 100644 index d6cba46..0000000 --- a/org.eclipse.sisu.plexus-0.3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:424bc833be5096407e6b6fb4dc93d3cbe503be0b78e40f0ef497570b4e8403b8 -size 361580 diff --git a/org.eclipse.sisu.plexus-0.3.4.tar.gz b/org.eclipse.sisu.plexus-0.3.4.tar.gz new file mode 100644 index 0000000..e7963a2 --- /dev/null +++ b/org.eclipse.sisu.plexus-0.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4496d7e42bd38b05d1af5dcef2954a540410682796533045d3f5eb0ebac4572e +size 389934 diff --git a/sisu-build.tar.xz b/sisu-build.tar.xz index ced1567..2d63ed1 100644 --- a/sisu-build.tar.xz +++ b/sisu-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9fe54646eba5cdd6c2ca57626b307a18740f0701fd89f10cb8337fd2e38e3c0f -size 1964 +oid sha256:9ff9a819664f6bd786d4d4e203bcaff759475c9f21a3b51162000c10276e7887 +size 1984 diff --git a/sisu.spec b/sisu.spec index 6ce30d7..d79e33d 100644 --- a/sisu.spec +++ b/sisu.spec @@ -1,7 +1,7 @@ # # spec file for package sisu # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,16 @@ %global reltype release -#global reltag .M1 Name: sisu -Version: 0.3.3 +Version: 0.3.4 Release: 0 Summary: Eclipse dependency injection framework # sisu is EPL-1.0, bundled asm is BSD -License: EPL-1.0 AND BSD-3-Clause +License: BSD-3-Clause AND EPL-1.0 Group: Development/Libraries/Java URL: http://eclipse.org/sisu -Source0: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.inject.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.xz#/org.eclipse.%{name}.inject-%{version}%{?reltag}.tar.xz -Source1: http://git.eclipse.org/c/%{name}/org.eclipse.%{name}.plexus.git/snapshot/%{reltype}s/%{version}%{?reltag}.tar.xz#/org.eclipse.%{name}.plexus-%{version}%{?reltag}.tar.xz +Source0: http://git.eclipse.org/c/sisu/org.eclipse.sisu.inject.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.inject-%{version}.tar.gz +Source1: http://git.eclipse.org/c/sisu/org.eclipse.sisu.plexus.git/snapshot/releases/%{version}.tar.gz#/org.eclipse.sisu.plexus-%{version}.tar.gz Source2: %{name}-build.tar.xz Source100: %{name}-inject.pom Source101: %{name}-plexus.pom @@ -50,6 +49,7 @@ BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-utils BuildRequires: slf4j BuildRequires: testng +BuildRequires: unzip BuildRequires: xmvn-install BuildRequires: xmvn-resolve BuildRequires: xz @@ -83,11 +83,12 @@ This package contains %{summary}. %prep %setup -q -c -T -tar -xf %{SOURCE0} && mv %{reltype}s/* sisu-inject && rmdir %{reltype}s +tar xf %{SOURCE0} && mv releases/* sisu-inject && rmdir releases +tar xf %{SOURCE1} && mv releases/* sisu-plexus && rmdir releases +tar xf %{SOURCE2} + cp %{SOURCE100} sisu-inject/pom.xml -tar -xf %{SOURCE1} && mv %{reltype}s/* sisu-plexus && rmdir %{reltype}s cp %{SOURCE101} sisu-plexus/pom.xml -tar -xf %{SOURCE2} %patch0 %patch2