From 72b9021103fa383eeb5098787be8a9133944423f259e7ef2dea9f8d95cd12b79 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 5 Jun 2024 13:58:11 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/sisu?expand=0&rev=35

---
 sisu-build.tar.xz            |  4 ++--
 sisu-inject-0.9.0.M2.tar.gz  |  3 ---
 sisu-plexus-0.9.0.M2.tar.gz  |  3 ---
 sisu-project-0.9.0.M3.tar.gz |  3 +++
 sisu.spec                    | 32 ++++++++++++++------------------
 5 files changed, 19 insertions(+), 26 deletions(-)
 delete mode 100644 sisu-inject-0.9.0.M2.tar.gz
 delete mode 100644 sisu-plexus-0.9.0.M2.tar.gz
 create mode 100644 sisu-project-0.9.0.M3.tar.gz

diff --git a/sisu-build.tar.xz b/sisu-build.tar.xz
index 008edc6..a6183ca 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:40cd836ba9574f7dd4c8c359dde4e41951e6608df4e6613b68fc3b62e237a821
-size 3604
+oid sha256:3178c9ed9fb9e4e173a5d9646e7cb58e84597b7c0b5646d75fd178cec972fe20
+size 3316
diff --git a/sisu-inject-0.9.0.M2.tar.gz b/sisu-inject-0.9.0.M2.tar.gz
deleted file mode 100644
index 7aed333..0000000
--- a/sisu-inject-0.9.0.M2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:087d6cb468026936e1fa03edfd1a96450997043e1876fa737ce91dd476301b45
-size 3235791
diff --git a/sisu-plexus-0.9.0.M2.tar.gz b/sisu-plexus-0.9.0.M2.tar.gz
deleted file mode 100644
index 7c28770..0000000
--- a/sisu-plexus-0.9.0.M2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4189364def8ce23d0d84265c574b917dfd47512396832876f11ce3dc27c6858b
-size 400361
diff --git a/sisu-project-0.9.0.M3.tar.gz b/sisu-project-0.9.0.M3.tar.gz
new file mode 100644
index 0000000..eff2009
--- /dev/null
+++ b/sisu-project-0.9.0.M3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b3032e6d66bfdb166c956c6f9bdf661010be652f67900099f8ffd83ae07a8c2
+size 3772566
diff --git a/sisu.spec b/sisu.spec
index 8c04d48..fc7a0c3 100644
--- a/sisu.spec
+++ b/sisu.spec
@@ -18,16 +18,15 @@
 
 %global reltype milestones
 Name:           sisu
-Version:        0.9.0.M2
+Version:        0.9.0.M3
 Release:        0
 Summary:        Eclipse dependency injection framework
 # sisu is EPL-1.0, bundled asm is BSD
 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
-Source2:        %{name}-build.tar.xz
+Source0:        https://github.com/eclipse-sisu/sisu-project/archive/refs/tags/%{reltype}/%{version}.tar.gz#/sisu-project-%{version}.tar.gz
+Source1:        %{name}-build.tar.xz
 Patch1:         %{name}-no-dependency-on-glassfish-servlet-api.patch
 Patch3:         %{name}-osgi-api.patch
 Patch4:         %{name}-reproducible-index.patch
@@ -82,14 +81,11 @@ Group:          Documentation/HTML
 This package contains %{summary}.
 
 %prep
-%setup -q -c -T
-tar xf %{SOURCE0} && mv sisu.inject-%{reltype}-%{version} sisu-inject
-tar xf %{SOURCE1} && mv sisu.plexus-%{reltype}-%{version} sisu-plexus
-tar xf %{SOURCE2}
+%setup -q -n sisu-project-%{reltype}-%{version} -a1
 
-%patch -P 1
-%patch -P 3
-%patch -P 4 -p1
+%patch -P 1 -p1
+%patch -P 3 -p1
+%patch -P 4 -p2
 
 %build
 mkdir -p lib
@@ -112,9 +108,9 @@ build-jar-repository -s lib \
 %install
 # jar
 install -dm 0755 %{buildroot}%{_javadir}
-install -pm 0644 %{name}-inject/org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar \
+install -pm 0644 org.eclipse.sisu.inject/target/org.eclipse.sisu.inject-%{version}.jar \
     %{buildroot}%{_javadir}/org.eclipse.sisu.inject.jar
-install -pm 0644 %{name}-plexus/org.eclipse.sisu.plexus/target/org.eclipse.sisu.plexus-%{version}.jar \
+install -pm 0644 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
@@ -122,26 +118,26 @@ ln -sf %{_javadir}/org.eclipse.sisu.plexus.jar %{buildroot}%{_javadir}/plexus-co
 
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-%{mvn_install_pom} %{name}-inject/org.eclipse.sisu.inject/pom.xml %{buildroot}%{_mavenpomdir}/org.eclipse.sisu.inject.pom
+%{mvn_install_pom} 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
+%{mvn_install_pom} 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,org.codehaus.plexus:plexus-container-default
 
 # javadoc
 for i in inject plexus; do
   install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}
-  cp -pr %{name}-${i}/org.eclipse.sisu.${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
+  cp -pr org.eclipse.sisu.${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
 done
 %fdupes -s %{buildroot}%{_javadocdir}
 
 %files inject -f .mfiles-inject
-%license sisu-inject/LICENSE.txt
+%license LICENSE.txt
 
 %files plexus -f .mfiles-plexus
 %{_javadir}/plexus-containers
 
 %files javadoc
-%license sisu-inject/LICENSE.txt
+%license LICENSE.txt
 %{_javadocdir}/%{name}
 
 %changelog