Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package geronimo-specs for openSUSE:Factory checked in at 2023-10-19 22:47:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geronimo-specs (Old) and /work/SRC/openSUSE:Factory/.geronimo-specs.new.1945 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geronimo-specs" Thu Oct 19 22:47:05 2023 rev:36 rq:1118360 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/geronimo-specs/geronimo-specs.changes 2023-10-17 20:22:38.486331541 +0200 +++ /work/SRC/openSUSE:Factory/.geronimo-specs.new.1945/geronimo-specs.changes 2023-10-19 22:49:30.187184050 +0200 @@ -1,0 +2,10 @@ +Tue Oct 17 18:45:36 UTC 2023 - Fridrich Strba <fst...@suse.com> + +- Remove some more artifacts not used by anybody in our current + java stack +- Removed patch: + * sun-security-provider.patch + + not needed anymore, since the patched artifacts are not + built in this version + +------------------------------------------------------------------- Old: ---- geronimo-specs-1.2-src.tar.bz2 sun-security-provider.patch New: ---- geronimo-specs-1.2-src.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geronimo-specs.spec ++++++ --- /var/tmp/diff_new_pack.t6xLwk/_old 2023-10-19 22:49:30.919210601 +0200 +++ /var/tmp/diff_new_pack.t6xLwk/_new 2023-10-19 22:49:30.919210601 +0200 @@ -24,48 +24,22 @@ License: Apache-2.0 Group: Development/Languages/Java URL: https://geronimo.apache.org -Source0: %{name}-%{version}-src.tar.bz2 -Patch0: sun-security-provider.patch +Source0: %{name}-%{version}-src.tar.xz # STEPS TO CREATE THE SOURCE FILE # mkdir geronimo-specs-1.2 # cd geronimo-specs-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-annotation_1.0_spec-1.1.0/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-ejb_2.1_spec-1.1/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-ejb_3.0_spec-1.0/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-el_1.0_spec-1.0/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-interceptor_3.0_spec-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-j2ee-deployment_1.1_spec-1.1/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-jacc_1.0_spec-1.1/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-management_1.0_spec-1.1/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-management_1.1_spec-1.0/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jacc_1.1_spec-1.0/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javaee-deployment_1.1MR3_spec-1.0/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javamail_1.3.1_spec-1.3/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javamail_1.4_spec-1.1/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jaxr_1.0_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-jpa_3.0_spec-1.1.0/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jsp_2.0_spec-1.1/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jsp_2.1_spec-1.0/ # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jta_1.0.1B_spec-1.1.1/ # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-jta_1.1_spec-1.1.0/ # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-qname_1.1_spec-1.1/ # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-saaj_1.1_spec-1.1/ # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-servlet_2.4_spec-1.1.1/ # svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-servlet_2.5_spec-1.1/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-stax-api_1.0_spec-1.0/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-ws-metadata_2.0_spec-1.1.1/ -# # AND FOR COMPLETENESS -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/1_1_1/geronimo-spec-commonj/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/1_1_1/geronimo-spec-corba/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/1_1_1/geronimo-spec-corba-2.3/ -# svn export http://svn.apache.org/repos/asf/geronimo/specs/tags/1_1_1/geronimo-spec-corba-3.0/ -# # AS WELL AS -# svn export http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jaspi_1.0_spec/ # # AND # curl -O http://svn.apache.org/repos/asf/geronimo/specs/trunk/pom.xml # curl -O http://svn.apache.org/repos/asf/geronimo/specs/trunk/LICENSE.txt @@ -89,22 +63,8 @@ Specifications that you actually need. The ones installed by the main package are deprecated and will disapear in future releases. -%package -n geronimo-commonj-1_1-apis -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Provides: commonj_1_1_apis = %{version} -Provides: commonj_apis = 1.1 -Obsoletes: %{name}-poms - -%description -n geronimo-commonj-1_1-apis -Geronimo is Apache's ASF-licenced J2EE server project. These are the -J2EE-Specifications: CommonJ Spec - %package -n geronimo-jaf-1_0_2-api -Summary: Geronimo J2EE server J2EE specifications -# Don't obsolete jaf, classpathx-jaf provides it -# Don't even obsolete it versioned, as sun-jaf is at 1.1 -#Obsoletes: jaf +Summary: Geronimo Activation 1.0.2 Specification Group: Development/Languages/Java Requires(pre): update-alternatives Provides: jaf = 1.0.2 @@ -120,10 +80,7 @@ J2EE-Specifications: Java Activation Framework %package -n geronimo-jaf-1_1-api -Summary: Geronimo J2EE server J2EE specifications -# Don't obsolete jaf, classpathx-jaf provides it -# Don't even obsolete it versioned, as sun-jaf is at 1.1 -#Obsoletes: jaf +Summary: Geronimo Activation 1.1 Specification Group: Development/Languages/Java Requires(pre): update-alternatives Provides: jaf = 1.1 @@ -141,7 +98,7 @@ package are deprecated and will disapear in future releases. %package -n geronimo-annotation-1_0-api -Summary: Geronimo J2EE server J2EE specifications +Summary: Geronimo Annotation 1.0 Specification Group: Development/Languages/Java Requires(pre): update-alternatives Provides: annotation_1_0_api @@ -154,302 +111,8 @@ 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 -Requires(pre): update-alternatives -Provides: el_1_0_api = %{version} -Provides: el_api = 1.0 -Obsoletes: %{name}-poms - -%description -n geronimo-el-1_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-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-j2ee-1_4-apis -Summary: Geronimo J2EE server J2EE specifications -# Do not provide it as this is just the API (is it?) and -# our 'javamail' alternative means the providers as well -# all in a single jar file called 'javamail.jar' -#Provides: javamail = 1.3.1 -# -Group: Development/Languages/Java -Requires(pre): update-alternatives -Provides: commonj_1_1_apis = %{version} -Provides: commonj_apis = 1.1 -Provides: ejb_2_1_api = %{version} -Provides: ejb_api = 2.1 -Provides: j2ee_connector_1_5_api = %{version} -Provides: j2ee_connector_api = 1.5 -Provides: j2ee_deployment_1_1_api = %{version} -Provides: j2ee_deployment_api = 1.1 -Provides: j2ee_management_1_0_api = %{version} -Provides: j2ee_management_api = 1.0 -Provides: jacc_1_0_api = %{version} -Provides: jacc_api = 1.0 -Provides: jaf_1_0_2_api = %{version} -Provides: jaf_api = 1.0.2 -Provides: javamail_1_3_1_api = %{version} -Provides: javamail_api = 1.3.1 -Provides: jaxr_1_0_api = %{version} -Provides: jaxr_api = 1.0 -Provides: jaxrpc_1_1_api = %{version} -Provides: jaxrpc_api = 1.1 -Provides: jms_1_1_api = %{version} -Provides: jms_api = 1.1 -Provides: jsp_2_0_api = %{version} -Provides: jsp_api = 2.0 -Provides: jta_1_0_1B_api = %{version} -Provides: jta_api = 1.0.1B -Provides: qname_1_1_api = %{version} -Provides: qname_api = 1.1 -Provides: saaj_1_1_api = %{version} -Provides: saaj_api = 1.1 -Provides: servlet_2_4_api = %{version} -Provides: servlet_api = 2.4 -# XXX: (dwalluck): section added for backwards compatibility with Fedora 9 -# -# Provides: commonj = 1.1 -Provides: ejb = 2.1 -Provides: j2ee-connector = 1.5 -Provides: j2ee-deployment = 1.1 -Provides: j2ee-management = 1.0 -Provides: jacc = 1.0 -Provides: jaf = 1.0.2 -Provides: javamail = 1.3.1 -Provides: jaxr = 1.0 -Provides: jaxrpc = 1.1 -Provides: jms = 1.1 -Provides: jsp = 2.0 -Provides: jta = 1.0.1B -# Provides: qname = 1.1 -Provides: saaj = 1.1 -Provides: servlet = 2.4 -# added Epoch -Provides: geronimo-qname-1_1-api = %{version} -Obsoletes: %{name}-poms - -%description -n geronimo-j2ee-1_4-apis -Geronimo is Apache's ASF-licenced J2EE server project. These are the -J2EE-Specifications: J2EE Specification (the complete set in one jar) - -%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-j2ee-deployment-1_1-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires(pre): update-alternatives -Provides: j2ee_deployment_1_1_api = %{version} -Provides: j2ee_deployment_api = 1.1 -# drop the following asap -Provides: j2ee-deployment = 1.1 -Obsoletes: %{name}-poms -Obsoletes: j2ee-deployment - -%description -n geronimo-j2ee-deployment-1_1-api -Geronimo is Apache's ASF-licenced J2EE server project. These are the -J2EE-Specifications: J2EE Application Deployment Specification - -%package -n geronimo-javaee-deployment-1_1-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires(pre): update-alternatives -Provides: javaee_deployment_1_1_api = %{version} -Provides: javaee_deployment_api = 1.1 -Obsoletes: %{name}-poms - -%description -n geronimo-javaee-deployment-1_1-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-jacc-1_0-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires: servlet_2_4_api -Requires(pre): update-alternatives -Provides: jacc = 1.0 -# TODO: drop asap -Provides: jacc_1_0_api = %{version} -Provides: jacc_api = 1.0 -Obsoletes: %{name}-poms - -%description -n geronimo-jacc-1_0-api -Geronimo is Apache's ASF-licenced J2EE server project. These are the -J2EE-Specifications: Java Authorization Contract for Containers -Specification - -%package -n geronimo-jacc-1_1-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires: servlet_2_5_api -Requires(pre): update-alternatives -Provides: jacc_1_1_api = %{version} -Provides: jacc_api = 1.1 -Obsoletes: %{name}-poms - -%description -n geronimo-jacc-1_1-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-j2ee-management-1_0-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires: ejb_2_1_api -Requires(pre): update-alternatives -Provides: j2ee_management_1_0_api = %{version} -Provides: j2ee_management_api = 1.0 -# drop the following asap -Provides: j2ee-management = 1.0 -Obsoletes: %{name}-poms -Obsoletes: j2ee-management - -%description -n geronimo-j2ee-management-1_0-api -Geronimo is Apache's ASF-licenced J2EE server project. These are the -J2EE-Specifications: J2EE Application Management Specification - -%package -n geronimo-j2ee-management-1_1-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires: ejb_3_0_api -Requires(pre): update-alternatives -Provides: j2ee_management_1_1_api = %{version} -Provides: j2ee_management_api = 1.1 -# drop the following asap -Provides: j2ee-management = 1.1 -Obsoletes: %{name}-poms -Obsoletes: j2ee-management - -%description -n geronimo-j2ee-management-1_1-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 -Requires: jaf_1_0_2_api -Requires(pre): update-alternatives -Provides: javamail_1_3_1_api = %{version} -Provides: javamail_api = 1.3.1 -# Do not provide javamail as this is just the API (is it?) and -# our 'javamail' alternative means the providers as well -# all in a single jar file called 'javamail.jar' -#Provides: javamail = 1.3.1 -Obsoletes: %{name}-poms - -%description -n geronimo-javamail-1_3_1-api -Geronimo is Apache's ASF-licenced J2EE server project. These are the -J2EE-Specifications: JavaMail API - -%package -n geronimo-javamail-1_4-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires: jaf_1_1_api -Requires(pre): update-alternatives -Provides: javamail_1_4_api = %{version} -Provides: javamail_api = 1.4 -# Do not provide javamail as this is just the API (is it?) and -# our 'javamail' alternative means the providers as well -# all in a single jar file called 'javamail.jar' -#Provides: javamail = 1.4 -Obsoletes: %{name}-poms - -%description -n geronimo-javamail-1_4-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-jaxr-1_0-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires: jaf_1_0_2_api -Requires(pre): update-alternatives -Provides: jaxr_1_0_api = %{version} -Provides: jaxr_api = 1.0 -# drop the following asap -Provides: jaxr = 1.0 -Obsoletes: %{name}-poms -Obsoletes: jaxr-api - -%description -n geronimo-jaxr-1_0-api -Geronimo is Apache's ASF-licenced J2EE server project. These are the -J2EE-Specifications: Java API for XML Registries (JAXR) - %package -n geronimo-jaxrpc-1_1-api -Summary: Geronimo J2EE server J2EE specifications +Summary: Geronimo JAXRPC 1.1 Specification Group: Development/Languages/Java Requires: qname_1_1_api Requires: saaj_1_1_api @@ -466,7 +129,7 @@ J2EE-Specifications: Java API for XML-Based RPC (JAXRPC) %package -n geronimo-jms-1_1-api -Summary: Geronimo J2EE server J2EE specifications +Summary: Geronimo JMS 1.1 Specification Group: Development/Languages/Java Requires(pre): update-alternatives Provides: jms_1_1_api = %{version} @@ -481,7 +144,7 @@ J2EE-Specifications: JMS Specification %package -n geronimo-jpa-3_0-api -Summary: Geronimo J2EE server J2EE specifications +Summary: Geronimo JPA 1.0 Specification Group: Development/Languages/Java Requires(pre): update-alternatives Provides: jpa_3_0_api = %{version} @@ -494,43 +157,8 @@ Specifications that you actually need. The ones installed by the main package are deprecated and will disapear in future releases. -%package -n geronimo-jsp-2_0-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires: servlet_2_4_api -Requires(pre): update-alternatives -Provides: jsp = 2.0 -# TODO: drop asap -Provides: jsp_2_0_api = %{version} -Provides: jsp_api = 2.0 -Obsoletes: %{name}-poms - -%description -n geronimo-jsp-2_0-api -Geronimo is Apache's ASF-licenced J2EE server project. These are the -J2EE-Specifications: JavaServer Pages Specification - -%package -n geronimo-jsp-2_1-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires: el_1_0_api -Requires: servlet_2_5_api -Requires(pre): update-alternatives -Provides: jsp = 2.1 -# TODO: drop asap -Provides: jsp_2_1_api = %{version} -Provides: jsp_api = 2.1 -Obsoletes: %{name}-poms - -%description -n geronimo-jsp-2_1-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-jta-1_0_1B-api -Summary: Geronimo J2EE server J2EE specifications -# Don't obsolete jta, as this is provided by java-1.4.2-gcj-compat -#Obsoletes: jta +Summary: Geronimo JTA 1.0.1B Specification Group: Development/Languages/Java Requires(pre): update-alternatives Provides: jta_1_0_1B_api = %{version} @@ -544,9 +172,7 @@ J2EE-Specifications: Java Transaction API Specification %package -n geronimo-jta-1_1-api -Summary: Geronimo J2EE server J2EE specifications -# Don't obsolete jta, as this is provided by java-1.4.2-gcj-compat -#Obsoletes: jta +Summary: Geronimo JTA 1.1 Specification Group: Development/Languages/Java Requires(pre): update-alternatives Provides: jta_1_1_api = %{version} @@ -562,7 +188,7 @@ package are deprecated and will disapear in future releases. %package -n geronimo-qname-1_1-api -Summary: Geronimo J2EE server J2EE specifications +Summary: Geronimo QName 1.1 Specification Group: Development/Languages/Java Requires(pre): update-alternatives Provides: qname_1_1_api = %{version} @@ -574,7 +200,7 @@ J2EE-Specifications: javax.xml.namespace.QName API %package -n geronimo-saaj-1_1-api -Summary: Geronimo J2EE server J2EE specifications +Summary: Geronimo SAAJ 1.1 Specification Group: Development/Languages/Java Requires: jaf_1_0_2_api Requires(pre): update-alternatives @@ -589,7 +215,7 @@ J2EE-Specifications: SOAP with Attachments API for Java (SAAJ) %package -n geronimo-servlet-2_4-api -Summary: Geronimo J2EE server J2EE specifications +Summary: Geronimo Servlet 2.4 Specification Group: Development/Languages/Java Requires(pre): update-alternatives Provides: servlet = 2.4 @@ -603,7 +229,7 @@ J2EE-Specifications: J2EE Servlet v2.4 API %package -n geronimo-servlet-2_5-api -Summary: Geronimo J2EE server J2EE specifications +Summary: Geronimo Servlet 2.5 Specification Group: Development/Languages/Java Requires(pre): update-alternatives Provides: servlet = 2.5 @@ -618,48 +244,13 @@ Specifications that you actually need. The ones installed by the main package are deprecated and will disapear in future releases. -%package -n geronimo-stax-1_0-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires(pre): update-alternatives -Provides: stax_1_0_api = %{version} -Provides: stax_api = 1.0 -Obsoletes: %{name}-poms - -%description -n geronimo-stax-1_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-ws-metadata-2_0-api -Summary: Geronimo J2EE server J2EE specifications -Group: Development/Languages/Java -Requires(pre): update-alternatives -Provides: ws_metadata_2_0_api = %{version} -Provides: ws_metadata_api = 2.0 -Obsoletes: %{name}-poms - -%description -n geronimo-ws-metadata-2_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. - %prep %setup -q -%patch0 -p1 chmod -R go=u-w * -mkdir etc -cp LICENSE.txt etc -mkdir external_repo -ln -s %{_javadir} external_repo/JPP cp %{SOURCE1000} build.xml -%pom_xpath_set pom:project/pom:version 1.0 geronimo-spec-commonj -%pom_xpath_set pom:project/pom:version 1.1.1 geronimo-spec-j2ee %build -%ant -Dant.build.javac.source=8 -Dant.build.javac.target=8 +%{ant} -Dant.build.javac.source=8 -Dant.build.javac.target=8 %install set +x @@ -689,104 +280,6 @@ %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 -%{mvn_install_pom} geronimo-el_1.0_spec-1.0/pom.xml \ - %{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-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-j2ee-deployment_1.1_spec-1.1/target/geronimo-j2ee-deployment_1.1_spec-1.1.jar \ - %{buildroot}%{_javadir}/geronimo-j2ee-deployment-1.1-api.jar -%{mvn_install_pom} geronimo-j2ee-deployment_1.1_spec-1.1/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-j2ee-deployment-1.1-api.pom -%add_maven_depmap JPP-geronimo-j2ee-deployment-1.1-api.pom geronimo-j2ee-deployment-1.1-api.jar -f j2ee-deployment-1.1-api - -install -m 0644 \ - geronimo-javaee-deployment_1.1MR3_spec-1.0/target/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar \ - %{buildroot}%{_javadir}/geronimo-javaee-deployment-1.1-api.jar -%{mvn_install_pom} geronimo-javaee-deployment_1.1MR3_spec-1.0/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-javaee-deployment-1.1-api.pom -%add_maven_depmap JPP-geronimo-javaee-deployment-1.1-api.pom geronimo-javaee-deployment-1.1-api.jar -f javaee-deployment-1.1-api - -install -m 0644 \ - geronimo-j2ee-jacc_1.0_spec-1.1/target/geronimo-j2ee-jacc_1.0_spec-1.1.jar \ - %{buildroot}%{_javadir}/geronimo-jacc-1.0-api.jar -%{mvn_install_pom} geronimo-j2ee-jacc_1.0_spec-1.1/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jacc-1.0-api.pom -%add_maven_depmap JPP-geronimo-jacc-1.0-api.pom geronimo-jacc-1.0-api.jar -f jacc-1.0-api - -install -m 0644 \ - geronimo-jacc_1.1_spec-1.0/target/geronimo-jacc_1.1_spec-1.0.jar \ - %{buildroot}%{_javadir}/geronimo-jacc-1.1-api.jar -%{mvn_install_pom} geronimo-jacc_1.1_spec-1.0/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jacc-1.1-api.pom -%add_maven_depmap JPP-geronimo-jacc-1.1-api.pom geronimo-jacc-1.1-api.jar -f jacc-1.1-api - -install -m 0644 \ - geronimo-j2ee-management_1.0_spec-1.1/target/geronimo-j2ee-management_1.0_spec-1.1.jar \ - %{buildroot}%{_javadir}/geronimo-j2ee-management-1.0-api.jar -%{mvn_install_pom} geronimo-j2ee-management_1.0_spec-1.1/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-j2ee-management-1.0-api.pom -%add_maven_depmap JPP-geronimo-j2ee-management-1.0-api.pom geronimo-j2ee-management-1.0-api.jar -f j2ee-management-1.0-api - -install -m 0644 \ - geronimo-j2ee-management_1.1_spec-1.0/target/geronimo-j2ee-management_1.1_spec-1.0.jar \ - %{buildroot}%{_javadir}/geronimo-j2ee-management-1.1-api.jar -%{mvn_install_pom} geronimo-j2ee-management_1.1_spec-1.0/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-j2ee-management-1.1-api.pom -%add_maven_depmap JPP-geronimo-j2ee-management-1.1-api.pom geronimo-j2ee-management-1.1-api.jar -f j2ee-management-1.1-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 -%{mvn_install_pom} geronimo-javamail_1.3.1_spec-1.3/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-javamail-1.3.1-api.pom -%add_maven_depmap JPP-geronimo-javamail-1.3.1-api.pom geronimo-javamail-1.3.1-api.jar -f javamail-1.3.1-api - -install -m 0644 \ - geronimo-javamail_1.4_spec-1.1/target/geronimo-javamail_1.4_spec-1.1.jar \ - %{buildroot}%{_javadir}/geronimo-javamail-1.4-api.jar -%{mvn_install_pom} geronimo-javamail_1.4_spec-1.1/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-javamail-1.4-api.pom -%add_maven_depmap JPP-geronimo-javamail-1.4-api.pom geronimo-javamail-1.4-api.jar -f javamail-1.4-api - -install -m 0644 \ - geronimo-jaxr_1.0_spec-1.1/target/geronimo-jaxr_1.0_spec-1.1.jar \ - %{buildroot}%{_javadir}/geronimo-jaxr-1.0-api.jar -%{mvn_install_pom} geronimo-jaxr_1.0_spec-1.1/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jaxr-1.0-api.pom -%add_maven_depmap JPP-geronimo-jaxr-1.0-api.pom geronimo-jaxr-1.0-api.jar -f jaxr-1.0-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 %{mvn_install_pom} geronimo-jaxrpc_1.1_spec-1.1/pom.xml \ @@ -794,13 +287,6 @@ %add_maven_depmap JPP-geronimo-jaxrpc-1.1-api.pom geronimo-jaxrpc-1.1-api.jar -f jaxrpc-1.1-api install -m 0644 \ - geronimo-spec-j2ee/target/geronimo-j2ee_1.4_spec-1.2-jar-with-dependencies.jar \ - %{buildroot}%{_javadir}/geronimo-j2ee-1.4-apis.jar -%{mvn_install_pom} geronimo-spec-j2ee/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-j2ee-1.4-apis.pom -%add_maven_depmap JPP-geronimo-j2ee-1.4-apis.pom geronimo-j2ee-1.4-apis.jar -f j2ee-1.4-apis - -install -m 0644 \ geronimo-jms_1.1_spec-1.1/target/geronimo-jms_1.1_spec-1.1.jar \ %{buildroot}%{_javadir}/geronimo-jms-1.1-api.jar %{mvn_install_pom} geronimo-jms_1.1_spec-1.1/pom.xml \ @@ -815,20 +301,6 @@ %add_maven_depmap JPP-geronimo-jpa-3.0-api.pom geronimo-jpa-3.0-api.jar -f jpa-3.0-api -a javax.persistence:persistence-api install -m 0644 \ - geronimo-jsp_2.0_spec-1.1/target/geronimo-jsp_2.0_spec-1.1.jar \ - %{buildroot}%{_javadir}/geronimo-jsp-2.0-api.jar -%{mvn_install_pom} geronimo-jsp_2.0_spec-1.1/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jsp-2.0-api.pom -%add_maven_depmap JPP-geronimo-jsp-2.0-api.pom geronimo-jsp-2.0-api.jar -f jsp-2.0-api - -install -m 0644 \ - geronimo-jsp_2.1_spec-1.0/target/geronimo-jsp_2.1_spec-1.0.jar \ - %{buildroot}%{_javadir}/geronimo-jsp-2.1-api.jar -%{mvn_install_pom} geronimo-jsp_2.1_spec-1.0/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jsp-2.1-api.pom -%add_maven_depmap JPP-geronimo-jsp-2.1-api.pom geronimo-jsp-2.1-api.jar -f jsp-2.1-api - -install -m 0644 \ geronimo-jta_1.0.1B_spec-1.1.1/target/geronimo-jta_1.0.1B_spec-1.1.1.jar \ %{buildroot}%{_javadir}/geronimo-jta-1.0.1B-api.jar %{mvn_install_pom} geronimo-jta_1.0.1B_spec-1.1.1/pom.xml \ @@ -870,31 +342,6 @@ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-servlet-2.5-api.pom %add_maven_depmap JPP-geronimo-servlet-2.5-api.pom geronimo-servlet-2.5-api.jar -f servlet-2.5-api -install -m 0644 \ - geronimo-stax-api_1.0_spec-1.0/target/geronimo-stax-api_1.0_spec-1.0.jar \ - %{buildroot}%{_javadir}/geronimo-stax-1.0-api.jar -%{mvn_install_pom} geronimo-stax-api_1.0_spec-1.0/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-stax-1.0-api.pom -%add_maven_depmap JPP-geronimo-stax-1.0-api.pom geronimo-stax-1.0-api.jar -f stax-1.0-api - -install -m 0644 \ - geronimo-ws-metadata_2.0_spec-1.1.1/target/geronimo-ws-metadata_2.0_spec-1.1.1.jar \ - %{buildroot}%{_javadir}/geronimo-ws-metadata-2.0-api.jar -%{mvn_install_pom} geronimo-ws-metadata_2.0_spec-1.1.1/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-ws-metadata-2.0-api.pom -%add_maven_depmap JPP-geronimo-ws-metadata-2.0-api.pom geronimo-ws-metadata-2.0-api.jar -f ws-metadata-2.0-api - -install -m 0644 \ - geronimo-spec-commonj/target/geronimo-commonj_1.1_spec-null.jar \ - %{buildroot}%{_javadir}/geronimo-commonj-1.1-apis.jar -%{mvn_install_pom} geronimo-spec-commonj/pom.xml \ - %{buildroot}/%{_mavenpomdir}/JPP-geronimo-commonj-1.1-apis.pom -%add_maven_depmap JPP-geronimo-commonj-1.1-apis.pom geronimo-commonj-1.1-apis.jar -f commonj-1.1-apis - -%pre -n geronimo-commonj-1_1-apis -update-alternatives --remove commonj_apis %{_javadir}/geronimo-commonj-1.1-apis.jar -update-alternatives --remove commonj_1_1_apis %{_javadir}/geronimo-commonj-1.1-apis.jar - %pre -n geronimo-jaf-1_0_2-api update-alternatives --remove jaf %{_javadir}/geronimo-jaf-1.0.2-api.jar update-alternatives --remove jaf_api %{_javadir}/geronimo-jaf-1.0.2-api.jar @@ -909,70 +356,6 @@ 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-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-j2ee-deployment-1_1-api -update-alternatives --remove j2ee-deployment %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar -update-alternatives --remove j2ee_deployment_api %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar -update-alternatives --remove j2ee_deployment_1_1_api %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar - -%pre -n geronimo-javaee-deployment-1_1-api -update-alternatives --remove javaee_deployment_api %{_javadir}/geronimo-javaee-deployment-1.1-api.jar -update-alternatives --remove javaee_deployment_1_1MR3_api %{_javadir}/geronimo-javaee-deployment-1.1-api.jar - -%pre -n geronimo-jacc-1_0-api -update-alternatives --remove jacc %{_javadir}/geronimo-jacc-1.0-api.jar -update-alternatives --remove jacc_api %{_javadir}/geronimo-jacc-1.0-api.jar -update-alternatives --remove jacc_1_0_api %{_javadir}/geronimo-jacc-1.0-api.jar - -%pre -n geronimo-jacc-1_1-api -update-alternatives --remove jacc_api %{_javadir}/geronimo-jacc-1.1-api.jar -update-alternatives --remove jacc_1_1_api %{_javadir}/geronimo-jacc-1.1-api.jar - -%pre -n geronimo-j2ee-management-1_0-api -update-alternatives --remove j2ee-management %{_javadir}/geronimo-j2ee-management-1.0-api.jar -update-alternatives --remove j2ee_management_api %{_javadir}/geronimo-j2ee-management-1.0-api.jar -update-alternatives --remove j2ee_management_1_0_api %{_javadir}/geronimo-j2ee-management-1.0-api.jar - -%pre -n geronimo-j2ee-management-1_1-api -update-alternatives --remove j2ee-management %{_javadir}/geronimo-j2ee-management-1.1-api.jar -update-alternatives --remove j2ee_management_api %{_javadir}/geronimo-j2ee-management-1.1-api.jar -update-alternatives --remove j2ee_management_1_1_api %{_javadir}/geronimo-j2ee-management-1.1-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 - -%pre -n geronimo-javamail-1_4-api -update-alternatives --remove javamail_api %{_javadir}/geronimo-javamail-1.4-api.jar -update-alternatives --remove javamail_1_4_api %{_javadir}/geronimo-javamail-1.4-api.jar - -%pre -n geronimo-jaxr-1_0-api -update-alternatives --remove jaxr %{_javadir}/geronimo-jaxr-1.0-api.jar -update-alternatives --remove jaxr_api %{_javadir}/geronimo-jaxr-1.0-api.jar -update-alternatives --remove jaxr_1_0_api %{_javadir}/geronimo-jaxr-1.0-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 @@ -987,16 +370,6 @@ update-alternatives --remove jpa_api %{_javadir}/geronimo-jpa-3.0-api.jar update-alternatives --remove jpa_3_0_api %{_javadir}/geronimo-jpa-3.0-api.jar -%pre -n geronimo-jsp-2_0-api -update-alternatives --remove jsp %{_javadir}/geronimo-jsp-2.0-api.jar -update-alternatives --remove jsp_api %{_javadir}/geronimo-jsp-2.0-api.jar -update-alternatives --remove jsp_2_0_api %{_javadir}/geronimo-jsp-2.0-api.jar - -%pre -n geronimo-jsp-2_1-api -update-alternatives --remove jsp %{_javadir}/geronimo-jsp-2.1-api.jar -update-alternatives --remove jsp_api %{_javadir}/geronimo-jsp-2.1-api.jar -update-alternatives --remove jsp_2_1_api %{_javadir}/geronimo-jsp-2.1-api.jar - %pre -n geronimo-jta-1_0_1B-api update-alternatives --remove jta %{_javadir}/geronimo-jta-1.0.1B-api.jar update-alternatives --remove jta_api %{_javadir}/geronimo-jta-1.0.1B-api.jar @@ -1026,52 +399,6 @@ update-alternatives --remove servlet_api %{_javadir}/geronimo-servlet-2.5-api.jar update-alternatives --remove servlet_2_5_api %{_javadir}/geronimo-servlet-2.5-api.jar -%pre -n geronimo-stax-1_0-api -update-alternatives --remove stax_api %{_javadir}/geronimo-stax-1.0-api.jar -update-alternatives --remove stax_1_0_api %{_javadir}/geronimo-stax-1.0-api.jar - -%pre -n geronimo-ws-metadata-2_0-api -update-alternatives --remove ws_metadata_api %{_javadir}/geronimo-ws-metadata-2.0-api.jar -update-alternatives --remove ws_metadata_2_0_api %{_javadir}/geronimo-ws-metadata-2.0-api.jar - -%pre -n geronimo-j2ee-1_4-apis -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 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 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 j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar -update-alternatives --remove j2ee_connector_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove j2ee_connector_1_5_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove j2ee_deployment_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove j2ee_deployment_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove j2ee_management_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove j2ee_management_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jacc_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jacc_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove javamail_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove javamail_1_3_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jaxr_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jaxr_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jaxrpc_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jaxrpc_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jms_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jms_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jsp_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jsp_2_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jta_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove jta_1_0_1B_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove qname_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove qname_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove saaj_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove saaj_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove servlet_api %{_javadir}/geronimo-j2ee-1.4-apis.jar -update-alternatives --remove servlet_2_4_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - -%files -n geronimo-commonj-1_1-apis -f .mfiles-commonj-1.1-apis -%license geronimo-spec-commonj/LICENSE.txt - %files -n geronimo-jaf-1_0_2-api -f .mfiles-jaf-1.0.2-api %license geronimo-activation_1.0.2_spec-1.2/LICENSE.txt @@ -1081,51 +408,6 @@ %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-j2ee-1_4-apis -f .mfiles-j2ee-1.4-apis -%license geronimo-spec-j2ee/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-j2ee-deployment-1_1-api -f .mfiles-j2ee-deployment-1.1-api -%license geronimo-j2ee-deployment_1.1_spec-1.1/LICENSE.txt - -%files -n geronimo-javaee-deployment-1_1-api -f .mfiles-javaee-deployment-1.1-api -%license geronimo-javaee-deployment_1.1MR3_spec-1.0/LICENSE.txt - -%files -n geronimo-jacc-1_0-api -f .mfiles-jacc-1.0-api -%license geronimo-j2ee-jacc_1.0_spec-1.1/LICENSE.txt - -%files -n geronimo-jacc-1_1-api -f .mfiles-jacc-1.1-api -%license geronimo-jacc_1.1_spec-1.0/LICENSE.txt - -%files -n geronimo-j2ee-management-1_0-api -f .mfiles-j2ee-management-1.0-api -%license geronimo-j2ee-management_1.0_spec-1.1/LICENSE.txt - -%files -n geronimo-j2ee-management-1_1-api -f .mfiles-j2ee-management-1.1-api -%license geronimo-j2ee-management_1.1_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 - -%files -n geronimo-javamail-1_4-api -f .mfiles-javamail-1.4-api -%license geronimo-javamail_1.4_spec-1.1/LICENSE.txt - -%files -n geronimo-jaxr-1_0-api -f .mfiles-jaxr-1.0-api -%license geronimo-jaxr_1.0_spec-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 @@ -1135,12 +417,6 @@ %files -n geronimo-jpa-3_0-api -f .mfiles-jpa-3.0-api %license geronimo-jpa_3.0_spec-1.1.0/LICENSE.txt -%files -n geronimo-jsp-2_0-api -f .mfiles-jsp-2.0-api -%license geronimo-jsp_2.0_spec-1.1/LICENSE.txt - -%files -n geronimo-jsp-2_1-api -f .mfiles-jsp-2.1-api -%license geronimo-jsp_2.1_spec-1.0/LICENSE.txt - %files -n geronimo-jta-1_0_1B-api -f .mfiles-jta-1.0.1B-api %license geronimo-jta_1.0.1B_spec-1.1.1/LICENSE.txt @@ -1159,9 +435,3 @@ %files -n geronimo-servlet-2_5-api -f .mfiles-servlet-2.5-api %license geronimo-servlet_2.5_spec-1.1/LICENSE.txt -%files -n geronimo-stax-1_0-api -f .mfiles-stax-1.0-api -%license geronimo-stax-api_1.0_spec-1.0/LICENSE.txt - -%files -n geronimo-ws-metadata-2_0-api -f .mfiles-ws-metadata-2.0-api -%license geronimo-ws-metadata_2.0_spec-1.1.1/LICENSE.txt - ++++++ geronimo-specs.build.xml ++++++ --- /var/tmp/diff_new_pack.t6xLwk/_old 2023-10-19 22:49:30.947211616 +0200 +++ /var/tmp/diff_new_pack.t6xLwk/_new 2023-10-19 22:49:30.951211761 +0200 @@ -24,70 +24,6 @@ <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="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="j2eedeployment" value="1.1" /> - <property name="j2eedeployment.id" value="geronimo-j2ee-deployment_1.1_spec" /> - <property name="j2eedeployment.dir" value="${j2eedeployment.id}-${j2eedeployment}" /> - <property name="j2eedeployment.jar" value="${j2eedeployment.dir}.jar" /> - - <property name="javaeedeployment" value="1.0" /> - <property name="javaeedeployment.dir" value="geronimo-javaee-deployment_1.1MR3_spec-${javaeedeployment}" /> - <property name="javaeedeployment.jar" value="${javaeedeployment.dir}.jar" /> - - <property name="jacc" value="1.0" /> - <property name="jacc.dir" value="geronimo-jacc_1.1_spec-${jacc}" /> - <property name="jacc.jar" value="${jacc.dir}.jar" /> - - <property name="j2eejacc" value="1.1" /> - <property name="j2eejacc.id" value="geronimo-j2ee-jacc_1.0_spec" /> - <property name="j2eejacc.dir" value="${j2eejacc.id}-${j2eejacc}" /> - <property name="j2eejacc.jar" value="${j2eejacc.dir}.jar" /> - - <property name="j2eemanagment10" value="1.1" /> - <property name="j2eemanagment10.id" value="geronimo-j2ee-management_1.0_spec" /> - <property name="j2eemanagment10.dir" value="${j2eemanagment10.id}-${j2eemanagment10}" /> - <property name="j2eemanagment10.jar" value="${j2eemanagment10.dir}.jar" /> - - <property name="j2eemanagment11" value="1.0" /> - <property name="j2eemanagment11.dir" value="geronimo-j2ee-management_1.1_spec-${j2eemanagment11}" /> - <property name="j2eemanagment11.jar" value="${j2eemanagment11.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" /> - <property name="javamail13.dir" value="${javamail13.id}-${javamail13}" /> - <property name="javamail13.jar" value="${javamail13.dir}.jar" /> - - <property name="javamail14" value="1.1" /> - <property name="javamail14.dir" value="geronimo-javamail_1.4_spec-${javamail14}" /> - <property name="javamail14.jar" value="${javamail14.dir}.jar" /> - - <property name="jaxr" value="1.1" /> - <property name="jaxr.id" value="geronimo-jaxr_1.0_spec" /> - <property name="jaxr.dir" value="${jaxr.id}-${jaxr}" /> - <property name="jaxr.jar" value="${jaxr.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}" /> @@ -102,15 +38,6 @@ <property name="jpa.dir" value="geronimo-jpa_3.0_spec-${jpa}" /> <property name="jpa.jar" value="geronimo-jpa_3.0_spec-1.1.jar" /> - <property name="jsp20" value="1.1" /> - <property name="jsp20.id" value="geronimo-jsp_2.0_spec" /> - <property name="jsp20.dir" value="${jsp20.id}-${jsp20}" /> - <property name="jsp20.jar" value="${jsp20.dir}.jar" /> - - <property name="jsp21" value="1.0" /> - <property name="jsp21.dir" value="geronimo-jsp_2.1_spec-${jsp21}" /> - <property name="jsp21.jar" value="${jsp21.dir}.jar" /> - <property name="jta10" value="1.1.1" /> <property name="jta10.id" value="geronimo-jta_1.0.1B_spec" /> <property name="jta10.dir" value="${jta10.id}-${jta10}" /> @@ -139,61 +66,10 @@ <property name="servlet25.dir" value="geronimo-servlet_2.5_spec-${servlet25}" /> <property name="servlet25.jar" value="${servlet25.dir}.jar" /> - <property name="stax" value="1.0" /> - <property name="stax.dir" value="geronimo-stax-api_1.0_spec-${stax}" /> - <property name="stax.jar" value="${stax.dir}.jar" /> - - <property name="wsmetadata" value="1.1.1" /> - <property name="wsmetadata.dir" value="geronimo-ws-metadata_2.0_spec-${wsmetadata}" /> - <property name="wsmetadata.jar" value="${wsmetadata.dir}.jar" /> - - <property name="commonj" value="null" /> - <property name="commonj.ver" value="${geronimoSpecsCommonjVersion}" /> - <property name="commonj.id" value="geronimo-commonj_1.1_spec" /> - <property name="commonj.dir" value="geronimo-spec-commonj/" /> - <property name="commonj.jar" value="${commonj.id}-${commonj}.jar" /> - <target name="dist" depends="build"> </target> - <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 name="geronimo-spec-j2ee"> - <mkdir dir="geronimo-spec-j2ee/${dist}" /> - <jar jarfile="geronimo-spec-j2ee/${dist}/geronimo-j2ee_1.4_spec-1.2-jar-with-dependencies.jar" duplicate="preserve"> - <fileset dir="${activation102.dir}/${build}"/> - <fileset dir="${activation110.dir}/${build}"/> - <fileset dir="${annotation.dir}/${build}"/> - <fileset dir="${ejb21.dir}/${build}"/> - <fileset dir="${ejb30.dir}/${build}"/> - <fileset dir="${el10.dir}/${build}"/> - <fileset dir="${interceptor.dir}/${build}"/> - <fileset dir="${connector.dir}/${build}"/> - <fileset dir="${j2eedeployment.dir}/${build}"/> - <fileset dir="${javaeedeployment.dir}/${build}"/> - <fileset dir="${jacc.dir}/${build}"/> - <fileset dir="${j2eejacc.dir}/${build}"/> - <fileset dir="${j2eemanagment10.dir}/${build}"/> - <fileset dir="${j2eemanagment11.dir}/${build}"/> - <fileset dir="${javamail13.dir}/${build}"/> - <fileset dir="${javamail14.dir}/${build}"/> - <fileset dir="${jaxr.dir}/${build}"/> - <fileset dir="${jaxrpc.dir}/${build}"/> - <fileset dir="${jms.dir}/${build}"/> - <fileset dir="${jpa.dir}/${build}"/> - <fileset dir="${jsp20.dir}/${build}"/> - <fileset dir="${jsp21.dir}/${build}"/> - <fileset dir="${jta10.dir}/${build}"/> - <fileset dir="${jta11.dir}/${build}"/> - <fileset dir="${qname.dir}/${build}"/> - <fileset dir="${saaj.dir}/${build}"/> - <fileset dir="${servlet24.dir}/${build}"/> - <fileset dir="${servlet25.dir}/${build}"/> - <fileset dir="${stax.dir}/${build}"/> - <fileset dir="${wsmetadata.dir}/${build}"/> - <fileset dir="${commonj.dir}/${build}"/> - </jar> + <target name="build" depends="activation102, activation110, annotation, jaxrpc, jms, jpa, jta10, jta11, qname, saaj, servlet24, servlet25"> </target> <!-- @@ -263,99 +139,6 @@ </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}" /> - <param name="gbuild.jar" value="${el10.jar}" /> - </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="connector"> - <antcall target="gbuild"> - <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> - - <target name="j2eedeployment"> - <antcall target="gbuild"> - <param name="gbuild.dir" value="${j2eedeployment.dir}" /> - <param name="gbuild.jar" value="${j2eedeployment.jar}" /> - <param name="gbuild.id" value="${j2eedeployment.id}" /> - <param name="gbuild.ver" value="${j2eedeployment}" /> - </antcall> - </target> - - <target name="javaeedeployment"> - <antcall target="gbuild"> - <param name="gbuild.dir" value="${javaeedeployment.dir}" /> - <param name="gbuild.jar" value="${javaeedeployment.jar}" /> - </antcall> - </target> - - <target name="jacc" depends="servlet24"> - <antcall target="gbuild"> - <param name="gbuild.dir" value="${jacc.dir}" /> - <param name="gbuild.jar" value="${jacc.jar}" /> - <param name="gbuild.classpath" value="${servlet24.dir}/${dist}/${servlet24.jar}"/> - </antcall> - </target> - - <target name="j2eejacc" depends="servlet24"> - <antcall target="gbuild"> - <param name="gbuild.dir" value="${j2eejacc.dir}" /> - <param name="gbuild.jar" value="${j2eejacc.jar}" /> - <param name="gbuild.classpath" value="${servlet24.dir}/${dist}/${servlet24.jar}"/> - <param name="gbuild.id" value="${j2eejacc.id}" /> - <param name="gbuild.ver" value="${j2eejacc}" /> - </antcall> - </target> - - <target name="j2eemanagment10" depends="ejb21"> - <antcall target="gbuild"> - <param name="gbuild.dir" value="${j2eemanagment10.dir}" /> - <param name="gbuild.jar" value="${j2eemanagment10.jar}" /> - <param name="gbuild.classpath" value="${ejb21.dir}/${dist}/${ejb21.jar}"/> - <param name="gbuild.id" value="${j2eemanagment10.id}" /> - <param name="gbuild.ver" value="${j2eemanagment10}" /> - </antcall> - </target> - - <target name="j2eemanagment11" depends="ejb21"> - <antcall target="gbuild"> - <param name="gbuild.dir" value="${j2eemanagment11.dir}" /> - <param name="gbuild.jar" value="${j2eemanagment11.jar}" /> - <param name="gbuild.classpath" value="${ejb21.dir}/${dist}/${ejb21.jar}"/> - </antcall> - </target> - <target name="javamail13" depends="activation102"> <antcall target="gbuild"> <param name="gbuild.dir" value="${javamail13.dir}" /> @@ -410,24 +193,6 @@ </antcall> </target> - <target name="jsp20" depends="servlet24"> - <antcall target="gbuild"> - <param name="gbuild.dir" value="${jsp20.dir}" /> - <param name="gbuild.jar" value="${jsp20.jar}" /> - <param name="gbuild.classpath" value="${servlet24.dir}/${dist}/${servlet24.jar}"/> - <param name="gbuild.id" value="${jsp20.id}" /> - <param name="gbuild.ver" value="${jsp20}" /> - </antcall> - </target> - - <target name="jsp21" depends="servlet24, el10"> - <antcall target="gbuild"> - <param name="gbuild.dir" value="${jsp21.dir}" /> - <param name="gbuild.jar" value="${jsp21.jar}" /> - <param name="gbuild.classpath" value="${servlet24.dir}/${dist}/${servlet24.jar}:${el10.dir}/${dist}/${el10.jar}"/> - </antcall> - </target> - <target name="jta10"> <antcall target="gbuild"> <param name="gbuild.dir" value="${jta10.dir}" /> @@ -479,29 +244,6 @@ </antcall> </target> - <target name="stax"> - <antcall target="gbuild"> - <param name="gbuild.dir" value="${stax.dir}" /> - <param name="gbuild.jar" value="${stax.jar}" /> - </antcall> - </target> - - <target name="wsmetadata"> - <antcall target="gbuild"> - <param name="gbuild.dir" value="${wsmetadata.dir}" /> - <param name="gbuild.jar" value="${wsmetadata.jar}" /> - </antcall> - </target> - - <target name="commonj"> - <antcall target="gbuild"> - <param name="gbuild.dir" value="${commonj.dir}" /> - <param name="gbuild.jar" value="${commonj.jar}" /> - <param name="gbuild.id" value="${commonj.id}" /> - <param name="gbuild.ver" value="${commonj.ver}" /> - </antcall> - </target> - <target name="clean" description="clean up" > <delete dir="geronimo-spec-j2ee/${dist}" /> </target>
