From 1132bed359d314bb4020a2b0ef452684f2e5176d46c3b2dc0859f244bf0d690f Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 18 Oct 2023 17:21:07 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=69

---
 geronimo-specs.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/geronimo-specs.spec b/geronimo-specs.spec
index 3255bfa..489e2e0 100644
--- a/geronimo-specs.spec
+++ b/geronimo-specs.spec
@@ -52,9 +52,6 @@ BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
-BuildRequires:  junit >= 3.8.1
-BuildConflicts: java-devel-openj9
-BuildConflicts: java-headless-openj9
 BuildArch:      noarch
 
 %description

From 15764c88bedb3d29950666bcd4e4d6169a0dd7d59b552e2bbaec0216941a2a46 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 20 Oct 2023 16:46:08 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=71

---
 geronimo-specs-1.2-src.tar.xz |  4 ++--
 geronimo-specs.build.xml      | 36 +++++++++++------------------------
 geronimo-specs.changes        |  5 +++++
 geronimo-specs.spec           | 32 +++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/geronimo-specs-1.2-src.tar.xz b/geronimo-specs-1.2-src.tar.xz
index f7d5e8a..a9f2027 100644
--- a/geronimo-specs-1.2-src.tar.xz
+++ b/geronimo-specs-1.2-src.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2594b5ebe6e086e3e65086403a2457b144e36b23af01b60b0733c4f37a75dc4b
-size 153244
+oid sha256:e47962228b66b07a6e0789df985de5074ad4738ab002328e6e5bbdf7a176f03b
+size 159836
diff --git a/geronimo-specs.build.xml b/geronimo-specs.build.xml
index c4f5331..fc1b955 100644
--- a/geronimo-specs.build.xml
+++ b/geronimo-specs.build.xml
@@ -24,6 +24,11 @@
   <property name="annotation.dir" value="${annotation.id}-${annotation}" />
   <property name="annotation.jar" value="${annotation.id}-${annotation.ver}.jar" />
   
+  <property name="connector"      value="1.1.1" />
+  <property name="connector.id"   value="geronimo-j2ee-connector_1.5_spec" />
+  <property name="connector.dir"  value="${connector.id}-${connector}" />
+  <property name="connector.jar"  value="${connector.dir}.jar" />
+  
   <property name="jaxrpc"         value="1.1" />
   <property name="jaxrpc.id"      value="geronimo-jaxrpc_1.1_spec" />
   <property name="jaxrpc.dir"     value="${jaxrpc.id}-${jaxrpc}" />
@@ -69,7 +74,7 @@
   <target name="dist" depends="build">
   </target>
   
-  <target name="build" depends="activation102, activation110, annotation, jaxrpc, jms, jpa, jta10, jta11, qname, saaj, servlet24, servlet25">
+  <target name="build" depends="activation102, activation110, annotation, connector, jaxrpc, jms, jpa, jta10, jta11, qname, saaj, servlet24, servlet25">
   </target>
 
   <!--
@@ -139,31 +144,12 @@ artifactId=${gbuild.id}
       </antcall>
   </target>
   
-  <target name="javamail13" depends="activation102">
+  <target name="connector">
       <antcall target="gbuild">
-          <param name="gbuild.dir" value="${javamail13.dir}" />
-          <param name="gbuild.jar" value="${javamail13.jar}" />
-          <param name="gbuild.id"  value="${javamail13.id}" />
-          <param name="gbuild.ver" value="${javamail13}" />
-          <param name="gbuild.classpath" value="${activation102.dir}/${dist}/${activation102.jar}"/>
-      </antcall>
-  </target>
-  
-  <target name="javamail14" depends="activation102">
-      <antcall target="gbuild">
-          <param name="gbuild.dir" value="${javamail14.dir}" />
-          <param name="gbuild.jar" value="${javamail14.jar}" />
-          <param name="gbuild.classpath" value="${activation102.dir}/${dist}/${activation102.jar}"/>
-      </antcall>
-  </target>
-
-  <target name="jaxr" depends="activation102">
-      <antcall target="gbuild">
-          <param name="gbuild.dir" value="${jaxr.dir}" />
-          <param name="gbuild.jar" value="${jaxr.jar}" />
-          <param name="gbuild.id"  value="${jaxr.id}" />
-          <param name="gbuild.ver" value="${jaxr}" />
-          <param name="gbuild.classpath" value="${activation102.dir}/${dist}/${activation102.jar}"/>
+          <param name="gbuild.dir" value="${connector.dir}" />
+          <param name="gbuild.jar" value="${connector.jar}" />
+          <param name="gbuild.id"  value="${connector.id}" />
+          <param name="gbuild.ver" value="${connector}" />
       </antcall>
   </target>
   
diff --git a/geronimo-specs.changes b/geronimo-specs.changes
index 6a00f1c..e7749f3 100644
--- a/geronimo-specs.changes
+++ b/geronimo-specs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 20 16:45:54 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Bringing back geronimo-j2ee-connector-1_5-api
+
 -------------------------------------------------------------------
 Tue Oct 17 18:45:36 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/geronimo-specs.spec b/geronimo-specs.spec
index 489e2e0..1267653 100644
--- a/geronimo-specs.spec
+++ b/geronimo-specs.spec
@@ -31,6 +31,7 @@ Source0:        %{name}-%{version}-src.tar.xz
 # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-activation_1.0.2_spec-1.2/
 # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-activation_1.1_spec-1.0/
 # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-annotation_1.0_spec-1.1.0/
+# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-connector_1.5_spec-1.1.1/
 # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jaxrpc_1.1_spec-1.1/
 # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jms_1.1_spec-1.1/
 # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jpa_3.0_spec-1.1.0/
@@ -108,6 +109,22 @@ J2EE-Specifications Note: You should use the subpackages for the
 Specifications that you actually need.	The ones installed by the main
 package are deprecated and will disapear in future releases.
 
+%package -n geronimo-j2ee-connector-1_5-api
+Summary:        Geronimo J2EE server J2EE specifications
+Group:          Development/Languages/Java
+Requires:       jta_1_0_1B_api
+Requires(pre):  update-alternatives
+Provides:       j2ee_connector_1_5_api = %{version}
+Provides:       j2ee_connector_api = 1.5
+# drop the following asap
+Provides:       j2ee-connector = 1.5
+Obsoletes:      %{name}-poms
+Obsoletes:      j2ee-connector
+
+%description -n geronimo-j2ee-connector-1_5-api
+Geronimo is Apache's ASF-licenced J2EE server project. These are the
+J2EE-Specifications: J2EE Connector Architecture Specification
+
 %package -n geronimo-jaxrpc-1_1-api
 Summary:        Geronimo JAXRPC 1.1 Specification
 Group:          Development/Languages/Java
@@ -276,6 +293,13 @@ install -m 0644 \
   %{buildroot}/%{_mavenpomdir}/JPP-geronimo-annotation-1.0-api.pom
 %add_maven_depmap JPP-geronimo-annotation-1.0-api.pom geronimo-annotation-1.0-api.jar -a "javax.annotation:jsr250-api,org.eclipse.jetty.orbit:javax.annotation" -f annotation-1.0-api
 
+install -m 0644 \
+  geronimo-j2ee-connector_1.5_spec-1.1.1/target/geronimo-j2ee-connector_1.5_spec-1.1.1.jar \
+  %{buildroot}%{_javadir}/geronimo-j2ee-connector-1.5-api.jar
+%{mvn_install_pom} geronimo-j2ee-connector_1.5_spec-1.1.1/pom.xml \
+  %{buildroot}/%{_mavenpomdir}/JPP-geronimo-j2ee-connector-1.5-api.pom
+%add_maven_depmap JPP-geronimo-j2ee-connector-1.5-api.pom geronimo-j2ee-connector-1.5-api.jar -f j2ee-connector-1.5-api
+
 install -m 0644 \
   geronimo-jaxrpc_1.1_spec-1.1/target/geronimo-jaxrpc_1.1_spec-1.1.jar \
   %{buildroot}%{_javadir}/geronimo-jaxrpc-1.1-api.jar
@@ -353,6 +377,11 @@ update-alternatives --remove jaf_1_1_api %{_javadir}/geronimo-jaf-1.1-api.jar
 update-alternatives --remove annotation_api %{_javadir}/geronimo-annotation-1.0-api.jar
 update-alternatives --remove annotation_1_0_api %{_javadir}/geronimo-annotation-1.0-api.jar
 
+%pre -n geronimo-j2ee-connector-1_5-api
+update-alternatives --remove j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar
+update-alternatives --remove j2ee_connector_api %{_javadir}/geronimo-j2ee-connector-1.5-api.jar
+update-alternatives --remove j2ee_connector_1_5_api %{_javadir}/geronimo-j2ee-connector-1.5-api.jar
+
 %pre -n geronimo-jaxrpc-1_1-api
 update-alternatives --remove jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar
 update-alternatives --remove jaxrpc_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar
@@ -405,6 +434,9 @@ update-alternatives --remove servlet_2_5_api %{_javadir}/geronimo-servlet-2.5-ap
 %files -n geronimo-annotation-1_0-api -f .mfiles-annotation-1.0-api
 %license geronimo-annotation_1.0_spec-1.1.0/LICENSE.txt
 
+%files -n geronimo-j2ee-connector-1_5-api -f .mfiles-j2ee-connector-1.5-api
+%license geronimo-j2ee-connector_1.5_spec-1.1.1/LICENSE.txt
+
 %files -n geronimo-jaxrpc-1_1-api -f .mfiles-jaxrpc-1.1-api
 %license geronimo-jaxrpc_1.1_spec-1.1/LICENSE.txt