Fridrich Strba 2023-10-20 16:46:08 +00:00 committed by Git OBS Bridge
parent 1132bed359
commit 15764c88be
4 changed files with 50 additions and 27 deletions

BIN
geronimo-specs-1.2-src.tar.xz (Stored with Git LFS)

Binary file not shown.

View File

@ -24,6 +24,11 @@
<property name="annotation.dir" value="${annotation.id}-${annotation}" /> <property name="annotation.dir" value="${annotation.id}-${annotation}" />
<property name="annotation.jar" value="${annotation.id}-${annotation.ver}.jar" /> <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" value="1.1" />
<property name="jaxrpc.id" value="geronimo-jaxrpc_1.1_spec" /> <property name="jaxrpc.id" value="geronimo-jaxrpc_1.1_spec" />
<property name="jaxrpc.dir" value="${jaxrpc.id}-${jaxrpc}" /> <property name="jaxrpc.dir" value="${jaxrpc.id}-${jaxrpc}" />
@ -69,7 +74,7 @@
<target name="dist" depends="build"> <target name="dist" depends="build">
</target> </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> </target>
<!-- <!--
@ -139,31 +144,12 @@ artifactId=${gbuild.id}
</antcall> </antcall>
</target> </target>
<target name="javamail13" depends="activation102"> <target name="connector">
<antcall target="gbuild"> <antcall target="gbuild">
<param name="gbuild.dir" value="${javamail13.dir}" /> <param name="gbuild.dir" value="${connector.dir}" />
<param name="gbuild.jar" value="${javamail13.jar}" /> <param name="gbuild.jar" value="${connector.jar}" />
<param name="gbuild.id" value="${javamail13.id}" /> <param name="gbuild.id" value="${connector.id}" />
<param name="gbuild.ver" value="${javamail13}" /> <param name="gbuild.ver" value="${connector}" />
<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}"/>
</antcall> </antcall>
</target> </target>

View File

@ -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> Tue Oct 17 18:45:36 UTC 2023 - Fridrich Strba <fstrba@suse.com>

View File

@ -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.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-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-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-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-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/ # 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 Specifications that you actually need. The ones installed by the main
package are deprecated and will disapear in future releases. 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 %package -n geronimo-jaxrpc-1_1-api
Summary: Geronimo JAXRPC 1.1 Specification Summary: Geronimo JAXRPC 1.1 Specification
Group: Development/Languages/Java Group: Development/Languages/Java
@ -276,6 +293,13 @@ install -m 0644 \
%{buildroot}/%{_mavenpomdir}/JPP-geronimo-annotation-1.0-api.pom %{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 %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 \ install -m 0644 \
geronimo-jaxrpc_1.1_spec-1.1/target/geronimo-jaxrpc_1.1_spec-1.1.jar \ geronimo-jaxrpc_1.1_spec-1.1/target/geronimo-jaxrpc_1.1_spec-1.1.jar \
%{buildroot}%{_javadir}/geronimo-jaxrpc-1.1-api.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_api %{_javadir}/geronimo-annotation-1.0-api.jar
update-alternatives --remove annotation_1_0_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 %pre -n geronimo-jaxrpc-1_1-api
update-alternatives --remove jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar update-alternatives --remove jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar
update-alternatives --remove jaxrpc_api %{_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 %files -n geronimo-annotation-1_0-api -f .mfiles-annotation-1.0-api
%license geronimo-annotation_1.0_spec-1.1.0/LICENSE.txt %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 %files -n geronimo-jaxrpc-1_1-api -f .mfiles-jaxrpc-1.1-api
%license geronimo-jaxrpc_1.1_spec-1.1/LICENSE.txt %license geronimo-jaxrpc_1.1_spec-1.1/LICENSE.txt