From 765d1e570fb4984499f8670b810d30152eb16219b63ff6aebfc3c2fc0f229b2a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 17 Oct 2023 05:18:43 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=59 --- geronimo-specs.build.xml | 18 +++++++++++++++++- geronimo-specs.changes | 1 - geronimo-specs.spec | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/geronimo-specs.build.xml b/geronimo-specs.build.xml index 4c93311..2829395 100644 --- a/geronimo-specs.build.xml +++ b/geronimo-specs.build.xml @@ -88,6 +88,11 @@ + + + + + @@ -151,7 +156,7 @@ - + @@ -174,6 +179,7 @@ + @@ -378,6 +384,16 @@ artifactId=${gbuild.id} + + + + + + + + + + diff --git a/geronimo-specs.changes b/geronimo-specs.changes index 5a7ae3b..684e902 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -4,7 +4,6 @@ Mon Oct 16 13:36:57 UTC 2023 - Fridrich Strba - Allow building with with java > 1.8 * remove corba modules that nobody requires and that need the idlj compiler not present ni java >= 10 - * remove the jaxrpc module that nobody needs. - Added patch: * sun-security-provider.patch + remove bogus inclusion of sun.security.provider.Sun diff --git a/geronimo-specs.spec b/geronimo-specs.spec index 0719193..4d9f635 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -246,6 +246,8 @@ Provides: javamail_1_3_1_api = %{version} Provides: javamail_api = 1.3.1 Provides: jaxr_1_0_api = %{version} Provides: jaxr_api = 1.0 +Provides: jaxrpc_1_1_api = %{version} +Provides: jaxrpc_api = 1.1 Provides: jms_1_1_api = %{version} Provides: jms_api = 1.1 Provides: jsp_2_0_api = %{version} @@ -269,6 +271,7 @@ Provides: jacc = 1.0 Provides: jaf = 1.0.2 Provides: javamail = 1.3.1 Provides: jaxr = 1.0 +Provides: jaxrpc = 1.1 Provides: jms = 1.1 Provides: jsp = 2.0 Provides: jta = 1.0.1B @@ -445,6 +448,23 @@ Obsoletes: jaxr-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 +Requires: qname_1_1_api +Requires: saaj_1_1_api +Requires: servlet_2_4_api +Requires(pre): update-alternatives +Provides: jaxrpc = 1.1 +# TODO: drop asap +Provides: jaxrpc_1_1_api = %{version} +Provides: jaxrpc_api = 1.1 +Obsoletes: %{name}-poms + +%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 @@ -766,6 +786,13 @@ install -m 0644 \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jaxr-1.0-api.pom %add_maven_depmap JPP-geronimo-jaxr-1.0-api.pom geronimo-jaxr-1.0-api.jar -f jaxr-1.0-api +install -m 0644 \ + geronimo-jaxrpc_1.1_spec-1.1/target/geronimo-jaxrpc_1.1_spec-1.1.jar \ + %{buildroot}%{_javadir}/geronimo-jaxrpc-1.1-api.jar +%{mvn_install_pom} geronimo-jaxrpc_1.1_spec-1.1/pom.xml \ + %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jaxrpc-1.1-api.pom +%add_maven_depmap JPP-geronimo-jaxrpc-1.1-api.pom geronimo-jaxrpc-1.1-api.jar -f jaxrpc-1.1-api + install -m 0644 \ geronimo-spec-j2ee/target/geronimo-j2ee_1.4_spec-1.2-jar-with-dependencies.jar \ %{buildroot}%{_javadir}/geronimo-j2ee-1.4-apis.jar @@ -946,6 +973,11 @@ update-alternatives --remove jaxr %{_javadir}/geronimo-jaxr-1.0-api.jar update-alternatives --remove jaxr_api %{_javadir}/geronimo-jaxr-1.0-api.jar update-alternatives --remove jaxr_1_0_api %{_javadir}/geronimo-jaxr-1.0-api.jar +%pre -n geronimo-jaxrpc-1_1-api +update-alternatives --remove jaxrpc %{_javadir}/geronimo-jaxrpc-1.1-api.jar +update-alternatives --remove jaxrpc_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar +update-alternatives --remove jaxrpc_1_1_api %{_javadir}/geronimo-jaxrpc-1.1-api.jar + %pre -n geronimo-jms-1_1-api update-alternatives --remove jms %{_javadir}/geronimo-jms-1.1-api.jar update-alternatives --remove jms_api %{_javadir}/geronimo-jms-1.1-api.jar @@ -1022,6 +1054,8 @@ 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 @@ -1092,6 +1126,9 @@ update-alternatives --remove servlet_2_4_api %{_javadir}/geronimo-j2ee-1.4-apis. %files -n geronimo-jaxr-1_0-api -f .mfiles-jaxr-1.0-api %license geronimo-jaxr_1.0_spec-1.1/LICENSE.txt +%files -n geronimo-jaxrpc-1_1-api -f .mfiles-jaxrpc-1.1-api +%license geronimo-jaxrpc_1.1_spec-1.1/LICENSE.txt + %files -n geronimo-jms-1_1-api -f .mfiles-jms-1.1-api %license geronimo-jms_1.1_spec-1.1/LICENSE.txt