Fridrich Strba 2023-10-17 08:31:35 +00:00 committed by Git OBS Bridge
parent 83c9fa0bfe
commit f8c5d7fdb7
2 changed files with 1 additions and 134 deletions

View File

@ -24,23 +24,10 @@
<property name="annotation.dir" value="${annotation.id}-${annotation}" />
<property name="annotation.jar" value="${annotation.id}-${annotation.ver}.jar" />
<property name="ejb21" value="1.1" />
<property name="ejb21.id" value="geronimo-ejb_2.1_spec" />
<property name="ejb21.dir" value="${ejb21.id}-${ejb21}" />
<property name="ejb21.jar" value="${ejb21.dir}.jar" />
<property name="ejb30" value="1.0" />
<property name="ejb30.dir" value="geronimo-ejb_3.0_spec-${ejb30}" />
<property name="ejb30.jar" value="${ejb30.dir}.jar" />
<property name="el10" value="1.0" />
<property name="el10.dir" value="geronimo-el_1.0_spec-${el10}" />
<property name="el10.jar" value="${el10.dir}.jar" />
<property name="interceptor" value="1.0" />
<property name="interceptor.dir" value="geronimo-interceptor_3.0_spec-${interceptor}" />
<property name="interceptor.jar" value="${interceptor.dir}.jar" />
<property name="javamail13" value="1.3" />
<property name="javamail13.ver" value="1.3" />
<property name="javamail13.id" value="geronimo-javamail_1.3.1_spec" />
@ -118,7 +105,7 @@
<target name="dist" depends="build">
</target>
<target name="build" depends="activation102, activation110, annotation, ejb21, ejb30, el10, interceptor, javamail13, javamail14, jaxr, jaxrpc, jms, jpa, jsp20, jsp21, jta10, jta11, qname, saaj, servlet24, servlet25, stax, wsmetadata">
<target name="build" depends="activation102, activation110, annotation, el10, javamail13, javamail14, jaxr, jaxrpc, jms, jpa, jsp20, jsp21, jta10, jta11, qname, saaj, servlet24, servlet25, stax, wsmetadata">
</target>
<!--
@ -188,24 +175,6 @@ artifactId=${gbuild.id}
</antcall>
</target>
<target name="ejb21" depends="jta10">
<antcall target="gbuild">
<param name="gbuild.dir" value="${ejb21.dir}" />
<param name="gbuild.jar" value="${ejb21.jar}" />
<param name="gbuild.classpath" value="${jta10.dir}/${dist}/${jta10.jar}" />
<param name="gbuild.id" value="${ejb21.id}" />
<param name="gbuild.ver" value="${ejb}" />
</antcall>
</target>
<target name="ejb30" depends="jta10">
<antcall target="gbuild">
<param name="gbuild.dir" value="${ejb30.dir}" />
<param name="gbuild.jar" value="${ejb30.jar}" />
<param name="gbuild.classpath" value="${jta10.dir}/${dist}/${jta10.jar}" />
</antcall>
</target>
<target name="el10">
<antcall target="gbuild">
<param name="gbuild.dir" value="${el10.dir}" />
@ -213,13 +182,6 @@ artifactId=${gbuild.id}
</antcall>
</target>
<target name="interceptor">
<antcall target="gbuild">
<param name="gbuild.dir" value="${interceptor.dir}" />
<param name="gbuild.jar" value="${interceptor.jar}" />
</antcall>
</target>
<target name="javamail13" depends="activation102">
<antcall target="gbuild">
<param name="gbuild.dir" value="${javamail13.dir}" />

View File

@ -143,43 +143,6 @@ 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-ejb-2_1-api
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
Requires: jta_1_0_1B_api
Requires(pre): update-alternatives
Provides: ejb = 2.1
# TODO: drop asap
Provides: ejb_2_1_api = %{version}
Provides: ejb_api = 2.1
# drop the following asap
Obsoletes: %{name}-poms
Obsoletes: ejb
%description -n geronimo-ejb-2_1-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
J2EE-Specifications: Enterprise JavaBeans Specification
%package -n geronimo-ejb-3_0-api
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
Requires: annotation_1_0_api
Requires: interceptor_3_0_api
Requires: jta_1_1_api
Requires(pre): update-alternatives
Provides: ejb = 3.0
# TODO: drop asap
Provides: ejb_3_0_api = %{version}
Provides: ejb_api = 3.0
Obsoletes: %{name}-poms
Obsoletes: ejb
%description -n geronimo-ejb-3_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
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-el-1_0-api
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
@ -194,20 +157,6 @@ 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-interceptor-3_0-api
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
Requires(pre): update-alternatives
Provides: interceptor_3_0_api = %{version}
Provides: interceptor_api = 3.0
Obsoletes: %{name}-poms
%description -n geronimo-interceptor-3_0-api
Geronimo is Apache's ASF-licenced J2EE server project. These are the
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-javamail-1_3_1-api
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
@ -498,20 +447,6 @@ 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-ejb_2.1_spec-1.1/target/geronimo-ejb_2.1_spec-1.1.jar \
%{buildroot}%{_javadir}/geronimo-ejb-2.1-api.jar
%{mvn_install_pom} geronimo-ejb_2.1_spec-1.1/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP-geronimo-ejb-2.1-api.pom
%add_maven_depmap JPP-geronimo-ejb-2.1-api.pom geronimo-ejb-2.1-api.jar -f ejb-2.1-api
install -m 0644 \
geronimo-ejb_3.0_spec-1.0/target/geronimo-ejb_3.0_spec-1.0.jar \
%{buildroot}%{_javadir}/geronimo-ejb-3.0-api.jar
%{mvn_install_pom} geronimo-ejb_3.0_spec-1.0/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP-geronimo-ejb-3.0-api.pom
%add_maven_depmap JPP-geronimo-ejb-3.0-api.pom geronimo-ejb-3.0-api.jar -f ejb-3.0-api
install -m 0644 \
geronimo-el_1.0_spec-1.0/target/geronimo-el_1.0_spec-1.0.jar \
%{buildroot}%{_javadir}/geronimo-el-1.0-api.jar
@ -519,13 +454,6 @@ install -m 0644 \
%{buildroot}/%{_mavenpomdir}/JPP-geronimo-el-1.0-api.pom
%add_maven_depmap JPP-geronimo-el-1.0-api.pom geronimo-el-1.0-api.jar -f el-1.0-api
install -m 0644 \
geronimo-interceptor_3.0_spec-1.0/target/geronimo-interceptor_3.0_spec-1.0.jar \
%{buildroot}%{_javadir}/geronimo-interceptor-3.0-api.jar
%{mvn_install_pom} geronimo-interceptor_3.0_spec-1.0/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP-geronimo-interceptor-3.0-api.pom
%add_maven_depmap JPP-geronimo-interceptor-3.0-api.pom geronimo-interceptor-3.0-api.jar -f interceptor-3.0-api
install -m 0644 \
geronimo-javamail_1.3.1_spec-1.3/target/geronimo-javamail_1.3.1_spec-1.3.jar \
%{buildroot}%{_javadir}/geronimo-javamail-1.3.1-api.jar
@ -652,24 +580,10 @@ 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-ejb-2_1-api
update-alternatives --remove ejb %{_javadir}/geronimo-ejb-2.1-api.jar
update-alternatives --remove ejb_api %{_javadir}/geronimo-ejb-2.1-api.jar
update-alternatives --remove ejb_2_1_api %{_javadir}/geronimo-ejb-2.1-api.jar
%pre -n geronimo-ejb-3_0-api
update-alternatives --remove ejb %{_javadir}/geronimo-ejb-3.0-api.jar
update-alternatives --remove ejb_api %{_javadir}/geronimo-ejb-3.0-api.jar
update-alternatives --remove ejb_3_0_api %{_javadir}/geronimo-ejb-3.0-api.jar
%pre -n geronimo-el-1_0-api
update-alternatives --remove el_api %{_javadir}/geronimo-el-1.0-api.jar
update-alternatives --remove el_1_0_api %{_javadir}/geronimo-el-1.0-api.jar
%pre -n geronimo-interceptor-3_0-api
update-alternatives --remove interceptor_api %{_javadir}/geronimo-interceptor-3.0-api.jar
update-alternatives --remove interceptor_3_0_api %{_javadir}/geronimo-interceptor-3.0-api.jar
%pre -n geronimo-javamail-1_3_1-api
update-alternatives --remove javamail_api %{_javadir}/geronimo-javamail-1.3.1-api.jar
update-alternatives --remove javamail_1_3_1_api %{_javadir}/geronimo-javamail-1.3.1-api.jar
@ -753,18 +667,9 @@ update-alternatives --remove ws_metadata_2_0_api %{_javadir}/geronimo-ws-metadat
%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-ejb-2_1-api -f .mfiles-ejb-2.1-api
%license geronimo-ejb_2.1_spec-1.1/LICENSE.txt
%files -n geronimo-ejb-3_0-api -f .mfiles-ejb-3.0-api
%license geronimo-ejb_3.0_spec-1.0/LICENSE.txt
%files -n geronimo-el-1_0-api -f .mfiles-el-1.0-api
%license geronimo-el_1.0_spec-1.0/LICENSE.txt
%files -n geronimo-interceptor-3_0-api -f .mfiles-interceptor-3.0-api
%license geronimo-interceptor_3.0_spec-1.0/LICENSE.txt
%files -n geronimo-javamail-1_3_1-api -f .mfiles-javamail-1.3.1-api
%license geronimo-javamail_1.3.1_spec-1.3/LICENSE.txt