From 882cc9a06d1e2456c62b314b6637d41af2debba3ea4f7eed2719ad9a75bc0071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 19 May 2017 13:25:30 +0000 Subject: [PATCH] - Fix building with new javapackages-tools - Remove unused conditionals OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=20 --- geronimo-specs.changes | 6 + geronimo-specs.spec | 1008 +++++++++++++++------------------------- 2 files changed, 388 insertions(+), 626 deletions(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index c4bc71a..69929a8 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri May 19 13:22:01 UTC 2017 - tchvatal@suse.com + +- Fix building with new javapackages-tools +- Remove unused conditionals + ------------------------------------------------------------------- Wed Mar 18 09:46:07 UTC 2015 - tchvatal@suse.com diff --git a/geronimo-specs.spec b/geronimo-specs.spec index 230738c..1f448e2 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -1,7 +1,7 @@ # # spec file for package geronimo-specs # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,16 +16,7 @@ # -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} -# build withouth maven -%define with_maven 0 -%bcond_with tests -%define with_tests 0 %define bname geronimo -%define section free %define sver_activation_1_0_2 1.2 %define sver_activation_1_1 1.0 %define sver_annotation_1_0 1.1.0 @@ -60,7 +51,6 @@ %define sver_stax_1_0 1.0 %define sver_ws_metadata_2_0 1.1.1 %define sver_commonj_1_1 1.0 - Name: geronimo-specs Version: 1.2 Release: 0 @@ -124,49 +114,18 @@ Patch2: geronimo-specs-j2ee-connector-1.5-pom_xml.patch Patch3: geronimo-specs-servlet-2.4-pom_xml.patch Patch4: geronimo-specs-j2ee-1.4-pom_xml.patch Patch5: geronimo-specs-corba-2.3-pom_xml.patch -BuildRequires: java-devel >= 1.5.0 -BuildRequires: javapackages-tools -%if %{with_maven} -BuildRequires: maven-shared-file-management -BuildRequires: maven2 >= 2.0.4 -BuildRequires: maven2-plugin-javadoc -BuildRequires: saxon -BuildRequires: saxon-scripts -BuildRequires: sed -# TODO: USE org.apache.geronimo.genesis.plugins:tools-maven-plugin -# TODO: USE org.apache.felix:maven-bundle-plugin -BuildRequires: maven-release -BuildRequires: maven-surefire-plugin -BuildRequires: maven2-plugin-assembly -BuildRequires: maven2-plugin-compiler -BuildRequires: maven2-plugin-idea -BuildRequires: maven2-plugin-install -BuildRequires: maven2-plugin-jar -BuildRequires: maven2-plugin-one -BuildRequires: maven2-plugin-resources -BuildRequires: mojo-maven2-plugin-idlj -%else BuildRequires: ant -%endif -BuildRequires: junit >= 3.8.1 -%if %{with_tests} -BuildRequires: jacorb >= 2.3.0-11 -BuildRequires: mockobjects < 0.10 -BuildRequires: mockobjects >= 0.09 -BuildRequires: mockobjects-jdk1_4-j2ee1_4 < 0.10 -BuildRequires: mockobjects-jdk1_4-j2ee1_4 >= 0.09 -BuildRequires: mx4j >= 2.0.1 -BuildRequires: ws-scout -%endif BuildRequires: fdupes +BuildRequires: java-devel >= 1.5.0 +BuildRequires: javapackages-local +BuildRequires: javapackages-tools +BuildRequires: junit >= 3.8.1 # The main package has links to all specs, so it requires all subpackages # except j2ee-schema (not linked) and javadocs Requires: geronimo-annotation-1_0-api = %{version} Requires: geronimo-commonj-1_1-apis = %{version} Requires: geronimo-corba-1_0-apis = %{version} Requires: geronimo-corba-2_3-apis = %{version} -Requires: geronimo-jaf-1_0_2-api = %{version} -Requires: geronimo-jaf-1_1-api = %{version} #Requires: geronimo-corba-3_0-apis = %{version}-%{release} Requires: geronimo-ejb-2_1-api = %{version} Requires: geronimo-ejb-3_0-api = %{version} @@ -179,6 +138,8 @@ Requires: geronimo-j2ee-management-1_0-api = %{version} Requires: geronimo-j2ee-management-1_1-api = %{version} Requires: geronimo-jacc-1_0-api = %{version} Requires: geronimo-jacc-1_1-api = %{version} +Requires: geronimo-jaf-1_0_2-api = %{version} +Requires: geronimo-jaf-1_1-api = %{version} Requires: geronimo-javaee-deployment-1_1-api = %{version} Requires: geronimo-javamail-1_3_1-api = %{version} Requires: geronimo-javamail-1_4-api = %{version} @@ -196,8 +157,8 @@ Requires: geronimo-servlet-2_4-api = %{version} Requires: geronimo-servlet-2_5-api = %{version} Requires: geronimo-stax-1_0-api = %{version} Requires: geronimo-ws-metadata-2_0-api = %{version} -BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -205,8 +166,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 javadoc Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java @@ -217,8 +176,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-commonj-1_1-apis Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java @@ -230,45 +187,41 @@ Provides: commonj_apis = 1.1 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 Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +# Don't obsolete jaf, classpathx-jaf provides it +# Don't even obsolete it versioned, as sun-jaf is at 1.1 +#Obsoletes: jaf +Requires(preun): update-alternatives Provides: jaf = 1.0.2 # TODO: drop asap Provides: activation_1_0_2_api = %{version}-%{release} Provides: activation_api = 1.0.2 Provides: jaf_1_0_2_api = %{version}-%{release} Provides: jaf_api = 1.0.2 -Requires: %{name}-poms = %{version} -# Don't obsolete jaf, classpathx-jaf provides it -# Don't even obsolete it versioned, as sun-jaf is at 1.1 -#Obsoletes: jaf -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-jaf-1_0_2-api Geronimo is Apache's ASF-licenced J2EE server project. These are the J2EE-Specifications: Java Activation Framework - - %package -n geronimo-jaf-1_1-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +# Don't obsolete jaf, classpathx-jaf provides it +# Don't even obsolete it versioned, as sun-jaf is at 1.1 +#Obsoletes: jaf +Requires(preun): update-alternatives Provides: jaf = 1.1 # TODO: drop asap Provides: activation_1_1_api = %{version}-%{release} Provides: activation_api = 1.1 Provides: jaf_1_1_api = %{version}-%{release} Provides: jaf_api = 1.1 -Requires: %{name}-poms = %{version} -# Don't obsolete jaf, classpathx-jaf provides it -# Don't even obsolete it versioned, as sun-jaf is at 1.1 -#Obsoletes: jaf -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-jaf-1_1-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -276,16 +229,14 @@ 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-annotation-1_0-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: annotation_1_0_api Provides: annotation_api = 1.0 -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-annotation-1_0-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -293,68 +244,60 @@ 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-corba-1_0-apis Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} Provides: corba_1_0_apis = %{version}-%{release} Provides: corba_apis = 1.0 -Requires: %{name}-poms = %{version} %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 +Requires: %{name}-poms = %{version} Provides: corba_2_3_apis = %{version}-%{release} Provides: corba_apis = 2.3 -Requires: %{name}-poms = %{version} %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 Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires: jta_1_0_1B_api +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: ejb = 2.1 # TODO: drop asap Provides: ejb_2_1_api = %{version}-%{release} Provides: ejb_api = 2.1 # drop the following asap Obsoletes: ejb -Requires: %{name}-poms = %{version} -Requires: jta_1_0_1B_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %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: %{name}-poms = %{version} +Requires: annotation_1_0_api +Requires: interceptor_3_0_api +Requires: jta_1_1_api +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: ejb = 3.0 # TODO: drop asap Provides: ejb_3_0_api = %{version}-%{release} Provides: ejb_api = 3.0 Obsoletes: ejb -Requires: %{name}-poms = %{version} -Requires: annotation_1_0_api -Requires: interceptor_3_0_api -Requires: jta_1_1_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-ejb-3_0-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -362,16 +305,14 @@ 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: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: el_1_0_api = %{version}-%{release} Provides: el_api = 1.0 -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-el-1_0-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -379,16 +320,14 @@ 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: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: interceptor_3_0_api = %{version}-%{release} Provides: interceptor_api = 3.0 -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-interceptor-3_0-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -396,12 +335,17 @@ 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 Group: Development/Languages/Java Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +# 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 +# +Requires(preun): update-alternatives Provides: commonj_1_1_apis = %{version}-%{release} Provides: commonj_apis = 1.1 Provides: corba_2_3_apis = %{version}-%{release} @@ -459,65 +403,52 @@ Provides: servlet = 2.4 Provides: geronimo-corba-2_3-apis = %{version}-%{release} # added Epoch Provides: geronimo-qname-1_1-api = %{version}-%{release} -# 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 -# -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %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: %{name}-poms = %{version} +Requires: jta_1_0_1B_api +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: j2ee_connector_1_5_api = %{version}-%{release} Provides: j2ee_connector_api = 1.5 # drop the following asap Provides: j2ee-connector = 1.5 Obsoletes: j2ee-connector -Requires: %{name}-poms = %{version} -Requires: jta_1_0_1B_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %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: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: j2ee_deployment_1_1_api = %{version}-%{release} Provides: j2ee_deployment_api = 1.1 # drop the following asap Provides: j2ee-deployment = 1.1 Obsoletes: j2ee-deployment -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %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: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: javaee_deployment_1_1_api = %{version}-%{release} Provides: javaee_deployment_api = 1.1 -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-javaee-deployment-1_1-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -525,36 +456,32 @@ 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: %{name}-poms = %{version} +Requires: servlet_2_4_api +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: jacc = 1.0 # TODO: drop asap Provides: jacc_1_0_api = %{version}-%{release} Provides: jacc_api = 1.0 -Requires: %{name}-poms = %{version} -Requires: servlet_2_4_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %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 -Provides: jacc_1_1_api = %{version}-%{release} -Provides: jacc_api = 1.1 Requires: %{name}-poms = %{version} Requires: servlet_2_5_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: jacc_1_1_api = %{version}-%{release} +Provides: jacc_api = 1.1 %description -n geronimo-jacc-1_1-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -562,39 +489,35 @@ 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: %{name}-poms = %{version} +Requires: ejb_2_1_api +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: j2ee_management_1_0_api = %{version}-%{release} Provides: j2ee_management_api = 1.0 # drop the following asap Provides: j2ee-management = 1.0 Obsoletes: j2ee-management -Requires: %{name}-poms = %{version} -Requires: ejb_2_1_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %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: %{name}-poms = %{version} +Requires: ejb_3_0_api +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: j2ee_management_1_1_api = %{version}-%{release} Provides: j2ee_management_api = 1.1 # drop the following asap Provides: j2ee-management = 1.1 Obsoletes: j2ee-management -Requires: %{name}-poms = %{version} -Requires: ejb_3_0_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-j2ee-management-1_1-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -602,17 +525,15 @@ 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 -Provides: javamail_1_3_1_api = %{version}-%{release} -Provides: javamail_api = 1.3.1 Requires: %{name}-poms = %{version} Requires: jaf_1_0_2_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: javamail_1_3_1_api = %{version}-%{release} +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' @@ -622,17 +543,15 @@ Requires(post): %{_sbindir}/update-alternatives 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 -Provides: javamail_1_4_api = %{version}-%{release} -Provides: javamail_api = 1.4 Requires: %{name}-poms = %{version} Requires: jaf_1_1_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: javamail_1_4_api = %{version}-%{release} +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' @@ -644,73 +563,65 @@ 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: %{name}-poms = %{version} +Requires: jaf_1_0_2_api +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: jaxr_1_0_api = %{version}-%{release} Provides: jaxr_api = 1.0 # drop the following asap Provides: jaxr = 1.0 Obsoletes: jaxr-api -Requires: %{name}-poms = %{version} -Requires: jaf_1_0_2_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %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 Group: Development/Languages/Java -Provides: jaxrpc = 1.1 -# TODO: drop asap -Provides: jaxrpc_1_1_api = %{version}-%{release} -Provides: jaxrpc_api = 1.1 Requires: %{name}-poms = %{version} Requires: qname_1_1_api Requires: saaj_1_1_api Requires: servlet_2_4_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: jaxrpc = 1.1 +# TODO: drop asap +Provides: jaxrpc_1_1_api = %{version}-%{release} +Provides: jaxrpc_api = 1.1 %description -n geronimo-jaxrpc-1_1-api Geronimo is Apache's ASF-licenced J2EE server project. These are the J2EE-Specifications: Java API for XML-Based RPC (JAXRPC) - - %package -n geronimo-jms-1_1-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: jms_1_1_api = %{version}-%{release} Provides: jms_api = 1.1 # drop the following asap Provides: jms = 1.1 Obsoletes: jms -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-jms-1_1-api Geronimo is Apache's ASF-licenced J2EE server project. These are the J2EE-Specifications: JMS Specification - - %package -n geronimo-jpa-3_0-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: jpa_3_0_api = %{version}-%{release} Provides: jpa_api = 3.0 -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-jpa-3_0-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -718,38 +629,34 @@ 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-jsp-2_0-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires: servlet_2_4_api +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: jsp = 2.0 # TODO: drop asap Provides: jsp_2_0_api = %{version}-%{release} Provides: jsp_api = 2.0 -Requires: %{name}-poms = %{version} -Requires: servlet_2_4_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %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: %{name}-poms = %{version} +Requires: el_1_0_api +Requires: servlet_2_5_api +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: jsp = 2.1 # TODO: drop asap Provides: jsp_2_1_api = %{version}-%{release} Provides: jsp_api = 2.1 -Requires: %{name}-poms = %{version} -Requires: el_1_0_api -Requires: servlet_2_5_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-jsp-2_1-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -757,39 +664,35 @@ 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 Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: jta_1_0_1B_api = %{version}-%{release} Provides: jta_api = 1.0.1B # drop the following asap Provides: jta = 1.0.1B -# Don't obsolete jta, as this is provided by java-1.4.2-gcj-compat -#Obsoletes: jta -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-jta-1_0_1B-api Geronimo is Apache's ASF-licenced J2EE server project. These are the 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 Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: jta_1_1_api = %{version}-%{release} Provides: jta_api = 1.1 # drop the following asap Provides: jta = 1.1 -# Don't obsolete jta, as this is provided by java-1.4.2-gcj-compat -#Obsoletes: jta -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-jta-1_1-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -797,68 +700,60 @@ 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-qname-1_1-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: qname_1_1_api = %{version}-%{release} Provides: qname_api = 1.1 -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-qname-1_1-api Geronimo is Apache's ASF-licenced J2EE server project. These are the J2EE-Specifications: javax.xml.namespace.QName API - - %package -n geronimo-saaj-1_1-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires: jaf_1_0_2_api +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: saaj = 1.1 # TODO: drop asap Provides: saaj_1_1_api = %{version}-%{release} Provides: saaj_api = 1.1 -Requires: %{name}-poms = %{version} -Requires: jaf_1_0_2_api -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-saaj-1_1-api Geronimo is Apache's ASF-licenced J2EE server project. These are the J2EE-Specifications: SOAP with Attachments API for Java (SAAJ) - - %package -n geronimo-servlet-2_4-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: servlet = 2.4 # TODO: drop asap Provides: servlet_2_4_api = %{version}-%{release} Provides: servlet_api = 2.4 -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-servlet-2_4-api Geronimo is Apache's ASF-licenced J2EE server project. These are the J2EE-Specifications: J2EE Servlet v2.4 API - - %package -n geronimo-servlet-2_5-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: servlet = 2.5 # TODO: drop asap Provides: servlet_2_5_api = %{version}-%{release} Provides: servlet_api = 2.5 -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-servlet-2_5-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -866,16 +761,14 @@ 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-stax-1_0-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Requires: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: stax_1_0_api = %{version}-%{release} Provides: stax_api = 1.0 -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-stax-1_0-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -883,16 +776,14 @@ 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: %{name}-poms = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives Provides: ws_metadata_2_0_api = %{version}-%{release} Provides: ws_metadata_api = 2.0 -Requires: %{name}-poms = %{version} -Requires(preun): %{_sbindir}/update-alternatives -Requires(post): %{_sbindir}/update-alternatives %description -n geronimo-ws-metadata-2_0-api Geronimo is Apache's ASF-licenced J2EE server project. These are the @@ -900,12 +791,10 @@ 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 poms Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java -Requires(post): javapackages-tools +Requires(post): javapackages-tools Requires(postun): javapackages-tools %description poms @@ -913,10 +802,8 @@ Geronimo is Apache's ASF-licenced J2EE server project. These are the J2EE-Specifications: The Project Object Model files for the geronimo-specs modules. - - %prep -%setup -q -n %{name}-%{version} +%setup -q chmod -R go=u-w * mkdir etc cp LICENSE.txt etc @@ -931,52 +818,8 @@ ln -s %{_javadir} external_repo/JPP cp %{SOURCE1000} build.xml %build -%if %{with_maven} -export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository -mkdir -p $MAVEN_REPO_LOCAL -export CLASSPATH= -mvn-jpp install:install-file \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -DgroupId=mockobjects \ - -DartifactId=mockobjects-jdk1.4-j2ee1.3 \ - -Dversion=0.09 \ - -Dpackaging=jar \ - -Dfile=$(build-classpath mockobjects-jdk1.4-j2ee1.4) -mvn-jpp \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.test.failure.ignore=true \ - -Dmaven2.jpp.depmap.file=%{SOURCE1} \ -%if %without tests - -Dmaven.test.skip=true \ -%endif - install javadoc:javadoc -pushd geronimo-spec-j2ee -mvn-jpp \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.test.failure.ignore=true \ - -Dmaven2.jpp.depmap.file=%{SOURCE1} \ -%if %without tests - -Dmaven.test.skip=true \ -%endif - assembly:assembly -popd -# FIXME: (dwalluck): fix build under JDK6 -for i in geronimo-annotation_1.0_spec-%{sver_annotation_1_0} geronimo-ejb_3.0_spec-%{sver_ejb_3_0} geronimo-interceptor_3.0_spec-%{sver_interceptor_3_0}; do - pushd $i - mvn-jpp \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.test.failure.ignore=true \ - -Dmaven2.jpp.depmap.file=%{SOURCE1} \ -%if %without tests - -Dmaven.test.skip=true \ -%endif - install javadoc:javadoc - popd -done -%else ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \ -Didlj=%{java_home}/bin/idlj -%endif %install # Directory for poms @@ -1724,9 +1567,7 @@ install -d -m 755 \ %{buildroot}%{_docdir}/%{name}-%{version}/j2ee-1.4 cp -pr etc/LICENSE.txt \ %{buildroot}%{_docdir}/%{name}-%{version} -%if %defined suse_version export NO_BRP_STALE_LINK_ERROR="yes" -%endif %fdupes -s %{buildroot}/%{_javadocdir}/%{name}-%{version} # update-alternatives symlinks @@ -1839,531 +1680,457 @@ ln -sf %{_sysconfdir}/alternatives/servlet_api.jar %{buildroot}%{_javadir}/servl ln -sf %{_sysconfdir}/alternatives/servlet_2_4_api.jar %{buildroot}%{_javadir}/servlet_2_4_api.jar %post -n geronimo-commonj-1_1-apis -%{_sbindir}/update-alternatives --install %{_javadir}/commonj_apis.jar commonj_apis %{_javadir}/geronimo-commonj-1.1-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/commonj_1_1_apis.jar commonj_1_1_apis %{_javadir}/geronimo-commonj-1.1-apis.jar 10100 +update-alternatives --install %{_javadir}/commonj_apis.jar commonj_apis %{_javadir}/geronimo-commonj-1.1-apis.jar 10100 +update-alternatives --install %{_javadir}/commonj_1_1_apis.jar commonj_1_1_apis %{_javadir}/geronimo-commonj-1.1-apis.jar 10100 %preun -n geronimo-commonj-1_1-apis if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove commonj_apis %{_javadir}/geronimo-commonj-1.1-apis.jar - %{_sbindir}/update-alternatives --remove commonj_1_1_apis %{_javadir}/geronimo-commonj-1.1-apis.jar + 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 fi %post -n geronimo-jaf-1_0_2-api -%{_sbindir}/update-alternatives --install %{_javadir}/jaf.jar jaf %{_javadir}/geronimo-jaf-1.0.2-api.jar 10002 -%{_sbindir}/update-alternatives --install %{_javadir}/jaf_api.jar jaf_api %{_javadir}/geronimo-jaf-1.0.2-api.jar 10002 -%{_sbindir}/update-alternatives --install %{_javadir}/jaf_1_0_2_api.jar jaf_1_0_2_api %{_javadir}/geronimo-jaf-1.0.2-api.jar 10002 +update-alternatives --install %{_javadir}/jaf.jar jaf %{_javadir}/geronimo-jaf-1.0.2-api.jar 10002 +update-alternatives --install %{_javadir}/jaf_api.jar jaf_api %{_javadir}/geronimo-jaf-1.0.2-api.jar 10002 +update-alternatives --install %{_javadir}/jaf_1_0_2_api.jar jaf_1_0_2_api %{_javadir}/geronimo-jaf-1.0.2-api.jar 10002 %preun -n geronimo-jaf-1_0_2-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jaf %{_javadir}/geronimo-jaf-1.0.2-api.jar - %{_sbindir}/update-alternatives --remove jaf_api %{_javadir}/geronimo-jaf-1.0.2-api.jar - %{_sbindir}/update-alternatives --remove jaf_1_0_2_api %{_javadir}/geronimo-jaf-1.0.2-api.jar + 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 + update-alternatives --remove jaf_1_0_2_api %{_javadir}/geronimo-jaf-1.0.2-api.jar fi %post -n geronimo-jaf-1_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/jaf.jar jaf %{_javadir}/geronimo-jaf-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jaf_api.jar jaf_api %{_javadir}/geronimo-jaf-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jaf_1_1_api.jar jaf_1_1_api %{_javadir}/geronimo-jaf-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jaf.jar jaf %{_javadir}/geronimo-jaf-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jaf_api.jar jaf_api %{_javadir}/geronimo-jaf-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jaf_1_1_api.jar jaf_1_1_api %{_javadir}/geronimo-jaf-1.1-api.jar 10100 %preun -n geronimo-jaf-1_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jaf %{_javadir}/geronimo-jaf-1.1-api.jar - %{_sbindir}/update-alternatives --remove jaf_api %{_javadir}/geronimo-jaf-1.1-api.jar - %{_sbindir}/update-alternatives --remove jaf_1_1_api %{_javadir}/geronimo-jaf-1.1-api.jar + update-alternatives --remove jaf %{_javadir}/geronimo-jaf-1.1-api.jar + update-alternatives --remove jaf_api %{_javadir}/geronimo-jaf-1.1-api.jar + update-alternatives --remove jaf_1_1_api %{_javadir}/geronimo-jaf-1.1-api.jar fi %post -n geronimo-annotation-1_0-api -%{_sbindir}/update-alternatives --install %{_javadir}/annotation_api.jar annotation_api %{_javadir}/geronimo-annotation-1.0-api.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/annotation_1_0_api.jar annotation_1_0_api %{_javadir}/geronimo-annotation-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/annotation_api.jar annotation_api %{_javadir}/geronimo-annotation-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/annotation_1_0_api.jar annotation_1_0_api %{_javadir}/geronimo-annotation-1.0-api.jar 10000 %preun -n geronimo-annotation-1_0-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove annotation_api %{_javadir}/geronimo-annotation-1.0-api.jar - %{_sbindir}/update-alternatives --remove annotation_1_0_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 fi %post -n geronimo-corba-1_0-apis -%{_sbindir}/update-alternatives --install %{_javadir}/corba_apis.jar corba_apis %{_javadir}/geronimo-corba-1.0-apis.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/corba_1_0_apis.jar corba_1_0_apis %{_javadir}/geronimo-corba-1.0-apis.jar 10000 +update-alternatives --install %{_javadir}/corba_apis.jar corba_apis %{_javadir}/geronimo-corba-1.0-apis.jar 10000 +update-alternatives --install %{_javadir}/corba_1_0_apis.jar corba_1_0_apis %{_javadir}/geronimo-corba-1.0-apis.jar 10000 %preun -n geronimo-corba-1_0-apis if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove corba_apis %{_javadir}/geronimo-corba-1.0-apis.jar - %{_sbindir}/update-alternatives --remove corba_1_0_apis %{_javadir}/geronimo-corba-1.0-apis.jar + 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 fi %post -n geronimo-corba-2_3-apis -%{_sbindir}/update-alternatives --install %{_javadir}/corba_apis.jar corba_apis %{_javadir}/geronimo-corba-2.3-apis.jar 20300 -%{_sbindir}/update-alternatives --install %{_javadir}/corba_2_3_apis.jar corba_2_3_apis %{_javadir}/geronimo-corba-2.3-apis.jar 20300 +update-alternatives --install %{_javadir}/corba_apis.jar corba_apis %{_javadir}/geronimo-corba-2.3-apis.jar 20300 +update-alternatives --install %{_javadir}/corba_2_3_apis.jar corba_2_3_apis %{_javadir}/geronimo-corba-2.3-apis.jar 20300 %preun -n geronimo-corba-2_3-apis if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove corba_apis %{_javadir}/geronimo-corba-2.3-apis.jar - %{_sbindir}/update-alternatives --remove corba_2_3_apis %{_javadir}/geronimo-corba-2.3-apis.jar + 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 fi -#%post -n geronimo-corba-3.0-apis -#%{_sbindir}/update-alternatives --install %{_javadir}/corba_apis.jar corba_apis %{_javadir}/geronimo-corba-3.0-apis.jar 30000 -#%{_sbindir}/update-alternatives --install %{_javadir}/corba_3_0_apis.jar corba_3_0_apis %{_javadir}/geronimo-corba-3.0-apis.jar 30000 -#%if %{gcj_support} -#if [ -x %{_bindir}/rebuild-gcj-db ] -#then -# %{_bindir}/rebuild-gcj-db -#fi -#%endif -#%preun -n geronimo-corba-3.0-apis -#if [ "$1" = "0" ]; then -# %{_sbindir}/update-alternatives --remove corba_apis %{_javadir}/geronimo-corba-3.0-apis.jar -# %{_sbindir}/update-alternatives --remove corba_3_0_apis %{_javadir}/geronimo-corba-3.0-apis.jar -#fi -#%triggerpostun -n geronimo-ejb-2.1-api -- ejb <= 2.1-3jpp_2rh -## Remove file from old non-free packages -#rm -f %{_javadir}/ejb.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/ejb %{_javadir}/ejb.jar %post -n geronimo-ejb-2_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/ejb.jar ejb %{_javadir}/geronimo-ejb-2.1-api.jar 20100 -%{_sbindir}/update-alternatives --install %{_javadir}/ejb_api.jar ejb_api %{_javadir}/geronimo-ejb-2.1-api.jar 20100 -%{_sbindir}/update-alternatives --install %{_javadir}/ejb_2_1_api.jar ejb_2_1_api %{_javadir}/geronimo-ejb-2.1-api.jar 20100 +update-alternatives --install %{_javadir}/ejb.jar ejb %{_javadir}/geronimo-ejb-2.1-api.jar 20100 +update-alternatives --install %{_javadir}/ejb_api.jar ejb_api %{_javadir}/geronimo-ejb-2.1-api.jar 20100 +update-alternatives --install %{_javadir}/ejb_2_1_api.jar ejb_2_1_api %{_javadir}/geronimo-ejb-2.1-api.jar 20100 %preun -n geronimo-ejb-2_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove ejb %{_javadir}/geronimo-ejb-2.1-api.jar - %{_sbindir}/update-alternatives --remove ejb_api %{_javadir}/geronimo-ejb-2.1-api.jar - %{_sbindir}/update-alternatives --remove ejb_2_1_api %{_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_2_1_api %{_javadir}/geronimo-ejb-2.1-api.jar fi -#%triggerpostun -n geronimo-ejb-3.0-api -- ejb <= 2.1-3jpp_2rh -## Remove file from old non-free packages -#rm -f %{_javadir}/ejb.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/ejb %{_javadir}/ejb.jar %post -n geronimo-ejb-3_0-api -%{_sbindir}/update-alternatives --install %{_javadir}/ejb.jar ejb %{_javadir}/geronimo-ejb-3.0-api.jar 30000 -%{_sbindir}/update-alternatives --install %{_javadir}/ejb_api.jar ejb_api %{_javadir}/geronimo-ejb-3.0-api.jar 30000 -%{_sbindir}/update-alternatives --install %{_javadir}/ejb_3_0_api.jar ejb_3_0_api %{_javadir}/geronimo-ejb-3.0-api.jar 30000 +update-alternatives --install %{_javadir}/ejb.jar ejb %{_javadir}/geronimo-ejb-3.0-api.jar 30000 +update-alternatives --install %{_javadir}/ejb_api.jar ejb_api %{_javadir}/geronimo-ejb-3.0-api.jar 30000 +update-alternatives --install %{_javadir}/ejb_3_0_api.jar ejb_3_0_api %{_javadir}/geronimo-ejb-3.0-api.jar 30000 %preun -n geronimo-ejb-3_0-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove ejb %{_javadir}/geronimo-ejb-3.0-api.jar - %{_sbindir}/update-alternatives --remove ejb_api %{_javadir}/geronimo-ejb-3.0-api.jar - %{_sbindir}/update-alternatives --remove ejb_3_0_api %{_javadir}/geronimo-ejb-3.0-api.jar + 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 fi %post -n geronimo-el-1_0-api -%{_sbindir}/update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/geronimo-el-1.0-api.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/geronimo-el-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/el_api.jar el_api %{_javadir}/geronimo-el-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/el_1_0_api.jar el_1_0_api %{_javadir}/geronimo-el-1.0-api.jar 10000 %preun -n geronimo-el-1_0-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove el_api %{_javadir}/geronimo-el-1.0-api.jar - %{_sbindir}/update-alternatives --remove el_1_0_api %{_javadir}/geronimo-el-1.0-api.jar + 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 fi %post -n geronimo-interceptor-3_0-api -%{_sbindir}/update-alternatives --install %{_javadir}/interceptor_api.jar interceptor_api %{_javadir}/geronimo-interceptor-3.0-api.jar 30000 -%{_sbindir}/update-alternatives --install %{_javadir}/interceptor_3_0_api.jar interceptor_3_0_api %{_javadir}/geronimo-interceptor-3.0-api.jar 30000 +update-alternatives --install %{_javadir}/interceptor_api.jar interceptor_api %{_javadir}/geronimo-interceptor-3.0-api.jar 30000 +update-alternatives --install %{_javadir}/interceptor_3_0_api.jar interceptor_3_0_api %{_javadir}/geronimo-interceptor-3.0-api.jar 30000 %preun -n geronimo-interceptor-3_0-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove interceptor_api %{_javadir}/geronimo-interceptor-3.0-api.jar - %{_sbindir}/update-alternatives --remove interceptor_3_0_api %{_javadir}/geronimo-interceptor-3.0-api.jar + 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 fi -#%triggerpostun -n geronimo-j2ee-connector-1.5-api -- j2ee-connector <= 1.5-3jpp_2rh -## Remove file from old non-free packages -#rm -f %{_javadir}/j2ee-connector.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/j2ee-connector %{_javadir}/j2ee-connector.jar %post -n geronimo-j2ee-connector-1_5-api -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee-connector.jar j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar 10500 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_connector_api.jar j2ee_connector_api %{_javadir}/geronimo-j2ee-connector-1.5-api.jar 10500 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_connector_1_5_api.jar j2ee_connector_1_5_api %{_javadir}/geronimo-j2ee-connector-1.5-api.jar 10500 +update-alternatives --install %{_javadir}/j2ee-connector.jar j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar 10500 +update-alternatives --install %{_javadir}/j2ee_connector_api.jar j2ee_connector_api %{_javadir}/geronimo-j2ee-connector-1.5-api.jar 10500 +update-alternatives --install %{_javadir}/j2ee_connector_1_5_api.jar j2ee_connector_1_5_api %{_javadir}/geronimo-j2ee-connector-1.5-api.jar 10500 %preun -n geronimo-j2ee-connector-1_5-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar - %{_sbindir}/update-alternatives --remove j2ee_connector_api %{_javadir}/geronimo-j2ee-connector-1.5-api.jar - %{_sbindir}/update-alternatives --remove j2ee_connector_1_5_api %{_javadir}/geronimo-j2ee-connector-1.5-api.jar + 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 fi -#%triggerpostun -n geronimo-j2ee-deployment-1.1-api -- j2ee-deployment <= 1.1-1jpp_1rh -## Remove file from old non-free packages -#rm -f %{_javadir}/j2ee-deployment.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/j2ee-deployment %{_javadir}/j2ee-deployment.jar %post -n geronimo-j2ee-deployment-1_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee-deployment.jar j2ee-deployment %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_deployment_api.jar j2ee_deployment_api %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_deployment_1_1_api.jar j2ee_deployment_1_1_api %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/j2ee-deployment.jar j2ee-deployment %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/j2ee_deployment_api.jar j2ee_deployment_api %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/j2ee_deployment_1_1_api.jar j2ee_deployment_1_1_api %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar 10100 %preun -n geronimo-j2ee-deployment-1_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove j2ee-deployment %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar - %{_sbindir}/update-alternatives --remove j2ee_deployment_api %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar - %{_sbindir}/update-alternatives --remove j2ee_deployment_1_1_api %{_javadir}/geronimo-j2ee-deployment-1.1-api.jar + 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 fi %post -n geronimo-javaee-deployment-1_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/javaee_deployment_api.jar javaee_deployment_api %{_javadir}/geronimo-javaee-deployment-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/javaee_deployment_1_1MR3_api.jar javaee_deployment_1_1MR3_api %{_javadir}/geronimo-javaee-deployment-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/javaee_deployment_api.jar javaee_deployment_api %{_javadir}/geronimo-javaee-deployment-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/javaee_deployment_1_1MR3_api.jar javaee_deployment_1_1MR3_api %{_javadir}/geronimo-javaee-deployment-1.1-api.jar 10100 %preun -n geronimo-javaee-deployment-1_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove javaee_deployment_api %{_javadir}/geronimo-javaee-deployment-1.1-api.jar - %{_sbindir}/update-alternatives --remove javaee_deployment_1_1MR3_api %{_javadir}/geronimo-javaee-deployment-1.1-api.jar + 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 fi -#%triggerpostun -n geronimo-jacc-1.0-api -- jacc <= 1.0-1jpp -## Remove file from old non-free packages -#rm -f %{_javadir}/jacc.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/jacc %{_javadir}/jacc.jar %post -n geronimo-jacc-1_0-api -%{_sbindir}/update-alternatives --install %{_javadir}/jacc.jar jacc %{_javadir}/geronimo-jacc-1.0-api.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/jacc_api.jar jacc_api %{_javadir}/geronimo-jacc-1.0-api.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/jacc_1_0_api.jar jacc_1_0_api %{_javadir}/geronimo-jacc-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/jacc.jar jacc %{_javadir}/geronimo-jacc-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/jacc_api.jar jacc_api %{_javadir}/geronimo-jacc-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/jacc_1_0_api.jar jacc_1_0_api %{_javadir}/geronimo-jacc-1.0-api.jar 10000 %preun -n geronimo-jacc-1_0-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jacc %{_javadir}/geronimo-jacc-1.0-api.jar - %{_sbindir}/update-alternatives --remove jacc_api %{_javadir}/geronimo-jacc-1.0-api.jar - %{_sbindir}/update-alternatives --remove jacc_1_0_api %{_javadir}/geronimo-jacc-1.0-api.jar + 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 fi -#%triggerpostun -n geronimo-jacc-1.1-api -- jacc <= 1.0-1jpp -## Remove file from old non-free packages -#rm -f %{_javadir}/jacc.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/jacc %{_javadir}/jacc.jar %post -n geronimo-jacc-1_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/jacc_api.jar jacc_api %{_javadir}/geronimo-jacc-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jacc_1_1_api.jar jacc_1_1_api %{_javadir}/geronimo-jacc-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jacc_api.jar jacc_api %{_javadir}/geronimo-jacc-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jacc_1_1_api.jar jacc_1_1_api %{_javadir}/geronimo-jacc-1.1-api.jar 10100 %preun -n geronimo-jacc-1_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jacc_api %{_javadir}/geronimo-jacc-1.1-api.jar - %{_sbindir}/update-alternatives --remove jacc_1_1_api %{_javadir}/geronimo-jacc-1.1-api.jar + 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 fi -#%triggerpostun -n geronimo-j2ee-management-1.0-api -- j2ee-management <= 1.0-1jpp_1rh -## Remove file from old non-free packages -#rm -f %{_javadir}/j2ee-management.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/j2ee-management %{_javadir}/j2ee-management.jar %post -n geronimo-j2ee-management-1_0-api -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee-management.jar j2ee-management %{_javadir}/geronimo-j2ee-management-1.0-api.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_management_api.jar j2ee_management_api %{_javadir}/geronimo-j2ee-management-1.0-api.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_management_1_0_api.jar j2ee_management_1_0_api %{_javadir}/geronimo-j2ee-management-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/j2ee-management.jar j2ee-management %{_javadir}/geronimo-j2ee-management-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/j2ee_management_api.jar j2ee_management_api %{_javadir}/geronimo-j2ee-management-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/j2ee_management_1_0_api.jar j2ee_management_1_0_api %{_javadir}/geronimo-j2ee-management-1.0-api.jar 10000 %preun -n geronimo-j2ee-management-1_0-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove j2ee-management %{_javadir}/geronimo-j2ee-management-1.0-api.jar - %{_sbindir}/update-alternatives --remove j2ee_management_api %{_javadir}/geronimo-j2ee-management-1.0-api.jar - %{_sbindir}/update-alternatives --remove j2ee_management_1_0_api %{_javadir}/geronimo-j2ee-management-1.0-api.jar + 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 fi -#%triggerpostun -n geronimo-j2ee-management-1.1-api -- j2ee-management <= 1.0-1jpp_1rh -## Remove file from old non-free packages -#rm -f %{_javadir}/j2ee-management.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/j2ee-management %{_javadir}/j2ee-management.jar %post -n geronimo-j2ee-management-1_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee-management.jar j2ee-management %{_javadir}/geronimo-j2ee-management-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_management_api.jar j2ee_management_api %{_javadir}/geronimo-j2ee-management-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_management_1_1_api.jar j2ee_management_1_1_api %{_javadir}/geronimo-j2ee-management-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/j2ee-management.jar j2ee-management %{_javadir}/geronimo-j2ee-management-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/j2ee_management_api.jar j2ee_management_api %{_javadir}/geronimo-j2ee-management-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/j2ee_management_1_1_api.jar j2ee_management_1_1_api %{_javadir}/geronimo-j2ee-management-1.1-api.jar 10100 %preun -n geronimo-j2ee-management-1_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove j2ee-management %{_javadir}/geronimo-j2ee-management-1.1-api.jar - %{_sbindir}/update-alternatives --remove j2ee_management_api %{_javadir}/geronimo-j2ee-management-1.1-api.jar - %{_sbindir}/update-alternatives --remove j2ee_management_1_1_api %{_javadir}/geronimo-j2ee-management-1.1-api.jar + 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 fi # 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' %post -n geronimo-javamail-1_3_1-api -#%{_sbindir}/update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/geronimo-javamail-1.3.1-api.jar 10301 -%{_sbindir}/update-alternatives --install %{_javadir}/javamail_api.jar javamail_api %{_javadir}/geronimo-javamail-1.3.1-api.jar 10301 -%{_sbindir}/update-alternatives --install %{_javadir}/javamail_1_3_1_api.jar javamail_1_3_1_api %{_javadir}/geronimo-javamail-1.3.1-api.jar 10301 +#update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/geronimo-javamail-1.3.1-api.jar 10301 +update-alternatives --install %{_javadir}/javamail_api.jar javamail_api %{_javadir}/geronimo-javamail-1.3.1-api.jar 10301 +update-alternatives --install %{_javadir}/javamail_1_3_1_api.jar javamail_1_3_1_api %{_javadir}/geronimo-javamail-1.3.1-api.jar 10301 %preun -n geronimo-javamail-1_3_1-api if [ "$1" = "0" ]; then -# %{_sbindir}/update-alternatives --remove javamail %{_javadir}/geronimo-javamail-1.3.1-api.jar - %{_sbindir}/update-alternatives --remove javamail_api %{_javadir}/geronimo-javamail-1.3.1-api.jar - %{_sbindir}/update-alternatives --remove javamail_1_3_1_api %{_javadir}/geronimo-javamail-1.3.1-api.jar +# update-alternatives --remove javamail %{_javadir}/geronimo-javamail-1.3.1-api.jar + 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 fi # 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' %post -n geronimo-javamail-1_4-api -#%{_sbindir}/update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/geronimo-javamail-1.4-api.jar 10400 -%{_sbindir}/update-alternatives --install %{_javadir}/javamail_api.jar javamail_api %{_javadir}/geronimo-javamail-1.4-api.jar 10400 -%{_sbindir}/update-alternatives --install %{_javadir}/javamail_1_4_api.jar javamail_1_4_api %{_javadir}/geronimo-javamail-1.4-api.jar 10400 +#update-alternatives --install %{_javadir}/javamail.jar javamail %{_javadir}/geronimo-javamail-1.4-api.jar 10400 +update-alternatives --install %{_javadir}/javamail_api.jar javamail_api %{_javadir}/geronimo-javamail-1.4-api.jar 10400 +update-alternatives --install %{_javadir}/javamail_1_4_api.jar javamail_1_4_api %{_javadir}/geronimo-javamail-1.4-api.jar 10400 %preun -n geronimo-javamail-1_4-api if [ "$1" = "0" ]; then -# %{_sbindir}/update-alternatives --remove javamail %{_javadir}/geronimo-javamail-1.4-api.jar - %{_sbindir}/update-alternatives --remove javamail_api %{_javadir}/geronimo-javamail-1.4-api.jar - %{_sbindir}/update-alternatives --remove javamail_1_4_api %{_javadir}/geronimo-javamail-1.4-api.jar +# update-alternatives --remove javamail %{_javadir}/geronimo-javamail-1.4-api.jar + 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 fi -#%triggerpostun -n geronimo-jaxr-1.0-api -- jaxr-api <= 1.0-1jpp -## Remove file from old non-free packages -#rm -f %{_javadir}/jaxr.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/jaxr %{_javadir}/jaxr.jar %post -n geronimo-jaxr-1_0-api -%{_sbindir}/update-alternatives --install %{_javadir}/jaxr.jar jaxr %{_javadir}/geronimo-jaxr-1.0-api.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/jaxr_api.jar jaxr_api %{_javadir}/geronimo-jaxr-1.0-api.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/jaxr_1_0_api.jar jaxr_1_0_api %{_javadir}/geronimo-jaxr-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/jaxr.jar jaxr %{_javadir}/geronimo-jaxr-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/jaxr_api.jar jaxr_api %{_javadir}/geronimo-jaxr-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/jaxr_1_0_api.jar jaxr_1_0_api %{_javadir}/geronimo-jaxr-1.0-api.jar 10000 %preun -n geronimo-jaxr-1_0-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jaxr %{_javadir}/geronimo-jaxr-1.0-api.jar - %{_sbindir}/update-alternatives --remove jaxr_api %{_javadir}/geronimo-jaxr-1.0-api.jar - %{_sbindir}/update-alternatives --remove jaxr_1_0_api %{_javadir}/geronimo-jaxr-1.0-api.jar + 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 fi %post -n geronimo-jaxrpc-1_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/jaxrpc.jar jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jaxrpc_api.jar jaxrpc_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jaxrpc_1_1_api.jar jaxrpc_1_1_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jaxrpc.jar jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jaxrpc_api.jar jaxrpc_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jaxrpc_1_1_api.jar jaxrpc_1_1_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar 10100 %preun -n geronimo-jaxrpc-1_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar - %{_sbindir}/update-alternatives --remove jaxrpc_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar - %{_sbindir}/update-alternatives --remove jaxrpc_1_1_api %{_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_1_1_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar fi -#%triggerpostun -n geronimo-jms-1.1-api -- jms <= 1.1-3jpp_2rh -## Remove file from old non-free packages -#rm -f %{_javadir}/jms.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/jms %{_javadir}/jms.jar %post -n geronimo-jms-1_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/jms.jar jms %{_javadir}/geronimo-jms-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jms_api.jar jms_api %{_javadir}/geronimo-jms-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jms_1_1_api.jar jms_1_1_api %{_javadir}/geronimo-jms-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jms.jar jms %{_javadir}/geronimo-jms-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jms_api.jar jms_api %{_javadir}/geronimo-jms-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jms_1_1_api.jar jms_1_1_api %{_javadir}/geronimo-jms-1.1-api.jar 10100 %preun -n geronimo-jms-1_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jms %{_javadir}/geronimo-jms-1.1-api.jar - %{_sbindir}/update-alternatives --remove jms_api %{_javadir}/geronimo-jms-1.1-api.jar - %{_sbindir}/update-alternatives --remove jms_1_1_api %{_javadir}/geronimo-jms-1.1-api.jar + update-alternatives --remove jms %{_javadir}/geronimo-jms-1.1-api.jar + update-alternatives --remove jms_api %{_javadir}/geronimo-jms-1.1-api.jar + update-alternatives --remove jms_1_1_api %{_javadir}/geronimo-jms-1.1-api.jar fi %post -n geronimo-jpa-3_0-api -%{_sbindir}/update-alternatives --install %{_javadir}/jpa_api.jar jpa_api %{_javadir}/geronimo-jpa-3.0-api.jar 30000 -%{_sbindir}/update-alternatives --install %{_javadir}/jpa_3_0_api.jar jpa_3_0_api %{_javadir}/geronimo-jpa-3.0-api.jar 30000 +update-alternatives --install %{_javadir}/jpa_api.jar jpa_api %{_javadir}/geronimo-jpa-3.0-api.jar 30000 +update-alternatives --install %{_javadir}/jpa_3_0_api.jar jpa_3_0_api %{_javadir}/geronimo-jpa-3.0-api.jar 30000 %preun -n geronimo-jpa-3_0-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jpa_api %{_javadir}/geronimo-jpa-3.0-api.jar - %{_sbindir}/update-alternatives --remove jpa_3_0_api %{_javadir}/geronimo-jpa-3.0-api.jar + 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 fi %post -n geronimo-jsp-2_0-api -%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp %{_javadir}/geronimo-jsp-2.0-api.jar 20000 -%{_sbindir}/update-alternatives --install %{_javadir}/jsp_api.jar jsp_api %{_javadir}/geronimo-jsp-2.0-api.jar 20000 -%{_sbindir}/update-alternatives --install %{_javadir}/jsp_2_0_api.jar jsp_2_0_api %{_javadir}/geronimo-jsp-2.0-api.jar 20000 +update-alternatives --install %{_javadir}/jsp.jar jsp %{_javadir}/geronimo-jsp-2.0-api.jar 20000 +update-alternatives --install %{_javadir}/jsp_api.jar jsp_api %{_javadir}/geronimo-jsp-2.0-api.jar 20000 +update-alternatives --install %{_javadir}/jsp_2_0_api.jar jsp_2_0_api %{_javadir}/geronimo-jsp-2.0-api.jar 20000 %preun -n geronimo-jsp-2_0-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jsp %{_javadir}/geronimo-jsp-2.0-api.jar - %{_sbindir}/update-alternatives --remove jsp_api %{_javadir}/geronimo-jsp-2.0-api.jar - %{_sbindir}/update-alternatives --remove jsp_2_0_api %{_javadir}/geronimo-jsp-2.0-api.jar + 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 fi %post -n geronimo-jsp-2_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/jsp.jar jsp %{_javadir}/geronimo-jsp-2.1-api.jar 20100 -%{_sbindir}/update-alternatives --install %{_javadir}/jsp_api.jar jsp_api %{_javadir}/geronimo-jsp-2.1-api.jar 20100 -%{_sbindir}/update-alternatives --install %{_javadir}/jsp_2_1_api.jar jsp_2_1_api %{_javadir}/geronimo-jsp-2.1-api.jar 20100 +update-alternatives --install %{_javadir}/jsp.jar jsp %{_javadir}/geronimo-jsp-2.1-api.jar 20100 +update-alternatives --install %{_javadir}/jsp_api.jar jsp_api %{_javadir}/geronimo-jsp-2.1-api.jar 20100 +update-alternatives --install %{_javadir}/jsp_2_1_api.jar jsp_2_1_api %{_javadir}/geronimo-jsp-2.1-api.jar 20100 %preun -n geronimo-jsp-2_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jsp %{_javadir}/geronimo-jsp-2.1-api.jar - %{_sbindir}/update-alternatives --remove jsp_api %{_javadir}/geronimo-jsp-2.1-api.jar - %{_sbindir}/update-alternatives --remove jsp_2_1_api %{_javadir}/geronimo-jsp-2.1-api.jar + 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 fi -#%triggerpostun -n geronimo-jta-1.0.1B-api -- jta <= 1.0.1-0.b.3jpp_2rh -## Remove file from old non-free packages -#rm -f %{_javadir}/jta.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/jta %{_javadir}/jta.jar %post -n geronimo-jta-1_0_1B-api -%{_sbindir}/update-alternatives --install %{_javadir}/jta.jar jta %{_javadir}/geronimo-jta-1.0.1B-api.jar 10001 -%{_sbindir}/update-alternatives --install %{_javadir}/jta_api.jar jta_api %{_javadir}/geronimo-jta-1.0.1B-api.jar 10001 -%{_sbindir}/update-alternatives --install %{_javadir}/jta_1_0_1B_api.jar jta_1_0_1B_api %{_javadir}/geronimo-jta-1.0.1B-api.jar 10001 +update-alternatives --install %{_javadir}/jta.jar jta %{_javadir}/geronimo-jta-1.0.1B-api.jar 10001 +update-alternatives --install %{_javadir}/jta_api.jar jta_api %{_javadir}/geronimo-jta-1.0.1B-api.jar 10001 +update-alternatives --install %{_javadir}/jta_1_0_1B_api.jar jta_1_0_1B_api %{_javadir}/geronimo-jta-1.0.1B-api.jar 10001 %preun -n geronimo-jta-1_0_1B-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jta %{_javadir}/geronimo-jta-1.0.1B-api.jar - %{_sbindir}/update-alternatives --remove jta_api %{_javadir}/geronimo-jta-1.0.1B-api.jar - %{_sbindir}/update-alternatives --remove jta_1_0_1B_api %{_javadir}/geronimo-jta-1.0.1B-api.jar + 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 + update-alternatives --remove jta_1_0_1B_api %{_javadir}/geronimo-jta-1.0.1B-api.jar fi -#%triggerpostun -n geronimo-jta-1.1-api -- jta <= 1.0.1-0.b.3jpp_2rh -## Remove file from old non-free packages -#rm -f %{_javadir}/jta.jar -## Recreate the link as update-alternatives could not do it -#ln -s %{_sysconfdir}/alternatives/jta %{_javadir}/jta.jar %post -n geronimo-jta-1_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/jta.jar jta %{_javadir}/geronimo-jta-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jta_api.jar jta_api %{_javadir}/geronimo-jta-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jta_1_1_api.jar jta_1_1_api %{_javadir}/geronimo-jta-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jta.jar jta %{_javadir}/geronimo-jta-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jta_api.jar jta_api %{_javadir}/geronimo-jta-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/jta_1_1_api.jar jta_1_1_api %{_javadir}/geronimo-jta-1.1-api.jar 10100 %preun -n geronimo-jta-1_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jta %{_javadir}/geronimo-jta-1.1-api.jar - %{_sbindir}/update-alternatives --remove jta_api %{_javadir}/geronimo-jta-1.1-api.jar - %{_sbindir}/update-alternatives --remove jta_1_1_api %{_javadir}/geronimo-jta-1.1-api.jar + update-alternatives --remove jta %{_javadir}/geronimo-jta-1.1-api.jar + update-alternatives --remove jta_api %{_javadir}/geronimo-jta-1.1-api.jar + update-alternatives --remove jta_1_1_api %{_javadir}/geronimo-jta-1.1-api.jar fi %post -n geronimo-qname-1_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/qname_api.jar qname_api %{_javadir}/geronimo-qname-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/qname_1_1_api.jar qname_1_1_api %{_javadir}/geronimo-qname-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/qname_api.jar qname_api %{_javadir}/geronimo-qname-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/qname_1_1_api.jar qname_1_1_api %{_javadir}/geronimo-qname-1.1-api.jar 10100 %postun -n geronimo-qname-1_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove qname_api %{_javadir}/geronimo-qname-1.1-api.jar - %{_sbindir}/update-alternatives --remove qname_1_1_api %{_javadir}/geronimo-qname-1.1-api.jar + update-alternatives --remove qname_api %{_javadir}/geronimo-qname-1.1-api.jar + update-alternatives --remove qname_1_1_api %{_javadir}/geronimo-qname-1.1-api.jar fi %post -n geronimo-saaj-1_1-api -%{_sbindir}/update-alternatives --install %{_javadir}/saaj.jar saaj %{_javadir}/geronimo-saaj-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/saaj_api.jar saaj_api %{_javadir}/geronimo-saaj-1.1-api.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/saaj_1_1_api.jar saaj_1_1_api %{_javadir}/geronimo-saaj-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/saaj.jar saaj %{_javadir}/geronimo-saaj-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/saaj_api.jar saaj_api %{_javadir}/geronimo-saaj-1.1-api.jar 10100 +update-alternatives --install %{_javadir}/saaj_1_1_api.jar saaj_1_1_api %{_javadir}/geronimo-saaj-1.1-api.jar 10100 %preun -n geronimo-saaj-1_1-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove saaj %{_javadir}/geronimo-saaj-1.1-api.jar - %{_sbindir}/update-alternatives --remove saaj_api %{_javadir}/geronimo-saaj-1.1-api.jar - %{_sbindir}/update-alternatives --remove saaj_1_1_api %{_javadir}/geronimo-saaj-1.1-api.jar + update-alternatives --remove saaj %{_javadir}/geronimo-saaj-1.1-api.jar + update-alternatives --remove saaj_api %{_javadir}/geronimo-saaj-1.1-api.jar + update-alternatives --remove saaj_1_1_api %{_javadir}/geronimo-saaj-1.1-api.jar fi %post -n geronimo-servlet-2_4-api -%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/geronimo-servlet-2.4-api.jar 20400 -%{_sbindir}/update-alternatives --install %{_javadir}/servlet_api.jar servlet_api %{_javadir}/geronimo-servlet-2.4-api.jar 20400 -%{_sbindir}/update-alternatives --install %{_javadir}/servlet_2_4_api.jar servlet_2_4_api %{_javadir}/geronimo-servlet-2.4-api.jar 20400 +update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/geronimo-servlet-2.4-api.jar 20400 +update-alternatives --install %{_javadir}/servlet_api.jar servlet_api %{_javadir}/geronimo-servlet-2.4-api.jar 20400 +update-alternatives --install %{_javadir}/servlet_2_4_api.jar servlet_2_4_api %{_javadir}/geronimo-servlet-2.4-api.jar 20400 %preun -n geronimo-servlet-2_4-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove servlet %{_javadir}/geronimo-servlet-2.4-api.jar - %{_sbindir}/update-alternatives --remove servlet_api %{_javadir}/geronimo-servlet-2.4-api.jar - %{_sbindir}/update-alternatives --remove servlet_2_4_api %{_javadir}/geronimo-servlet-2.4-api.jar + update-alternatives --remove servlet %{_javadir}/geronimo-servlet-2.4-api.jar + update-alternatives --remove servlet_api %{_javadir}/geronimo-servlet-2.4-api.jar + update-alternatives --remove servlet_2_4_api %{_javadir}/geronimo-servlet-2.4-api.jar fi %post -n geronimo-servlet-2_5-api -%{_sbindir}/update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/geronimo-servlet-2.5-api.jar 20500 -%{_sbindir}/update-alternatives --install %{_javadir}/servlet_api.jar servlet_api %{_javadir}/geronimo-servlet-2.5-api.jar 20500 -%{_sbindir}/update-alternatives --install %{_javadir}/servlet_2_5_api.jar servlet_2_5_api %{_javadir}/geronimo-servlet-2.5-api.jar 20500 +update-alternatives --install %{_javadir}/servlet.jar servlet %{_javadir}/geronimo-servlet-2.5-api.jar 20500 +update-alternatives --install %{_javadir}/servlet_api.jar servlet_api %{_javadir}/geronimo-servlet-2.5-api.jar 20500 +update-alternatives --install %{_javadir}/servlet_2_5_api.jar servlet_2_5_api %{_javadir}/geronimo-servlet-2.5-api.jar 20500 %preun -n geronimo-servlet-2_5-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove servlet %{_javadir}/geronimo-servlet-2.5-api.jar - %{_sbindir}/update-alternatives --remove servlet_api %{_javadir}/geronimo-servlet-2.5-api.jar - %{_sbindir}/update-alternatives --remove servlet_2_5_api %{_javadir}/geronimo-servlet-2.5-api.jar + update-alternatives --remove servlet %{_javadir}/geronimo-servlet-2.5-api.jar + 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 fi %post -n geronimo-stax-1_0-api -%{_sbindir}/update-alternatives --install %{_javadir}/stax_api.jar stax_api %{_javadir}/geronimo-stax-1.0-api.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/stax_1_0_api.jar stax_1_0_api %{_javadir}/geronimo-stax-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/stax_api.jar stax_api %{_javadir}/geronimo-stax-1.0-api.jar 10000 +update-alternatives --install %{_javadir}/stax_1_0_api.jar stax_1_0_api %{_javadir}/geronimo-stax-1.0-api.jar 10000 %preun -n geronimo-stax-1_0-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove stax_api %{_javadir}/geronimo-stax-1.0-api.jar - %{_sbindir}/update-alternatives --remove stax_1_0_api %{_javadir}/geronimo-stax-1.0-api.jar + 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 fi %post -n geronimo-ws-metadata-2_0-api -%{_sbindir}/update-alternatives --install %{_javadir}/ws_metadata_api.jar ws_metadata_api %{_javadir}/geronimo-ws-metadata-2.0-api.jar 20000 -%{_sbindir}/update-alternatives --install %{_javadir}/ws_metadata_2_0_api.jar ws_metadata_2_0_api %{_javadir}/geronimo-ws-metadata-2.0-api.jar 20000 +update-alternatives --install %{_javadir}/ws_metadata_api.jar ws_metadata_api %{_javadir}/geronimo-ws-metadata-2.0-api.jar 20000 +update-alternatives --install %{_javadir}/ws_metadata_2_0_api.jar ws_metadata_2_0_api %{_javadir}/geronimo-ws-metadata-2.0-api.jar 20000 %preun -n geronimo-ws-metadata-2_0-api if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove ws_metadata_api %{_javadir}/geronimo-ws-metadata-2.0-api.jar - %{_sbindir}/update-alternatives --remove ws_metadata_2_0_api %{_javadir}/geronimo-ws-metadata-2.0-api.jar + 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 fi %post -n geronimo-j2ee-1_4-apis -%{_sbindir}/update-alternatives --install %{_javadir}/jaf_api.jar jaf_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10002 -%{_sbindir}/update-alternatives --install %{_javadir}/jaf_1_0_2_api.jar jaf_1_0_2_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10002 -%{_sbindir}/update-alternatives --install %{_javadir}/commonj_apis.jar commonj_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/commonj_1_1_apis.jar commonj_1_1_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/corba_apis.jar corba_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar 20300 -%{_sbindir}/update-alternatives --install %{_javadir}/corba_2_3_apis.jar corba_2_3_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar 20300 -%{_sbindir}/update-alternatives --install %{_javadir}/ejb_api.jar ejb_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 20100 -%{_sbindir}/update-alternatives --install %{_javadir}/ejb_2_1_api.jar ejb_2_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 20100 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee-connector.jar j2ee-connector %{_javadir}/geronimo-j2ee-1.4-apis.jar 10500 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_connector_api.jar j2ee_connector_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10500 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_connector_1_5_api.jar j2ee_connector_1_5_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10500 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_deployment_api.jar j2ee_deployment_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_deployment_1_1_api.jar j2ee_deployment_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_management_api.jar j2ee_management_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/j2ee_management_1_0_api.jar j2ee_management_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/jacc_api.jar jacc_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/jacc_1_0_api.jar jacc_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/javamail_api.jar javamail_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10301 -%{_sbindir}/update-alternatives --install %{_javadir}/javamail_1_3_1_api.jar javamail_1_3_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10301 -%{_sbindir}/update-alternatives --install %{_javadir}/jaxr_api.jar jaxr_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/jaxr_1_0_api.jar jaxr_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 -%{_sbindir}/update-alternatives --install %{_javadir}/jaxrpc_api.jar jaxrpc_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jaxrpc_1_1_api.jar jaxrpc_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jms_api.jar jms_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jms_1_1_api.jar jms_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jsp_api.jar jsp_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jsp_2_0_api.jar jsp_2_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/jta_api.jar jta_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10001 -%{_sbindir}/update-alternatives --install %{_javadir}/jta_1_0_1B_api.jar jta_1_0_1B_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10001 -%{_sbindir}/update-alternatives --install %{_javadir}/qname_api.jar qname_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/qname_1_1_api.jar qname_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/saaj_api.jar saaj_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/saaj_1_1_api.jar saaj_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 -%{_sbindir}/update-alternatives --install %{_javadir}/servlet_api.jar servlet_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 20400 -%{_sbindir}/update-alternatives --install %{_javadir}/servlet_2_4_api.jar servlet_2_4_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 20400 +update-alternatives --install %{_javadir}/jaf_api.jar jaf_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10002 +update-alternatives --install %{_javadir}/jaf_1_0_2_api.jar jaf_1_0_2_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10002 +update-alternatives --install %{_javadir}/commonj_apis.jar commonj_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/commonj_1_1_apis.jar commonj_1_1_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/corba_apis.jar corba_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar 20300 +update-alternatives --install %{_javadir}/corba_2_3_apis.jar corba_2_3_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar 20300 +update-alternatives --install %{_javadir}/ejb_api.jar ejb_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 20100 +update-alternatives --install %{_javadir}/ejb_2_1_api.jar ejb_2_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 20100 +update-alternatives --install %{_javadir}/j2ee-connector.jar j2ee-connector %{_javadir}/geronimo-j2ee-1.4-apis.jar 10500 +update-alternatives --install %{_javadir}/j2ee_connector_api.jar j2ee_connector_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10500 +update-alternatives --install %{_javadir}/j2ee_connector_1_5_api.jar j2ee_connector_1_5_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10500 +update-alternatives --install %{_javadir}/j2ee_deployment_api.jar j2ee_deployment_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/j2ee_deployment_1_1_api.jar j2ee_deployment_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/j2ee_management_api.jar j2ee_management_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 +update-alternatives --install %{_javadir}/j2ee_management_1_0_api.jar j2ee_management_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 +update-alternatives --install %{_javadir}/jacc_api.jar jacc_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 +update-alternatives --install %{_javadir}/jacc_1_0_api.jar jacc_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 +update-alternatives --install %{_javadir}/javamail_api.jar javamail_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10301 +update-alternatives --install %{_javadir}/javamail_1_3_1_api.jar javamail_1_3_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10301 +update-alternatives --install %{_javadir}/jaxr_api.jar jaxr_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 +update-alternatives --install %{_javadir}/jaxr_1_0_api.jar jaxr_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10000 +update-alternatives --install %{_javadir}/jaxrpc_api.jar jaxrpc_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/jaxrpc_1_1_api.jar jaxrpc_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/jms_api.jar jms_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/jms_1_1_api.jar jms_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/jsp_api.jar jsp_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/jsp_2_0_api.jar jsp_2_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/jta_api.jar jta_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10001 +update-alternatives --install %{_javadir}/jta_1_0_1B_api.jar jta_1_0_1B_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10001 +update-alternatives --install %{_javadir}/qname_api.jar qname_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/qname_1_1_api.jar qname_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/saaj_api.jar saaj_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/saaj_1_1_api.jar saaj_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 10100 +update-alternatives --install %{_javadir}/servlet_api.jar servlet_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 20400 +update-alternatives --install %{_javadir}/servlet_2_4_api.jar servlet_2_4_api %{_javadir}/geronimo-j2ee-1.4-apis.jar 20400 %preun -n geronimo-j2ee-1_4-apis if [ "$1" = "0" ]; then - %{_sbindir}/update-alternatives --remove jaf_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jaf_1_0_2_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove commonj_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove commonj_1_1_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove corba_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove corba_2_3_apis %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove ejb_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove ejb_2_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove j2ee-connector %{_javadir}/geronimo-j2ee-connector-1.5-api.jar - %{_sbindir}/update-alternatives --remove j2ee_connector_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove j2ee_connector_1_5_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove j2ee_deployment_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove j2ee_deployment_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove j2ee_management_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove j2ee_management_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jacc_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jacc_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove javamail_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove javamail_1_3_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jaxr_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jaxr_1_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jaxrpc_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jaxrpc_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jms_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jms_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jsp_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jsp_2_0_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jta_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove jta_1_0_1B_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove qname_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove qname_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove saaj_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove saaj_1_1_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove servlet_api %{_javadir}/geronimo-j2ee-1.4-apis.jar - %{_sbindir}/update-alternatives --remove servlet_2_4_api %{_javadir}/geronimo-j2ee-1.4-apis.jar + 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 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_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 fi %files @@ -2432,7 +2199,6 @@ fi %files -n geronimo-corba-1_0-apis %defattr(-,root,root) %{_javadir}/geronimo-corba-1.0-apis*.jar -#%doc %{_docdir}/%{name}-%{version}/corba-1.0/LICENSE.txt %{_javadir}/corba_apis.jar %ghost %{_sysconfdir}/alternatives/corba_apis.jar %{_javadir}/corba_1_0_apis.jar @@ -2448,16 +2214,6 @@ fi %ghost %{_sysconfdir}/alternatives/corba_apis.jar %{_javadir}/corba_2_3_apis.jar %ghost %{_sysconfdir}/alternatives/corba_2_3_apis.jar -#% files -n geronimo-corba-3.0-apis -#%defattr(-,root,root) -#%{_javadir}/geronimo-corba-3.0-apis*.jar -#%doc %{_docdir}/%{name}-%{version}/corba-3.0/LICENSE.txt -#%ghost %{_javadir}/corba_apis.jar -#%ghost %{_javadir}/corba_3_0_apis.jar -#%if %{gcj_support} -#%dir %{_libdir}/gcj/%{name} -#%attr(-,root,root) %{_libdir}/gcj/%{name}/geronimo-corba-3.0-apis-%{version}.jar.* -#%endif %files -n geronimo-ejb-2_1-api %defattr(-,root,root)