From f3895a4f800a81f4cd72152d4c99f5d50d613ea9637d76cf8ec2fb63a7592e27 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 9 Nov 2018 14:16:22 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=30 --- geronimo-specs.changes | 6 ++++++ geronimo-specs.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index 5a5fb90..c8b1797 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 9 14:15:43 UTC 2018 - Fridrich Strba + +- Add two aliases to the maven artifact in + geronimo-annotation-1_0-api sub-package + ------------------------------------------------------------------- Mon Jul 16 09:49:33 UTC 2018 - fstrba@suse.com diff --git a/geronimo-specs.spec b/geronimo-specs.spec index 5eb2fb7..f650403 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -847,7 +847,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-annotation_1.0_spec-1.1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-annotation-1.0-api.pom -%add_maven_depmap JPP-geronimo-annotation-1.0-api.pom geronimo-annotation-1.0-api.jar +%add_maven_depmap JPP-geronimo-annotation-1.0-api.pom geronimo-annotation-1.0-api.jar -a "javax.annotation:jsr250-api,org.eclipse.jetty.orbit:javax.annotation" install -m 0644 \ geronimo-spec-corba-2.3/target/geronimo-corba_2.3_spec-null.jar \ From bea3f9a8163fb6d0b314f8a7244a555d84e0fb5da074d5b94ea7e1f356848555 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 12 Nov 2018 04:51:57 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=31 --- geronimo-specs.changes | 8 +++ geronimo-specs.spec | 146 ++++++++++++++++++++++++++++++----------- 2 files changed, 115 insertions(+), 39 deletions(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index c8b1797..0902dfe 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 12 04:49:55 UTC 2018 - Fridrich Strba + +- Package the pom files together with their corresponding jars, + since packaging poms separately makes no sense at all +- Rename geronimo-specs-poms package to geronimo-specs-pom, since + it now contains only the parent pom. + ------------------------------------------------------------------- Fri Nov 9 14:15:43 UTC 2018 - Fridrich Strba diff --git a/geronimo-specs.spec b/geronimo-specs.spec index f650403..561de84 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -782,11 +782,11 @@ 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 +%package pom Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java -%description poms +%description pom Geronimo is Apache's ASF-licenced J2EE server project. These are the J2EE-Specifications: The Project Object Model files for the geronimo-specs modules. @@ -825,7 +825,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-activation_1.0.2_spec-1.2/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jaf-1.0.2-api.pom -%add_maven_depmap JPP-geronimo-jaf-1.0.2-api.pom geronimo-jaf-1.0.2-api.jar +%add_maven_depmap JPP-geronimo-jaf-1.0.2-api.pom geronimo-jaf-1.0.2-api.jar -f jaf-1.0.2-api install -m 0644 \ geronimo-activation_1.1_spec-1.0/target/geronimo-activation_1.1_spec-1.0.jar \ @@ -836,7 +836,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-activation_1.1_spec-1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jaf-1.1-api.pom -%add_maven_depmap JPP-geronimo-jaf-1.1-api.pom geronimo-jaf-1.1-api.jar +%add_maven_depmap JPP-geronimo-jaf-1.1-api.pom geronimo-jaf-1.1-api.jar -f jaf-1.1-api install -m 0644 \ geronimo-annotation_1.0_spec-1.1.0/target/geronimo-annotation_1.0_spec-1.1.jar \ @@ -847,7 +847,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-annotation_1.0_spec-1.1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-annotation-1.0-api.pom -%add_maven_depmap JPP-geronimo-annotation-1.0-api.pom geronimo-annotation-1.0-api.jar -a "javax.annotation:jsr250-api,org.eclipse.jetty.orbit:javax.annotation" +%add_maven_depmap JPP-geronimo-annotation-1.0-api.pom geronimo-annotation-1.0-api.jar -a "javax.annotation:jsr250-api,org.eclipse.jetty.orbit:javax.annotation" -f annotation-1.0-api install -m 0644 \ geronimo-spec-corba-2.3/target/geronimo-corba_2.3_spec-null.jar \ @@ -858,7 +858,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-spec-corba-2.3/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-corba-2.3-apis.pom -%add_maven_depmap JPP-geronimo-corba-2.3-apis.pom geronimo-corba-2.3-apis.jar +%add_maven_depmap JPP-geronimo-corba-2.3-apis.pom geronimo-corba-2.3-apis.jar -f corba-2.3-apis #install -m 0644 \ # geronimo-spec-corba-3.0/target/geronimo-corba_3.0_spec-null.jar \ @@ -871,7 +871,7 @@ install -m 0644 geronimo-spec-corba-2.3/pom.xml \ #touch %{buildroot}%{_javadir}/corba_3_0_apis.jar # for %ghost #install -m 0644 geronimo-spec-corba-3.0/pom.xml \ # %{buildroot}/%{_mavenpomdir}/JPP-geronimo-corba-3.0-apis.pom -#%add_to_maven_depmap org.apache.geronimo.specs geronimo-corba_3.0_spec %{sver_corba_3_0} JPP geronimo-corba-3.0-apis +#%add_to_maven_depmap org.apache.geronimo.specs geronimo-corba_3.0_spec %{sver_corba_3_0} JPP geronimo-corba-3.0-apis -f corba-3.0-apis install -m 0644 \ geronimo-spec-corba/target/geronimo-spec-corba-null.jar \ @@ -882,7 +882,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-spec-corba/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-corba-1.0-apis.pom -%add_maven_depmap JPP-geronimo-corba-1.0-apis.pom geronimo-corba-1.0-apis.jar +%add_maven_depmap JPP-geronimo-corba-1.0-apis.pom geronimo-corba-1.0-apis.jar -f corba-1.0-apis install -m 0644 \ geronimo-ejb_2.1_spec-1.1/target/geronimo-ejb_2.1_spec-1.1.jar \ @@ -893,7 +893,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-ejb_2.1_spec-1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-ejb-2.1-api.pom -%add_maven_depmap JPP-geronimo-ejb-2.1-api.pom geronimo-ejb-2.1-api.jar +%add_maven_depmap JPP-geronimo-ejb-2.1-api.pom geronimo-ejb-2.1-api.jar -f ejb-2.1-api install -m 0644 \ geronimo-ejb_3.0_spec-1.0/target/geronimo-ejb_3.0_spec-1.0.jar \ @@ -904,7 +904,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-ejb_3.0_spec-1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-ejb-3.0-api.pom -%add_maven_depmap JPP-geronimo-ejb-3.0-api.pom geronimo-ejb-3.0-api.jar +%add_maven_depmap JPP-geronimo-ejb-3.0-api.pom geronimo-ejb-3.0-api.jar -f ejb-3.0-api install -m 0644 \ geronimo-el_1.0_spec-1.0/target/geronimo-el_1.0_spec-1.0.jar \ @@ -915,7 +915,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-el_1.0_spec-1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-el-1.0-api.pom -%add_maven_depmap JPP-geronimo-el-1.0-api.pom geronimo-el-1.0-api.jar +%add_maven_depmap JPP-geronimo-el-1.0-api.pom geronimo-el-1.0-api.jar -f el-1.0-api install -m 0644 \ geronimo-interceptor_3.0_spec-1.0/target/geronimo-interceptor_3.0_spec-1.0.jar \ @@ -926,7 +926,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-interceptor_3.0_spec-1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-interceptor-3.0-api.pom -%add_maven_depmap JPP-geronimo-interceptor-3.0-api.pom geronimo-interceptor-3.0-api.jar +%add_maven_depmap JPP-geronimo-interceptor-3.0-api.pom geronimo-interceptor-3.0-api.jar -f interceptor-3.0-api install -m 0644 \ geronimo-j2ee-connector_1.5_spec-1.1.1/target/geronimo-j2ee-connector_1.5_spec-1.1.1.jar \ @@ -937,7 +937,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-j2ee-connector_1.5_spec-1.1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-j2ee-connector-1.5-api.pom -%add_maven_depmap JPP-geronimo-j2ee-connector-1.5-api.pom geronimo-j2ee-connector-1.5-api.jar +%add_maven_depmap JPP-geronimo-j2ee-connector-1.5-api.pom geronimo-j2ee-connector-1.5-api.jar -f j2ee-connector-1.5-api install -m 0644 \ geronimo-j2ee-deployment_1.1_spec-1.1/target/geronimo-j2ee-deployment_1.1_spec-1.1.jar \ @@ -948,7 +948,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-j2ee-deployment_1.1_spec-1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-j2ee-deployment-1.1-api.pom -%add_maven_depmap JPP-geronimo-j2ee-deployment-1.1-api.pom geronimo-j2ee-deployment-1.1-api.jar +%add_maven_depmap JPP-geronimo-j2ee-deployment-1.1-api.pom geronimo-j2ee-deployment-1.1-api.jar -f j2ee-deployment-1.1-api install -m 0644 \ geronimo-javaee-deployment_1.1MR3_spec-1.0/target/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar \ @@ -959,7 +959,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-javaee-deployment_1.1MR3_spec-1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-javaee-deployment-1.1-api.pom -%add_maven_depmap JPP-geronimo-javaee-deployment-1.1-api.pom geronimo-javaee-deployment-1.1-api.jar +%add_maven_depmap JPP-geronimo-javaee-deployment-1.1-api.pom geronimo-javaee-deployment-1.1-api.jar -f javaee-deployment-1.1-api install -m 0644 \ geronimo-j2ee-jacc_1.0_spec-1.1/target/geronimo-j2ee-jacc_1.0_spec-1.1.jar \ @@ -970,7 +970,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-j2ee-jacc_1.0_spec-1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jacc-1.0-api.pom -%add_maven_depmap JPP-geronimo-jacc-1.0-api.pom geronimo-jacc-1.0-api.jar +%add_maven_depmap JPP-geronimo-jacc-1.0-api.pom geronimo-jacc-1.0-api.jar -f jacc-1.0-api install -m 0644 \ geronimo-jacc_1.1_spec-1.0/target/geronimo-jacc_1.1_spec-1.0.jar \ @@ -981,7 +981,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-jacc_1.1_spec-1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jacc-1.1-api.pom -%add_maven_depmap JPP-geronimo-jacc-1.1-api.pom geronimo-jacc-1.1-api.jar +%add_maven_depmap JPP-geronimo-jacc-1.1-api.pom geronimo-jacc-1.1-api.jar -f jacc-1.1-api install -m 0644 \ geronimo-j2ee-management_1.0_spec-1.1/target/geronimo-j2ee-management_1.0_spec-1.1.jar \ @@ -992,7 +992,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-j2ee-management_1.0_spec-1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-j2ee-management-1.0-api.pom -%add_maven_depmap JPP-geronimo-j2ee-management-1.0-api.pom geronimo-j2ee-management-1.0-api.jar +%add_maven_depmap JPP-geronimo-j2ee-management-1.0-api.pom geronimo-j2ee-management-1.0-api.jar -f j2ee-management-1.0-api install -m 0644 \ geronimo-j2ee-management_1.1_spec-1.0/target/geronimo-j2ee-management_1.1_spec-1.0.jar \ @@ -1003,7 +1003,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-j2ee-management_1.1_spec-1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-j2ee-management-1.1-api.pom -%add_maven_depmap JPP-geronimo-j2ee-management-1.1-api.pom geronimo-j2ee-management-1.1-api.jar +%add_maven_depmap JPP-geronimo-j2ee-management-1.1-api.pom geronimo-j2ee-management-1.1-api.jar -f j2ee-management-1.1-api install -m 0644 \ geronimo-javamail_1.3.1_spec-1.3/target/geronimo-javamail_1.3.1_spec-1.3.jar \ @@ -1014,7 +1014,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-javamail_1.3.1_spec-1.3/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-javamail-1.3.1-api.pom -%add_maven_depmap JPP-geronimo-javamail-1.3.1-api.pom geronimo-javamail-1.3.1-api.jar +%add_maven_depmap JPP-geronimo-javamail-1.3.1-api.pom geronimo-javamail-1.3.1-api.jar -f javamail-1.3.1-api install -m 0644 \ geronimo-javamail_1.4_spec-1.1/target/geronimo-javamail_1.4_spec-1.1.jar \ @@ -1025,7 +1025,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-javamail_1.4_spec-1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-javamail-1.4-api.pom -%add_maven_depmap JPP-geronimo-javamail-1.4-api.pom geronimo-javamail-1.4-api.jar +%add_maven_depmap JPP-geronimo-javamail-1.4-api.pom geronimo-javamail-1.4-api.jar -f javamail-1.4-api install -m 0644 \ geronimo-jaxr_1.0_spec-1.1/target/geronimo-jaxr_1.0_spec-1.1.jar \ @@ -1036,7 +1036,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-jaxr_1.0_spec-1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jaxr-1.0-api.pom -%add_maven_depmap JPP-geronimo-jaxr-1.0-api.pom geronimo-jaxr-1.0-api.jar +%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 \ @@ -1047,7 +1047,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 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 +%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 \ @@ -1058,7 +1058,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-spec-j2ee/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-j2ee-1.4-apis.pom -%add_maven_depmap JPP-geronimo-j2ee-1.4-apis.pom geronimo-j2ee-1.4-apis.jar +%add_maven_depmap JPP-geronimo-j2ee-1.4-apis.pom geronimo-j2ee-1.4-apis.jar -f j2ee-1.4-apis install -m 0644 \ geronimo-jms_1.1_spec-1.1/target/geronimo-jms_1.1_spec-1.1.jar \ @@ -1069,7 +1069,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-jms_1.1_spec-1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jms-1.1-api.pom -%add_maven_depmap JPP-geronimo-jms-1.1-api.pom geronimo-jms-1.1-api.jar +%add_maven_depmap JPP-geronimo-jms-1.1-api.pom geronimo-jms-1.1-api.jar -f jms-1.1-api install -m 0644 \ geronimo-jpa_3.0_spec-1.1.0/target/geronimo-jpa_3.0_spec-1.1.jar \ @@ -1080,7 +1080,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-jpa_3.0_spec-1.1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jpa-3.0-api.pom -%add_maven_depmap JPP-geronimo-jpa-3.0-api.pom geronimo-jpa-3.0-api.jar +%add_maven_depmap JPP-geronimo-jpa-3.0-api.pom geronimo-jpa-3.0-api.jar -f jpa-3.0-api install -m 0644 \ geronimo-jsp_2.0_spec-1.1/target/geronimo-jsp_2.0_spec-1.1.jar \ @@ -1091,7 +1091,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-jsp_2.0_spec-1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jsp-2.0-api.pom -%add_maven_depmap JPP-geronimo-jsp-2.0-api.pom geronimo-jsp-2.0-api.jar +%add_maven_depmap JPP-geronimo-jsp-2.0-api.pom geronimo-jsp-2.0-api.jar -f jsp-2.0-api install -m 0644 \ geronimo-jsp_2.1_spec-1.0/target/geronimo-jsp_2.1_spec-1.0.jar \ @@ -1102,7 +1102,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-jsp_2.1_spec-1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jsp-2.1-api.pom -%add_maven_depmap JPP-geronimo-jsp-2.1-api.pom geronimo-jsp-2.1-api.jar +%add_maven_depmap JPP-geronimo-jsp-2.1-api.pom geronimo-jsp-2.1-api.jar -f jsp-2.1-api install -m 0644 \ geronimo-jta_1.0.1B_spec-1.1.1/target/geronimo-jta_1.0.1B_spec-1.1.1.jar \ @@ -1113,7 +1113,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-jta_1.0.1B_spec-1.1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jta-1.0.1B-api.pom -%add_maven_depmap JPP-geronimo-jta-1.0.1B-api.pom geronimo-jta-1.0.1B-api.jar +%add_maven_depmap JPP-geronimo-jta-1.0.1B-api.pom geronimo-jta-1.0.1B-api.jar -f jta-1.0.1B-api install -m 0644 \ geronimo-jta_1.1_spec-1.1.0/target/geronimo-jta_1.1_spec-1.1.jar \ @@ -1124,7 +1124,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-jta_1.1_spec-1.1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jta-1.1-api.pom -%add_maven_depmap JPP-geronimo-jta-1.1-api.pom geronimo-jta-1.1-api.jar +%add_maven_depmap JPP-geronimo-jta-1.1-api.pom geronimo-jta-1.1-api.jar -f jta-1.1-api install -m 0644 \ geronimo-qname_1.1_spec-1.1/target/geronimo-qname_1.1_spec-1.1.jar \ @@ -1135,7 +1135,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-qname_1.1_spec-1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-qname-1.1-api.pom -%add_maven_depmap JPP-geronimo-qname-1.1-api.pom geronimo-qname-1.1-api.jar +%add_maven_depmap JPP-geronimo-qname-1.1-api.pom geronimo-qname-1.1-api.jar -f qname-1.1-api install -m 0644 \ geronimo-saaj_1.1_spec-1.1/target/geronimo-saaj_1.1_spec-1.1.jar \ @@ -1146,7 +1146,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-saaj_1.1_spec-1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-saaj-1.1-api.pom -%add_maven_depmap JPP-geronimo-saaj-1.1-api.pom geronimo-saaj-1.1-api.jar +%add_maven_depmap JPP-geronimo-saaj-1.1-api.pom geronimo-saaj-1.1-api.jar -f saaj-1.1-api install -m 0644 \ geronimo-servlet_2.4_spec-1.1.1/target/geronimo-servlet_2.4_spec-1.1.1.jar \ @@ -1157,7 +1157,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-servlet_2.4_spec-1.1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-servlet-2.4-api.pom -%add_maven_depmap JPP-geronimo-servlet-2.4-api.pom geronimo-servlet-2.4-api.jar +%add_maven_depmap JPP-geronimo-servlet-2.4-api.pom geronimo-servlet-2.4-api.jar -f servlet-2.4-api install -m 0644 \ geronimo-servlet_2.5_spec-1.1/target/geronimo-servlet_2.5_spec-1.1.jar \ @@ -1168,7 +1168,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-servlet_2.5_spec-1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-servlet-2.5-api.pom -%add_maven_depmap JPP-geronimo-servlet-2.5-api.pom geronimo-servlet-2.5-api.jar +%add_maven_depmap JPP-geronimo-servlet-2.5-api.pom geronimo-servlet-2.5-api.jar -f servlet-2.5-api install -m 0644 \ geronimo-stax-api_1.0_spec-1.0/target/geronimo-stax-api_1.0_spec-1.0.jar \ @@ -1179,7 +1179,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-stax-api_1.0_spec-1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-stax-1.0-api.pom -%add_maven_depmap JPP-geronimo-stax-1.0-api.pom geronimo-stax-1.0-api.jar +%add_maven_depmap JPP-geronimo-stax-1.0-api.pom geronimo-stax-1.0-api.jar -f stax-1.0-api install -m 0644 \ geronimo-ws-metadata_2.0_spec-1.1.1/target/geronimo-ws-metadata_2.0_spec-1.1.1.jar \ @@ -1190,7 +1190,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-ws-metadata_2.0_spec-1.1.1/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-ws-metadata-2.0-api.pom -%add_maven_depmap JPP-geronimo-ws-metadata-2.0-api.pom geronimo-ws-metadata-2.0-api.jar +%add_maven_depmap JPP-geronimo-ws-metadata-2.0-api.pom geronimo-ws-metadata-2.0-api.jar -f ws-metadata-2.0-api install -m 0644 \ geronimo-spec-commonj/target/geronimo-commonj_1.1_spec-null.jar \ @@ -1201,7 +1201,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-spec-commonj/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-commonj-1.1-apis.pom -%add_maven_depmap JPP-geronimo-commonj-1.1-apis.pom geronimo-commonj-1.1-apis.jar +%add_maven_depmap JPP-geronimo-commonj-1.1-apis.pom geronimo-commonj-1.1-apis.jar -f commonj-1.1-apis # Add the parent geronimo-specs pom cp pom.xml \ @@ -1989,10 +1989,10 @@ fi %dir %{_javadir}/geronimo %{_javadir}/geronimo/* -%files poms +%files pom %defattr(-,root,root) %{_datadir}/maven-metadata/%{name}.xml* -%{_mavenpomdir}/* +%{_mavenpomdir}/JPP-geronimo-specs.pom %files -n geronimo-commonj-1_1-apis %defattr(-,root,root) @@ -2001,6 +2001,8 @@ fi %ghost %{_sysconfdir}/alternatives/commonj_1_1_apis.jar %{_javadir}/commonj_apis.jar %ghost %{_sysconfdir}/alternatives/commonj_apis.jar +%{_mavenpomdir}/JPP-geronimo-commonj-1.1-apis.pom +%{_datadir}/maven-metadata/%{name}-commonj-1.1-apis.xml* %doc %{_docdir}/%{name}-%{version}/commonj-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/commonj-1.1 %dir %{_docdir}/%{name}-%{version} @@ -2017,6 +2019,8 @@ fi %ghost %{_sysconfdir}/alternatives/jaf_api.jar %{_javadir}/jaf_1_0_2_api.jar %ghost %{_sysconfdir}/alternatives/jaf_1_0_2_api.jar +%{_mavenpomdir}/JPP-geronimo-jaf-1.0.2-api.pom +%{_datadir}/maven-metadata/%{name}-jaf-1.0.2-api.xml* %files -n geronimo-jaf-1_1-api %defattr(-,root,root) @@ -2030,6 +2034,8 @@ fi %ghost %{_sysconfdir}/alternatives/jaf_api.jar %{_javadir}/jaf_1_1_api.jar %ghost %{_sysconfdir}/alternatives/jaf_1_1_api.jar +%{_mavenpomdir}/JPP-geronimo-jaf-1.1-api.pom +%{_datadir}/maven-metadata/%{name}-jaf-1.1-api.xml* %files -n geronimo-annotation-1_0-api %defattr(-,root,root) @@ -2041,6 +2047,8 @@ fi %{_javadir}/annotation_1_0_api.jar %ghost %{_sysconfdir}/alternatives/annotation_1_0_api.jar %{_javadir}/geronimo-annotation-1.0-api*.jar +%{_mavenpomdir}/JPP-geronimo-annotation-1.0-api.pom +%{_datadir}/maven-metadata/%{name}-annotation-1.0-api.xml* %files -n geronimo-corba-1_0-apis %defattr(-,root,root) @@ -2049,6 +2057,8 @@ fi %ghost %{_sysconfdir}/alternatives/corba_apis.jar %{_javadir}/corba_1_0_apis.jar %ghost %{_sysconfdir}/alternatives/corba_1_0_apis.jar +%{_mavenpomdir}/JPP-geronimo-corba-1.0-apis.pom +%{_datadir}/maven-metadata/%{name}-corba-1.0-apis.xml* %files -n geronimo-corba-2_3-apis %defattr(-,root,root) @@ -2060,6 +2070,8 @@ fi %ghost %{_sysconfdir}/alternatives/corba_apis.jar %{_javadir}/corba_2_3_apis.jar %ghost %{_sysconfdir}/alternatives/corba_2_3_apis.jar +%{_mavenpomdir}/JPP-geronimo-corba-2.3-apis.pom +%{_datadir}/maven-metadata/%{name}-corba-2.3-apis.xml* %files -n geronimo-ejb-2_1-api %defattr(-,root,root) @@ -2073,6 +2085,8 @@ fi %{_javadir}/ejb_2_1_api.jar %ghost %{_sysconfdir}/alternatives/ejb_2_1_api.jar %{_javadir}/geronimo-ejb-2.1-api*.jar +%{_mavenpomdir}/JPP-geronimo-ejb-2.1-api.pom +%{_datadir}/maven-metadata/%{name}-ejb-2.1-api.xml* %files -n geronimo-ejb-3_0-api %defattr(-,root,root) @@ -2086,6 +2100,8 @@ fi %{_javadir}/ejb_3_0_api.jar %ghost %{_sysconfdir}/alternatives/ejb_3_0_api.jar %{_javadir}/geronimo-ejb-3.0-api*.jar +%{_mavenpomdir}/JPP-geronimo-ejb-3.0-api.pom +%{_datadir}/maven-metadata/%{name}-ejb-3.0-api.xml* %files -n geronimo-el-1_0-api %defattr(-,root,root) @@ -2097,6 +2113,8 @@ fi %ghost %{_sysconfdir}/alternatives/el_api.jar %{_javadir}/el_1_0_api.jar %ghost %{_sysconfdir}/alternatives/el_1_0_api.jar +%{_mavenpomdir}/JPP-geronimo-el-1.0-api.pom +%{_datadir}/maven-metadata/%{name}-el-1.0-api.xml* %files -n geronimo-interceptor-3_0-api %defattr(-,root,root) @@ -2108,6 +2126,8 @@ fi %{_javadir}/interceptor_3_0_api.jar %ghost %{_sysconfdir}/alternatives/interceptor_3_0_api.jar %{_javadir}/geronimo-interceptor-3.0-api*.jar +%{_mavenpomdir}/JPP-geronimo-interceptor-3.0-api.pom +%{_datadir}/maven-metadata/%{name}-interceptor-3.0-api.xml* %files -n geronimo-j2ee-1_4-apis %defattr(-,root,root) @@ -2185,6 +2205,8 @@ fi %{_javadir}/servlet_api.jar %ghost %{_sysconfdir}/alternatives/servlet_2_4_api.jar %{_javadir}/servlet_2_4_api.jar +%{_mavenpomdir}/JPP-geronimo-j2ee-1.4-apis.pom +%{_datadir}/maven-metadata/%{name}-j2ee-1.4-apis.xml* %files -n geronimo-j2ee-connector-1_5-api %defattr(-,root,root) @@ -2198,6 +2220,8 @@ fi %ghost %{_sysconfdir}/alternatives/j2ee_connector_api.jar %{_javadir}/j2ee_connector_1_5_api.jar %ghost %{_sysconfdir}/alternatives/j2ee_connector_1_5_api.jar +%{_mavenpomdir}/JPP-geronimo-j2ee-connector-1.5-api.pom +%{_datadir}/maven-metadata/%{name}-j2ee-connector-1.5-api.xml* %files -n geronimo-j2ee-deployment-1_1-api %defattr(-,root,root) @@ -2211,6 +2235,8 @@ fi %ghost %{_sysconfdir}/alternatives/j2ee_deployment_api.jar %{_javadir}/j2ee_deployment_1_1_api.jar %ghost %{_sysconfdir}/alternatives/j2ee_deployment_1_1_api.jar +%{_mavenpomdir}/JPP-geronimo-j2ee-deployment-1.1-api.pom +%{_datadir}/maven-metadata/%{name}-j2ee-deployment-1.1-api.xml* %files -n geronimo-javaee-deployment-1_1-api %defattr(-,root,root) @@ -2222,6 +2248,8 @@ fi %ghost %{_sysconfdir}/alternatives/javaee_deployment_api.jar %{_javadir}/javaee_deployment_1_1MR3_api.jar %ghost %{_sysconfdir}/alternatives/javaee_deployment_1_1MR3_api.jar +%{_mavenpomdir}/JPP-geronimo-javaee-deployment-1.1-api.pom +%{_datadir}/maven-metadata/%{name}-javaee-deployment-1.1-api.xml* %files -n geronimo-jacc-1_0-api %defattr(-,root,root) @@ -2235,6 +2263,8 @@ fi %ghost %{_sysconfdir}/alternatives/jacc_api.jar %{_javadir}/jacc_1_0_api.jar %ghost %{_sysconfdir}/alternatives/jacc_1_0_api.jar +%{_mavenpomdir}/JPP-geronimo-jacc-1.0-api.pom +%{_datadir}/maven-metadata/%{name}-jacc-1.0-api.xml* %files -n geronimo-jacc-1_1-api %defattr(-,root,root) @@ -2246,6 +2276,8 @@ fi %ghost %{_sysconfdir}/alternatives/jacc_api.jar %{_javadir}/jacc_1_1_api.jar %ghost %{_sysconfdir}/alternatives/jacc_1_1_api.jar +%{_mavenpomdir}/JPP-geronimo-jacc-1.1-api.pom +%{_datadir}/maven-metadata/%{name}-jacc-1.1-api.xml* %files -n geronimo-j2ee-management-1_0-api %defattr(-,root,root) @@ -2259,6 +2291,8 @@ fi %ghost %{_sysconfdir}/alternatives/j2ee_management_api.jar %{_javadir}/j2ee_management_1_0_api.jar %ghost %{_sysconfdir}/alternatives/j2ee_management_1_0_api.jar +%{_mavenpomdir}/JPP-geronimo-j2ee-management-1.0-api.pom +%{_datadir}/maven-metadata/%{name}-j2ee-management-1.0-api.xml* %files -n geronimo-j2ee-management-1_1-api %defattr(-,root,root) @@ -2272,6 +2306,8 @@ fi %ghost %{_sysconfdir}/alternatives/j2ee_management_api.jar %{_javadir}/j2ee_management_1_1_api.jar %ghost %{_sysconfdir}/alternatives/j2ee_management_1_1_api.jar +%{_mavenpomdir}/JPP-geronimo-j2ee-management-1.1-api.pom +%{_datadir}/maven-metadata/%{name}-j2ee-management-1.1-api.xml* %files -n geronimo-javamail-1_3_1-api %defattr(-,root,root) @@ -2289,6 +2325,8 @@ fi %ghost %{_sysconfdir}/alternatives/javamail_1_3_1_api.jar %{_javadir}/javamail.jar %ghost %{_sysconfdir}/alternatives/javamail.jar +%{_mavenpomdir}/JPP-geronimo-javamail-1.3.1-api.pom +%{_datadir}/maven-metadata/%{name}-javamail-1.3.1-api.xml* %files -n geronimo-javamail-1_4-api %defattr(-,root,root) @@ -2306,6 +2344,8 @@ fi %ghost %{_sysconfdir}/alternatives/javamail_1_4_api.jar %{_javadir}/javamail.jar %ghost %{_sysconfdir}/alternatives/javamail.jar +%{_mavenpomdir}/JPP-geronimo-javamail-1.4-api.pom +%{_datadir}/maven-metadata/%{name}-javamail-1.4-api.xml* %files -n geronimo-jaxr-1_0-api %defattr(-,root,root) @@ -2319,6 +2359,8 @@ fi %ghost %{_sysconfdir}/alternatives/jaxr_api.jar %{_javadir}/jaxr_1_0_api.jar %ghost %{_sysconfdir}/alternatives/jaxr_1_0_api.jar +%{_mavenpomdir}/JPP-geronimo-jaxr-1.0-api.pom +%{_datadir}/maven-metadata/%{name}-jaxr-1.0-api.xml* %files -n geronimo-jaxrpc-1_1-api %defattr(-,root,root) @@ -2332,6 +2374,8 @@ fi %ghost %{_sysconfdir}/alternatives/jaxrpc_api.jar %{_javadir}/jaxrpc_1_1_api.jar %ghost %{_sysconfdir}/alternatives/jaxrpc_1_1_api.jar +%{_mavenpomdir}/JPP-geronimo-jaxrpc-1.1-api.pom +%{_datadir}/maven-metadata/%{name}-jaxrpc-1.1-api.xml* %files -n geronimo-jms-1_1-api %defattr(-,root,root) @@ -2345,6 +2389,8 @@ fi %ghost %{_sysconfdir}/alternatives/jms_api.jar %{_javadir}/jms_1_1_api.jar %ghost %{_sysconfdir}/alternatives/jms_1_1_api.jar +%{_mavenpomdir}/JPP-geronimo-jms-1.1-api.pom +%{_datadir}/maven-metadata/%{name}-jms-1.1-api.xml* %files -n geronimo-jpa-3_0-api %defattr(-,root,root) @@ -2356,6 +2402,8 @@ fi %ghost %{_sysconfdir}/alternatives/jpa_api.jar %{_javadir}/jpa_3_0_api.jar %ghost %{_sysconfdir}/alternatives/jpa_3_0_api.jar +%{_mavenpomdir}/JPP-geronimo-jpa-3.0-api.pom +%{_datadir}/maven-metadata/%{name}-jpa-3.0-api.xml* %files -n geronimo-jsp-2_0-api %defattr(-,root,root) @@ -2369,6 +2417,8 @@ fi %ghost %{_sysconfdir}/alternatives/jsp_api.jar %{_javadir}/jsp_2_0_api.jar %ghost %{_sysconfdir}/alternatives/jsp_2_0_api.jar +%{_mavenpomdir}/JPP-geronimo-jsp-2.0-api.pom +%{_datadir}/maven-metadata/%{name}-jsp-2.0-api.xml* %files -n geronimo-jsp-2_1-api %defattr(-,root,root) @@ -2382,6 +2432,8 @@ fi %ghost %{_sysconfdir}/alternatives/jsp_api.jar %{_javadir}/jsp_2_1_api.jar %ghost %{_sysconfdir}/alternatives/jsp_2_1_api.jar +%{_mavenpomdir}/JPP-geronimo-jsp-2.1-api.pom +%{_datadir}/maven-metadata/%{name}-jsp-2.1-api.xml* %files -n geronimo-jta-1_0_1B-api %defattr(-,root,root) @@ -2395,6 +2447,8 @@ fi %ghost %{_sysconfdir}/alternatives/jta_api.jar %{_javadir}/jta_1_0_1B_api.jar %ghost %{_sysconfdir}/alternatives/jta_1_0_1B_api.jar +%{_mavenpomdir}/JPP-geronimo-jta-1.0.1B-api.pom +%{_datadir}/maven-metadata/%{name}-jta-1.0.1B-api.xml* %files -n geronimo-jta-1_1-api %defattr(-,root,root) @@ -2408,6 +2462,8 @@ fi %ghost %{_sysconfdir}/alternatives/jta_api.jar %{_javadir}/jta_1_1_api.jar %ghost %{_sysconfdir}/alternatives/jta_1_1_api.jar +%{_mavenpomdir}/JPP-geronimo-jta-1.1-api.pom +%{_datadir}/maven-metadata/%{name}-jta-1.1-api.xml* %files -n geronimo-qname-1_1-api %defattr(-,root,root) @@ -2419,6 +2475,8 @@ fi %ghost %{_sysconfdir}/alternatives/qname_api.jar %{_javadir}/qname_1_1_api.jar %ghost %{_sysconfdir}/alternatives/qname_1_1_api.jar +%{_mavenpomdir}/JPP-geronimo-qname-1.1-api.pom +%{_datadir}/maven-metadata/%{name}-qname-1.1-api.xml* %files -n geronimo-saaj-1_1-api %defattr(-,root,root) @@ -2432,6 +2490,8 @@ fi %ghost %{_sysconfdir}/alternatives/saaj_api.jar %{_javadir}/saaj_1_1_api.jar %ghost %{_sysconfdir}/alternatives/saaj_1_1_api.jar +%{_mavenpomdir}/JPP-geronimo-saaj-1.1-api.pom +%{_datadir}/maven-metadata/%{name}-saaj-1.1-api.xml* %files -n geronimo-servlet-2_4-api %defattr(-,root,root) @@ -2445,6 +2505,8 @@ fi %ghost %{_sysconfdir}/alternatives/servlet_api.jar %{_javadir}/servlet_2_4_api.jar %ghost %{_sysconfdir}/alternatives/servlet_2_4_api.jar +%{_mavenpomdir}/JPP-geronimo-servlet-2.4-api.pom +%{_datadir}/maven-metadata/%{name}-servlet-2.4-api.xml* %files -n geronimo-servlet-2_5-api %defattr(-,root,root) @@ -2458,6 +2520,8 @@ fi %ghost %{_sysconfdir}/alternatives/servlet_api.jar %{_javadir}/servlet_2_5_api.jar %ghost %{_sysconfdir}/alternatives/servlet_2_5_api.jar +%{_mavenpomdir}/JPP-geronimo-servlet-2.5-api.pom +%{_datadir}/maven-metadata/%{name}-servlet-2.5-api.xml* %files -n geronimo-stax-1_0-api %defattr(-,root,root) @@ -2469,6 +2533,8 @@ fi %ghost %{_sysconfdir}/alternatives/stax_api.jar %{_javadir}/stax_1_0_api.jar %ghost %{_sysconfdir}/alternatives/stax_1_0_api.jar +%{_mavenpomdir}/JPP-geronimo-stax-1.0-api.pom +%{_datadir}/maven-metadata/%{name}-stax-1.0-api.xml* %files -n geronimo-ws-metadata-2_0-api %defattr(-,root,root) @@ -2480,5 +2546,7 @@ fi %ghost %{_sysconfdir}/alternatives/ws_metadata_api.jar %{_javadir}/ws_metadata_2_0_api.jar %ghost %{_sysconfdir}/alternatives/ws_metadata_2_0_api.jar +%{_mavenpomdir}/JPP-geronimo-ws-metadata-2.0-api.pom +%{_datadir}/maven-metadata/%{name}-ws-metadata-2.0-api.xml* %changelog From 240e93d626f5708e8571e6edbf0f673f4f65fc70f2b91416d23ed2be813ded5f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 12 Nov 2018 05:11:21 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=32 --- geronimo-specs.spec | 68 ++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/geronimo-specs.spec b/geronimo-specs.spec index 561de84..32be09c 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -170,7 +170,7 @@ 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 -Requires: %{name}-poms = %{version} +Requires: %{name}-pom = %{version} Provides: commonj_1_1_apis = %{version}-%{release} Provides: commonj_apis = 1.1 @@ -181,7 +181,7 @@ 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: %{name}-pom = %{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 @@ -201,7 +201,7 @@ 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: %{name}-pom = %{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 @@ -223,7 +223,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: annotation_1_0_api @@ -238,7 +238,7 @@ 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} +Requires: %{name}-pom = %{version} Provides: corba_1_0_apis = %{version}-%{release} Provides: corba_apis = 1.0 @@ -249,7 +249,7 @@ 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} +Requires: %{name}-pom = %{version} Provides: corba_2_3_apis = %{version}-%{release} Provides: corba_apis = 2.3 @@ -260,7 +260,7 @@ 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: %{name}-pom = %{version} Requires: jta_1_0_1B_api Requires(post): update-alternatives Requires(preun): update-alternatives @@ -278,7 +278,7 @@ 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: %{name}-pom = %{version} Requires: annotation_1_0_api Requires: interceptor_3_0_api Requires: jta_1_1_api @@ -299,7 +299,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: el_1_0_api = %{version}-%{release} @@ -314,7 +314,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: interceptor_3_0_api = %{version}-%{release} @@ -329,7 +329,7 @@ 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: %{name}-pom = %{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 @@ -402,7 +402,7 @@ 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: %{name}-pom = %{version} Requires: jta_1_0_1B_api Requires(post): update-alternatives Requires(preun): update-alternatives @@ -419,7 +419,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: j2ee_deployment_1_1_api = %{version}-%{release} @@ -435,7 +435,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: javaee_deployment_1_1_api = %{version}-%{release} @@ -450,7 +450,7 @@ 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: %{name}-pom = %{version} Requires: servlet_2_4_api Requires(post): update-alternatives Requires(preun): update-alternatives @@ -467,7 +467,7 @@ Specification %package -n geronimo-jacc-1_1-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java -Requires: %{name}-poms = %{version} +Requires: %{name}-pom = %{version} Requires: servlet_2_5_api Requires(post): update-alternatives Requires(preun): update-alternatives @@ -483,7 +483,7 @@ 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: %{name}-pom = %{version} Requires: ejb_2_1_api Requires(post): update-alternatives Requires(preun): update-alternatives @@ -500,7 +500,7 @@ 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: %{name}-pom = %{version} Requires: ejb_3_0_api Requires(post): update-alternatives Requires(preun): update-alternatives @@ -519,7 +519,7 @@ package are deprecated and will disapear in future releases. %package -n geronimo-javamail-1_3_1-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java -Requires: %{name}-poms = %{version} +Requires: %{name}-pom = %{version} Requires: jaf_1_0_2_api Requires(post): update-alternatives Requires(preun): update-alternatives @@ -537,7 +537,7 @@ J2EE-Specifications: JavaMail API %package -n geronimo-javamail-1_4-api Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java -Requires: %{name}-poms = %{version} +Requires: %{name}-pom = %{version} Requires: jaf_1_1_api Requires(post): update-alternatives Requires(preun): update-alternatives @@ -557,7 +557,7 @@ 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: %{name}-pom = %{version} Requires: jaf_1_0_2_api Requires(post): update-alternatives Requires(preun): update-alternatives @@ -574,7 +574,7 @@ 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: %{name}-poms = %{version} +Requires: %{name}-pom = %{version} Requires: qname_1_1_api Requires: saaj_1_1_api Requires: servlet_2_4_api @@ -592,7 +592,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: jms_1_1_api = %{version}-%{release} @@ -608,7 +608,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: jpa_3_0_api = %{version}-%{release} @@ -623,7 +623,7 @@ 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: %{name}-pom = %{version} Requires: servlet_2_4_api Requires(post): update-alternatives Requires(preun): update-alternatives @@ -639,7 +639,7 @@ 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: %{name}-pom = %{version} Requires: el_1_0_api Requires: servlet_2_5_api Requires(post): update-alternatives @@ -660,7 +660,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: jta_1_0_1B_api = %{version}-%{release} @@ -677,7 +677,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: jta_1_1_api = %{version}-%{release} @@ -694,7 +694,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: qname_1_1_api = %{version}-%{release} @@ -707,7 +707,7 @@ 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: %{name}-pom = %{version} Requires: jaf_1_0_2_api Requires(post): update-alternatives Requires(preun): update-alternatives @@ -723,7 +723,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: servlet = 2.4 @@ -738,7 +738,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: servlet = 2.5 @@ -755,7 +755,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: stax_1_0_api = %{version}-%{release} @@ -770,7 +770,7 @@ 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: %{name}-pom = %{version} Requires(post): update-alternatives Requires(preun): update-alternatives Provides: ws_metadata_2_0_api = %{version}-%{release} From 7821d92cf2d10560311dbb87ef4a46258a965f8c906a71db66040e7e4a430832 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 12 Nov 2018 09:01:45 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=33 --- geronimo-specs.changes | 6 ++++++ geronimo-specs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index 0902dfe..8c8cf5d 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 12 09:00:42 UTC 2018 - Fridrich Strba + +- Add alias javax.persistence:persistence-api to + geronimo-jpa-3.0-api subpackage + ------------------------------------------------------------------- Mon Nov 12 04:49:55 UTC 2018 - Fridrich Strba diff --git a/geronimo-specs.spec b/geronimo-specs.spec index 32be09c..dfd76fc 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -1080,7 +1080,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-jpa_3.0_spec-1.1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jpa-3.0-api.pom -%add_maven_depmap JPP-geronimo-jpa-3.0-api.pom geronimo-jpa-3.0-api.jar -f jpa-3.0-api +%add_maven_depmap JPP-geronimo-jpa-3.0-api.pom geronimo-jpa-3.0-api.jar -f jpa-3.0-api -a javax.persistence:persistence-api install -m 0644 \ geronimo-jsp_2.0_spec-1.1/target/geronimo-jsp_2.0_spec-1.1.jar \ From 4a9c3278a76c1178272274ee38216bd039d1b5c1a4261a31550bf2636c899fd7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 13 Nov 2018 07:39:18 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=34 --- geronimo-specs.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/geronimo-specs.spec b/geronimo-specs.spec index dfd76fc..c6877ba 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -785,6 +785,8 @@ package are deprecated and will disapear in future releases. %package pom Summary: Geronimo J2EE server J2EE specifications Group: Development/Languages/Java +Provides: %{name}-poms = %{version}-%{release} +Obsoletes: %{name}-poms < %{version}-%{release} %description pom Geronimo is Apache's ASF-licenced J2EE server project. These are the From a2138c05283bb89b33693f91085fe3141f8578a79aed7007727db0cd6033a454 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Nov 2018 17:40:43 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=35 --- geronimo-specs.changes | 6 ++++++ geronimo-specs.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index 8c8cf5d..80fa0a6 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 21 17:38:53 UTC 2018 - Fridrich Strba + +- Add aliases org.eclipse.jetty.orbit:javax.transaction and + javax.transaction:jta to geronimo-jta-1_1-api + ------------------------------------------------------------------- Mon Nov 12 09:00:42 UTC 2018 - Fridrich Strba diff --git a/geronimo-specs.spec b/geronimo-specs.spec index c6877ba..949d718 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -1126,7 +1126,7 @@ pushd %{buildroot}%{_javadir} popd install -m 0644 geronimo-jta_1.1_spec-1.1.0/pom.xml \ %{buildroot}/%{_mavenpomdir}/JPP-geronimo-jta-1.1-api.pom -%add_maven_depmap JPP-geronimo-jta-1.1-api.pom geronimo-jta-1.1-api.jar -f jta-1.1-api +%add_maven_depmap JPP-geronimo-jta-1.1-api.pom geronimo-jta-1.1-api.jar -f jta-1.1-api -a "javax.transaction:jta,org.eclipse.jetty.orbit:javax.transaction" install -m 0644 \ geronimo-qname_1.1_spec-1.1/target/geronimo-qname_1.1_spec-1.1.jar \