From 101e331b3fcbbfbe711d44035cbade70c27cfc55a78b9e873264eaaa2be52e24 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 10 Apr 2024 08:43:52 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/atinject?expand=0&rev=26

---
 1.0.5.tar.gz       |  4 ++--
 atinject-build.xml |  7 +++++--
 atinject.changes   |  7 +++++++
 atinject.spec      | 14 ++++++--------
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/1.0.5.tar.gz b/1.0.5.tar.gz
index a85804a..f8db5b7 100644
--- a/1.0.5.tar.gz
+++ b/1.0.5.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1ea99beee783b0f7bf4a366e052abe09255cbd51b806841c0841bab8184c420
-size 15258
+oid sha256:582134953ffc75cd517e5f3449e8d2562f31986dd9c6f8c3b3d0af3df17bf4cb
+size 15269
diff --git a/atinject-build.xml b/atinject-build.xml
index 1bafbd6..84347b5 100644
--- a/atinject-build.xml
+++ b/atinject-build.xml
@@ -19,6 +19,7 @@
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
+  <property name="build.outputDirJava9" value="${build.outputDir}/META-INF/versions/9"/>
   <property name="build.srcDir" value="src/main/java"/>
   <property name="build.srcDirJava9" value="src/main/java9"/>
   <property name="build.resourceDir" value="."/>
@@ -55,7 +56,8 @@
 	  <exclude name="**/module-info.java"/>
     </javac>
     <!-- compile the module-info.java -->
-    <!-- <javac destdir="${build.outputDir}"
+    <mkdir dir="${build.outputDirJava9}"/>
+    <javac destdir="${build.outputDirJava9}"
            nowarn="false"
            debug="true"
            encoding="utf-8"
@@ -69,7 +71,7 @@
         <pathelement location="${build.srcDirJava9}"/>
       </src>
 	  <include name="**/module-info.java"/>
-    </javac> -->
+    </javac>
     <mkdir dir="${build.outputDir}/META-INF"/>
     <copy todir="${build.outputDir}/META-INF">
       <fileset dir="${build.resourceDir}">
@@ -129,6 +131,7 @@
 		<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
 		<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
 		<attribute name="JavaPackages-Version" value="${project.version}"/>
+		<attribute name="Multi-Release" value="true"/>
 		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
       </manifest>
     </jar>
diff --git a/atinject.changes b/atinject.changes
index 73277f0..2fbbf21 100644
--- a/atinject.changes
+++ b/atinject.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr 10 08:19:26 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 1.0.5 and switch to sources in
+  https://github.com/jakartaee/inject/
+- Remove unused sub-package tck
+
 -------------------------------------------------------------------
 Sat Apr  2 18:23:08 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/atinject.spec b/atinject.spec
index f0cd0bf..2d948b8 100644
--- a/atinject.spec
+++ b/atinject.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package atinject
 #
-# Copyright (c) 2023 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
@@ -21,13 +21,13 @@ Version:        1.0.5
 Release:        0
 Summary:        Dependency injection specification for Java (JSR-330)
 License:        Apache-2.0
-URL:            https://github.com/eclipse-ee4j/injection-api
-Source0:        https://github.com/eclipse-ee4j/injection-api/archive/%{version}.tar.gz
+URL:            https://github.com/jakartaee/inject/
+Source0:        https://github.com/jakartaee/inject/archive/%{version}.tar.gz
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 Obsoletes:      %{name}-tck
 BuildArch:      noarch
 
@@ -46,11 +46,9 @@ Group:          Documentation/HTML
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n injection-api-%{version}
+%setup -q -n inject-%{version}
 cp %{SOURCE1} build.xml
 
-%pom_remove_parent
-
 %build
 %{ant} package javadoc
 
@@ -62,7 +60,7 @@ install -m 0644 target/jakarta.inject-api-%{version}.jar %{buildroot}%{_javadir}
 
 # pom
 install -dm 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar -a javax.inject:javax.inject
 
 # javadoc