Fridrich Strba 2023-10-16 13:30:12 +00:00 committed by Git OBS Bridge
parent 6e6b075054
commit 064bae6420
2 changed files with 11 additions and 256 deletions

View File

@ -24,20 +24,6 @@
<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="corba10" value="null" />
<property name="corba10.dir" value="geronimo-spec-corba/" />
<property name="corba10.jar" value="geronimo-spec-corba-${corba10}.jar" />
<property name="corba23" value="null" />
<property name="corba23.ver" value="${geronimoSpecsCorba23Version}" />
<property name="corba23.id" value="geronimo-corba_2.3_spec" />
<property name="corba23.dir" value="geronimo-spec-corba-2.3" />
<property name="corba23.jar" value="${corba23.id}-${corba23}.jar" />
<property name="corba30" value="1.1" />
<property name="corba30.dir" value="geronimo-spec-corba-3.0" />
<property name="corba30.jar" value="${corba30.dir}_spec-${corba30}.jar" />
<property name="ejb21" value="1.1" /> <property name="ejb21" value="1.1" />
<property name="ejb21.id" value="geronimo-ejb_2.1_spec" /> <property name="ejb21.id" value="geronimo-ejb_2.1_spec" />
<property name="ejb21.dir" value="${ejb21.id}-${ejb21}" /> <property name="ejb21.dir" value="${ejb21.id}-${ejb21}" />
@ -170,7 +156,7 @@
<target name="dist" depends="build"> <target name="dist" depends="build">
</target> </target>
<target name="build" depends="activation102, activation110, annotation, corba10, corba23, corba30, ejb21, ejb30, el10, interceptor, connector, j2eedeployment, javaeedeployment, jacc, j2eejacc, j2eemanagment10, j2eemanagment11, javamail13, javamail14, jaxr, jaxrpc, jms, jpa, jsp20, jsp21, jta10, jta11, qname, saaj, servlet24, servlet25, stax, wsmetadata, commonj, geronimo-spec-j2ee"> <target name="build" depends="activation102, activation110, annotation, ejb21, ejb30, el10, interceptor, connector, j2eedeployment, javaeedeployment, jacc, j2eejacc, j2eemanagment10, j2eemanagment11, javamail13, javamail14, jaxr, jaxrpc, jms, jpa, jsp20, jsp21, jta10, jta11, qname, saaj, servlet24, servlet25, stax, wsmetadata, commonj, geronimo-spec-j2ee">
</target> </target>
<target name="geronimo-spec-j2ee"> <target name="geronimo-spec-j2ee">
@ -179,11 +165,6 @@
<fileset dir="${activation102.dir}/${build}"/> <fileset dir="${activation102.dir}/${build}"/>
<fileset dir="${activation110.dir}/${build}"/> <fileset dir="${activation110.dir}/${build}"/>
<fileset dir="${annotation.dir}/${build}"/> <fileset dir="${annotation.dir}/${build}"/>
<fileset dir="${corba10.dir}/${build}"/>
<fileset dir="${corba23.dir}/${build}"/>
<!--
<fileset dir="${corba30.dir}/${build}"/>
-->
<fileset dir="${ejb21.dir}/${build}"/> <fileset dir="${ejb21.dir}/${build}"/>
<fileset dir="${ejb30.dir}/${build}"/> <fileset dir="${ejb30.dir}/${build}"/>
<fileset dir="${el10.dir}/${build}"/> <fileset dir="${el10.dir}/${build}"/>
@ -282,45 +263,6 @@ artifactId=${gbuild.id}
</antcall> </antcall>
</target> </target>
<target name="corba10" depends="jta10">
<copy file="${corba10.dir}/${idl}/geronimo-orb.idl" tofile="${corba10.dir}/${idl}/CORBA.idl"/>
<antcall target="corba_idlj">
<param name="corba_dir" value="${corba10.dir}"/>
</antcall>
<antcall target="gbuild">
<param name="gbuild.dir" value="${corba10.dir}" />
<param name="gbuild.jar" value="${corba10.jar}" />
<param name="gbuild.classpath" value="${jta10.dir}/${dist}/${jta10.jar}" />
</antcall>
</target>
<target name="corba23" depends="jta10">
<copy file="${corba23.dir}/${idl}/geronimo-orb.idl" tofile="${corba23.dir}/${idl}/CORBA.idl"/>
<antcall target="corba_idlj">
<param name="corba_dir" value="${corba23.dir}"/>
</antcall>
<antcall target="gbuild">
<param name="gbuild.dir" value="${corba23.dir}" />
<param name="gbuild.jar" value="${corba23.jar}" />
<param name="gbuild.classpath" value="${jta10.dir}/${dist}/${jta10.jar}" />
<param name="gbuild.id" value="${corba23.id}" />
<param name="gbuild.ver" value="${corba23.ver}" />
</antcall>
</target>
<target name="corba30" depends="jta10">
<!--
<antcall target="corba_idlj">
<param name="corba_dir" value="${corba30.dir}"/>
</antcall>
<antcall target="gbuild">
<param name="gbuild.dir" value="${corba30.dir}" />
<param name="gbuild.jar" value="${corba30.jar}" />
<param name="gbuild.classpath" value="${jta10.dir}/${dist}/${jta10.jar}" />
</antcall>
-->
</target>
<target name="ejb21" depends="jta10"> <target name="ejb21" depends="jta10">
<antcall target="gbuild"> <antcall target="gbuild">
<param name="gbuild.dir" value="${ejb21.dir}" /> <param name="gbuild.dir" value="${ejb21.dir}" />
@ -414,28 +356,31 @@ artifactId=${gbuild.id}
</antcall> </antcall>
</target> </target>
<target name="javamail13"> <target name="javamail13" depends="activation102">
<antcall target="gbuild"> <antcall target="gbuild">
<param name="gbuild.dir" value="${javamail13.dir}" /> <param name="gbuild.dir" value="${javamail13.dir}" />
<param name="gbuild.jar" value="${javamail13.jar}" /> <param name="gbuild.jar" value="${javamail13.jar}" />
<param name="gbuild.id" value="${javamail13.id}" /> <param name="gbuild.id" value="${javamail13.id}" />
<param name="gbuild.ver" value="${javamail13}" /> <param name="gbuild.ver" value="${javamail13}" />
<param name="gbuild.classpath" value="${activation102.dir}/${dist}/${activation102.jar}"/>
</antcall> </antcall>
</target> </target>
<target name="javamail14"> <target name="javamail14" depends="activation102">
<antcall target="gbuild"> <antcall target="gbuild">
<param name="gbuild.dir" value="${javamail14.dir}" /> <param name="gbuild.dir" value="${javamail14.dir}" />
<param name="gbuild.jar" value="${javamail14.jar}" /> <param name="gbuild.jar" value="${javamail14.jar}" />
<param name="gbuild.classpath" value="${activation102.dir}/${dist}/${activation102.jar}"/>
</antcall> </antcall>
</target> </target>
<target name="jaxr"> <target name="jaxr" depends="activation102">
<antcall target="gbuild"> <antcall target="gbuild">
<param name="gbuild.dir" value="${jaxr.dir}" /> <param name="gbuild.dir" value="${jaxr.dir}" />
<param name="gbuild.jar" value="${jaxr.jar}" /> <param name="gbuild.jar" value="${jaxr.jar}" />
<param name="gbuild.id" value="${jaxr.id}" /> <param name="gbuild.id" value="${jaxr.id}" />
<param name="gbuild.ver" value="${jaxr}" /> <param name="gbuild.ver" value="${jaxr}" />
<param name="gbuild.classpath" value="${activation102.dir}/${dist}/${activation102.jar}"/>
</antcall> </antcall>
</target> </target>
@ -443,7 +388,7 @@ artifactId=${gbuild.id}
<antcall target="gbuild"> <antcall target="gbuild">
<param name="gbuild.dir" value="${jaxrpc.dir}" /> <param name="gbuild.dir" value="${jaxrpc.dir}" />
<param name="gbuild.jar" value="${jaxrpc.jar}" /> <param name="gbuild.jar" value="${jaxrpc.jar}" />
<param name="gbuild.classpath" value="${servlet24.dir}/${dist}/${servlet24.jar}"/> <param name="gbuild.classpath" value="${servlet24.dir}/${dist}/${servlet24.jar}:/usr/share/java/axis/saaj.jar"/>
<param name="gbuild.id" value="${jaxrpc.id}" /> <param name="gbuild.id" value="${jaxrpc.id}" />
<param name="gbuild.ver" value="${jaxprc}" /> <param name="gbuild.ver" value="${jaxprc}" />
</antcall> </antcall>
@ -508,12 +453,13 @@ artifactId=${gbuild.id}
</antcall> </antcall>
</target> </target>
<target name="saaj"> <target name="saaj" depends="activation102">
<antcall target="gbuild"> <antcall target="gbuild">
<param name="gbuild.dir" value="${saaj.dir}" /> <param name="gbuild.dir" value="${saaj.dir}" />
<param name="gbuild.jar" value="${saaj.jar}" /> <param name="gbuild.jar" value="${saaj.jar}" />
<param name="gbuild.id" value="${saaj.id}" /> <param name="gbuild.id" value="${saaj.id}" />
<param name="gbuild.ver" value="${saaj}" /> <param name="gbuild.ver" value="${saaj}" />
<param name="gbuild.classpath" value="${activation102.dir}/${dist}/${activation102.jar}"/>
</antcall> </antcall>
</target> </target>
@ -556,137 +502,6 @@ artifactId=${gbuild.id}
</antcall> </antcall>
</target> </target>
<target name="idlj_prefix">
<exec executable="${idlj}">
<arg value="-pkgPrefix"/>
<arg value="${module_name}"/>
<arg value="${prefix}"/>
<arg value="-td"/>
<arg value="${src}"/>
<arg value="${idl_file}"/>
</exec>
</target>
<target name="idlj">
<exec executable="${idlj}">
<arg value="-td"/>
<arg value="${src}"/>
<arg value="${idl_file}"/>
</exec>
</target>
<target name="corba_idlj">
<antcall target="idlj_prefix">
<!-- idl_compile org.omg CORBA -->
<param name="module_name" value="CORBA" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/CORBA.idl" />
</antcall>
<antcall target="idlj_prefix">
<!-- idl_compile org.omg CosNaming -->
<param name="module_name" value="CosNaming"/>
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/CosNaming.idl" />
</antcall>
<antcall target="idlj">
<!-- idl_compile CosTransactions -->
<param name="idl_file" value="${corba_dir}/${idl}/CosTransactions.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg CosTransactions-->
<param name="module_name" value="CosTransactions" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/CosTransactions.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg CosTSInteroperation-->
<param name="module_name" value="CosTSInteroperation" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/CosTSInteroperation.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg CosTSPortability-->
<param name="module_name" value="CosTSPortability" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/CosTSPortability.idl" />
</antcall>
<antcall target="idlj">
<!--idl_compile CSI-->
<param name="idl_file" value="${corba_dir}/${idl}/CSI.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg CSI-->
<param name="module_name" value="CSI" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/CSI.idl" />
</antcall>
<antcall target="idlj">
<!--idl_compile CSIIOP-->
<param name="idl_file" value="${corba_dir}/${idl}/CSIIOP.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg CSIIOP-->
<param name="module_name" value="CSIIOP" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/CSIIOP.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg GIOP-->
<param name="module_name" value="GIOP" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/GIOP.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg GSSUP-->
<param name="module_name" value="GSSUP" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/GSSUP.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg IIOP-->
<param name="module_name" value="IIOP" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/IIOP.idl" />
</antcall>
<antcall target="idlj">
<!--idl_compile IOP-->
<param name="idl_file" value="${corba_dir}/${idl}/IOP.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg IOP-->
<param name="module_name" value="IOP" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/IOP.idl" />
</antcall>
<antcall target="idlj">
<!--idl_compile Security-->
<param name="idl_file" value="${corba_dir}/${idl}/Security.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg Security-->
<param name="module_name" value="Security" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/Security.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg SSLIOP-->
<param name="module_name" value="SSLIOP" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/SSLIOP.idl" />
</antcall>
<antcall target="idlj">
<!--idl_compile TimeBase-->
<param name="idl_file" value="${corba_dir}/${idl}/TimeBase.idl" />
</antcall>
<antcall target="idlj_prefix">
<!--idl_compile org.omg TimeBase-->
<param name="module_name" value="TimeBase" />
<param name="prefix" value="org.omg" />
<param name="idl_file" value="${corba_dir}/${idl}/TimeBase.idl" />
</antcall>
</target>
<target name="clean" description="clean up" > <target name="clean" description="clean up" >
<delete dir="geronimo-spec-j2ee/${dist}" /> <delete dir="geronimo-spec-j2ee/${dist}" />
</target> </target>

View File

@ -74,13 +74,12 @@ Source0: %{name}-%{version}-src.tar.bz2
Source1000: geronimo-specs.build.xml Source1000: geronimo-specs.build.xml
Source1001: undot.py Source1001: undot.py
BuildRequires: ant BuildRequires: ant
BuildRequires: axis
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6 BuildRequires: javapackages-local >= 6
BuildRequires: junit >= 3.8.1 BuildRequires: junit >= 3.8.1
BuildConflicts: java-devel >= 11
BuildConflicts: java-devel-openj9 BuildConflicts: java-devel-openj9
BuildConflicts: java-headless >= 11
BuildConflicts: java-headless-openj9 BuildConflicts: java-headless-openj9
BuildArch: noarch BuildArch: noarch
@ -155,28 +154,6 @@ 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-corba-1_0-apis
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
Provides: corba_1_0_apis = %{version}
Provides: corba_apis = 1.0
Obsoletes: %{name}-poms
%description -n geronimo-corba-1_0-apis
Geronimo is Apache's ASF-licenced J2EE server project. These are the
J2EE-Specifications: CORBA 1.0 Spec
%package -n geronimo-corba-2_3-apis
Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java
Provides: corba_2_3_apis = %{version}
Provides: corba_apis = 2.3
Obsoletes: %{name}-poms
%description -n geronimo-corba-2_3-apis
Geronimo is Apache's ASF-licenced J2EE server project. These are the
J2EE-Specifications: CORBA 2.3 Spec
%package -n geronimo-ejb-2_1-api %package -n geronimo-ejb-2_1-api
Summary: Geronimo J2EE server J2EE specifications Summary: Geronimo J2EE server J2EE specifications
Group: Development/Languages/Java Group: Development/Languages/Java
@ -253,8 +230,6 @@ Group: Development/Languages/Java
Requires(pre): update-alternatives Requires(pre): update-alternatives
Provides: commonj_1_1_apis = %{version} Provides: commonj_1_1_apis = %{version}
Provides: commonj_apis = 1.1 Provides: commonj_apis = 1.1
Provides: corba_2_3_apis = %{version}
Provides: corba_apis = 2.3
Provides: ejb_2_1_api = %{version} Provides: ejb_2_1_api = %{version}
Provides: ejb_api = 2.1 Provides: ejb_api = 2.1
Provides: j2ee_connector_1_5_api = %{version} Provides: j2ee_connector_1_5_api = %{version}
@ -289,7 +264,6 @@ Provides: servlet_api = 2.4
# #
# Provides: commonj = 1.1 # Provides: commonj = 1.1
Provides: ejb = 2.1 Provides: ejb = 2.1
# Provides: corba = 2.3
Provides: j2ee-connector = 1.5 Provides: j2ee-connector = 1.5
Provides: j2ee-deployment = 1.1 Provides: j2ee-deployment = 1.1
Provides: j2ee-management = 1.0 Provides: j2ee-management = 1.0
@ -305,8 +279,6 @@ Provides: jta = 1.0.1B
Provides: saaj = 1.1 Provides: saaj = 1.1
Provides: servlet = 2.4 Provides: servlet = 2.4
# added Epoch # added Epoch
Provides: geronimo-corba-2_3-apis = %{version}
# added Epoch
Provides: geronimo-qname-1_1-api = %{version} Provides: geronimo-qname-1_1-api = %{version}
Obsoletes: %{name}-poms Obsoletes: %{name}-poms
@ -683,9 +655,6 @@ mkdir external_repo
ln -s %{_javadir} external_repo/JPP ln -s %{_javadir} external_repo/JPP
cp %{SOURCE1000} build.xml cp %{SOURCE1000} build.xml
%pom_xpath_set pom:project/pom:version 1.0 geronimo-spec-commonj %pom_xpath_set pom:project/pom:version 1.0 geronimo-spec-commonj
%pom_xpath_set pom:project/pom:version 1.0 geronimo-spec-corba
%pom_xpath_set pom:project/pom:version 1.1 geronimo-spec-corba-2.3
%pom_xpath_set pom:project/pom:version 1.1 geronimo-spec-corba-3.0
%pom_xpath_set pom:project/pom:version 1.1.1 geronimo-spec-j2ee %pom_xpath_set pom:project/pom:version 1.1.1 geronimo-spec-j2ee
%build %build
@ -719,20 +688,6 @@ 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-spec-corba-2.3/target/geronimo-corba_2.3_spec-null.jar \
%{buildroot}%{_javadir}/geronimo-corba-2.3-apis.jar
%{mvn_install_pom} geronimo-spec-corba-2.3/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP-geronimo-corba-2.3-apis.pom
%add_maven_depmap JPP-geronimo-corba-2.3-apis.pom geronimo-corba-2.3-apis.jar -f corba-2.3-apis
install -m 0644 \
geronimo-spec-corba/target/geronimo-spec-corba-null.jar \
%{buildroot}%{_javadir}/geronimo-corba-1.0-apis.jar
%{mvn_install_pom} geronimo-spec-corba/pom.xml \
%{buildroot}/%{_mavenpomdir}/JPP-geronimo-corba-1.0-apis.pom
%add_maven_depmap JPP-geronimo-corba-1.0-apis.pom geronimo-corba-1.0-apis.jar -f corba-1.0-apis
install -m 0644 \ install -m 0644 \
geronimo-ejb_2.1_spec-1.1/target/geronimo-ejb_2.1_spec-1.1.jar \ geronimo-ejb_2.1_spec-1.1/target/geronimo-ejb_2.1_spec-1.1.jar \
%{buildroot}%{_javadir}/geronimo-ejb-2.1-api.jar %{buildroot}%{_javadir}/geronimo-ejb-2.1-api.jar
@ -954,14 +909,6 @@ 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-corba-1_0-apis
update-alternatives --remove corba_apis %{_javadir}/geronimo-corba-1.0-apis.jar
update-alternatives --remove corba_1_0_apis %{_javadir}/geronimo-corba-1.0-apis.jar
%pre -n geronimo-corba-2_3-apis
update-alternatives --remove corba_apis %{_javadir}/geronimo-corba-2.3-apis.jar
update-alternatives --remove corba_2_3_apis %{_javadir}/geronimo-corba-2.3-apis.jar
%pre -n geronimo-ejb-2_1-api %pre -n geronimo-ejb-2_1-api
update-alternatives --remove ejb %{_javadir}/geronimo-ejb-2.1-api.jar 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_api %{_javadir}/geronimo-ejb-2.1-api.jar
@ -1092,8 +1039,6 @@ update-alternatives --remove jaf_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove jaf_1_0_2_api %{_javadir}/geronimo-j2ee-1.4-apis.jar update-alternatives --remove jaf_1_0_2_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove commonj_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar update-alternatives --remove commonj_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove commonj_1_1_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar update-alternatives --remove commonj_1_1_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove corba_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove corba_2_3_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove ejb_api %{_javadir}/geronimo-j2ee-1.4-apis.jar update-alternatives --remove ejb_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove ejb_2_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar update-alternatives --remove ejb_2_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar
update-alternatives --remove j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar update-alternatives --remove j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar
@ -1136,11 +1081,6 @@ update-alternatives --remove servlet_2_4_api %{_javadir}/geronimo-j2ee-1.4-apis.
%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-corba-1_0-apis -f .mfiles-corba-1.0-apis
%files -n geronimo-corba-2_3-apis -f .mfiles-corba-2.3-apis
%license geronimo-spec-corba-2.3/LICENSE.txt
%files -n geronimo-ejb-2_1-api -f .mfiles-ejb-2.1-api %files -n geronimo-ejb-2_1-api -f .mfiles-ejb-2.1-api
%license geronimo-ejb_2.1_spec-1.1/LICENSE.txt %license geronimo-ejb_2.1_spec-1.1/LICENSE.txt