From 0b78cce4f6cbc73cb43d7a4cc97edd7ff89e42866f5733713c4207d42261166f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 25 Jul 2014 12:19:26 +0000 Subject: [PATCH 1/5] - Try to use the update-alternatives properly. Still some missing. But left for someone in the future. OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=12 --- geronimo-specs.changes | 6 + geronimo-specs.spec | 499 ++++++++++++++++++++++++++--------------- 2 files changed, 320 insertions(+), 185 deletions(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index 31e5155..c078f0c 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 25 12:18:42 UTC 2014 - tchvatal@suse.com + +- Try to use the update-alternatives properly. Still some missing. + But left for someone in the future. + ------------------------------------------------------------------- Mon Sep 9 11:05:41 UTC 2013 - tchvatal@suse.com diff --git a/geronimo-specs.spec b/geronimo-specs.spec index f17670d..b5d590f 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -1,7 +1,7 @@ # # spec file for package geronimo-specs # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -114,7 +114,7 @@ Source0: %{name}-%{version}-src.tar.bz2 # curl -O http://svn.apache.org/repos/asf/geronimo/specs/trunk/LICENSE.txt # curl -O http://svn.apache.org/repos/asf/geronimo/specs/trunk/NOTICE.txt # curl -O http://svn.apache.org/repos/asf/geronimo/specs/trunk/README.txt -# +# Source1: %{name}-jpp-depmap.xml Source1000: geronimo-specs.build.xml Source1001: undot.py @@ -329,7 +329,6 @@ Provides: ejb = 2.1 Provides: ejb_2_1_api = %{version}-%{release} Provides: ejb_api = 2.1 # drop the following asap -Provides: ejb Obsoletes: ejb Requires: %{name}-poms = %{version} Requires: jta_1_0_1B_api @@ -991,9 +990,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jaf-1.0.2-api-%{sver_activation_1_0_2}.jar \ geronimo-jaf-1.0.2-api.jar popd -touch %{buildroot}%{_javadir}/jaf.jar # for %ghost -touch %{buildroot}%{_javadir}/jaf_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jaf_1_0_2_api.jar # for %ghost 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 @@ -1005,9 +1001,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jaf-1.1-api-%{sver_activation_1_1}.jar \ geronimo-jaf-1.1-api.jar popd -touch %{buildroot}%{_javadir}/jaf.jar # for %ghost -touch %{buildroot}%{_javadir}/jaf_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jaf_1_1_api.jar # for %ghost 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 @@ -1019,8 +1012,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-annotation-1.0-api-%{sver_annotation_1_0}.jar \ geronimo-annotation-1.0-api.jar popd -touch %{buildroot}%{_javadir}/annotation_api.jar # for %ghost -touch %{buildroot}%{_javadir}/annotation_1_0_api.jar # for %ghost 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 @@ -1032,8 +1023,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-corba-2.3-apis-%{sver_corba_2_3}.jar \ geronimo-corba-2.3-apis.jar popd -touch %{buildroot}%{_javadir}/corba_apis.jar # for %ghost -touch %{buildroot}%{_javadir}/corba_2_3_apis.jar # for %ghost 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 @@ -1058,8 +1047,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-corba-1.0-apis-%{sver_corba_1_0}.jar \ geronimo-corba-1.0-apis.jar popd -touch %{buildroot}%{_javadir}/corba_apis.jar # for %ghost -touch %{buildroot}%{_javadir}/corba_1_0_apis.jar # for %ghost 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 @@ -1071,9 +1058,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-ejb-2.1-api-%{sver_ejb_2_1}.jar \ geronimo-ejb-2.1-api.jar popd -touch %{buildroot}%{_javadir}/ejb.jar # for %ghost -touch %{buildroot}%{_javadir}/ejb_api.jar # for %ghost -touch %{buildroot}%{_javadir}/ejb_2_1_api.jar # for %ghost 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 @@ -1085,9 +1069,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-ejb-3.0-api-%{sver_ejb_3_0}.jar \ geronimo-ejb-3.0-api.jar popd -touch %{buildroot}%{_javadir}/ejb.jar # for %ghost -touch %{buildroot}%{_javadir}/ejb_api.jar # for %ghost -touch %{buildroot}%{_javadir}/ejb_3_0_api.jar # for %ghost 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 @@ -1099,8 +1080,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-el-1.0-api-%{sver_el_1_0}.jar \ geronimo-el-1.0-api.jar popd -touch %{buildroot}%{_javadir}/el_api.jar # for %ghost -touch %{buildroot}%{_javadir}/el_1_0_api.jar # for %ghost 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 @@ -1112,8 +1091,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-interceptor-3.0-api-%{sver_interceptor_3_0}.jar \ geronimo-interceptor-3.0-api.jar popd -touch %{buildroot}%{_javadir}/interceptor_api.jar # for %ghost -touch %{buildroot}%{_javadir}/interceptor_3_0_api.jar # for %ghost 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 @@ -1125,9 +1102,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-j2ee-connector-1.5-api-%{sver_j2ee_connector_1_5}.jar \ geronimo-j2ee-connector-1.5-api.jar popd -touch %{buildroot}%{_javadir}/j2ee-connector.jar # for %ghost -touch %{buildroot}%{_javadir}/j2ee_connector_api.jar # for %ghost -touch %{buildroot}%{_javadir}/j2ee_connector_1_5_api.jar # for %ghost 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 @@ -1139,9 +1113,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-j2ee-deployment-1.1-api-%{sver_j2ee_deployment_1_1}.jar \ geronimo-j2ee-deployment-1.1-api.jar popd -touch %{buildroot}%{_javadir}/j2ee-deployment.jar # for %ghost -touch %{buildroot}%{_javadir}/j2ee_deployment_api.jar # for %ghost -touch %{buildroot}%{_javadir}/j2ee_deployment_1_1_api.jar # for %ghost 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 @@ -1153,8 +1124,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-javaee-deployment-1.1-api-%{sver_javaee_deployment_1_1MR3}.jar \ geronimo-javaee-deployment-1.1-api.jar popd -touch %{buildroot}%{_javadir}/javaee_deployment_1_1MR3_api.jar # for %ghost -touch %{buildroot}%{_javadir}/javaee_deployment_api.jar # for %ghost 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 @@ -1166,9 +1135,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jacc-1.0-api-%{sver_j2ee_jacc_1_0}.jar \ geronimo-jacc-1.0-api.jar popd -touch %{buildroot}%{_javadir}/jacc.jar # for %ghost -touch %{buildroot}%{_javadir}/jacc_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jacc_1_0_api.jar # for %ghost 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 @@ -1180,8 +1146,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jacc-1.1-api-%{sver_jacc_1_1}.jar \ geronimo-jacc-1.1-api.jar popd -touch %{buildroot}%{_javadir}/jacc_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jacc_1_1_api.jar # for %ghost 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 @@ -1193,9 +1157,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-j2ee-management-1.0-api-%{sver_j2ee_management_1_0}.jar \ geronimo-j2ee-management-1.0-api.jar popd -touch %{buildroot}%{_javadir}/j2ee-management.jar # for %ghost -touch %{buildroot}%{_javadir}/j2ee_management_api.jar # for %ghost -touch %{buildroot}%{_javadir}/j2ee_management_1_0_api.jar # for %ghost 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 @@ -1207,9 +1168,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-j2ee-management-1.1-api-%{sver_j2ee_management_1_1}.jar \ geronimo-j2ee-management-1.1-api.jar popd -touch %{buildroot}%{_javadir}/j2ee-management.jar # for %ghost -touch %{buildroot}%{_javadir}/j2ee_management_api.jar # for %ghost -touch %{buildroot}%{_javadir}/j2ee_management_1_1_api.jar # for %ghost 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 @@ -1221,13 +1179,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-javamail-1.3.1-api-%{sver_javamail_1_3_1}.jar \ geronimo-javamail-1.3.1-api.jar popd -# 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' -#touch %{buildroot}%{_javadir}/javamail.jar # for %ghost -# but: -touch %{buildroot}%{_javadir}/javamail_api.jar # for %ghost -touch %{buildroot}%{_javadir}/javamail_1_3_1_api.jar # for %ghost 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 @@ -1239,13 +1190,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-javamail-1.4-api-%{sver_javamail_1_4}.jar \ geronimo-javamail-1.4-api.jar popd -# 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' -#touch %{buildroot}%{_javadir}/javamail.jar # for %ghost -# but: -touch %{buildroot}%{_javadir}/javamail_api.jar # for %ghost -touch %{buildroot}%{_javadir}/javamail_1_4_api.jar # for %ghost 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 @@ -1257,9 +1201,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jaxr-1.0-api-%{sver_jaxr_1_0}.jar \ geronimo-jaxr-1.0-api.jar popd -touch %{buildroot}%{_javadir}/jaxr.jar # for %ghost -touch %{buildroot}%{_javadir}/jaxr_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jaxr_1_0_api.jar # for %ghost 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 @@ -1271,9 +1212,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jaxrpc-1.1-api-%{sver_jaxrpc_1_1}.jar \ geronimo-jaxrpc-1.1-api.jar popd -touch %{buildroot}%{_javadir}/jaxrpc.jar # for %ghost -touch %{buildroot}%{_javadir}/jaxrpc_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jaxrpc_1_1_api.jar # for %ghost 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 @@ -1296,9 +1234,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jms-1.1-api-%{sver_jms_1_1}.jar \ geronimo-jms-1.1-api.jar popd -touch %{buildroot}%{_javadir}/jms.jar # for %ghost -touch %{buildroot}%{_javadir}/jms_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jms_1_1_api.jar # for %ghost 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 @@ -1310,8 +1245,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jpa-3.0-api-%{sver_jpa_3_0}.jar \ geronimo-jpa-3.0-api.jar popd -touch %{buildroot}%{_javadir}/jpa_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jpa_3_0_api.jar # for %ghost 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 @@ -1323,9 +1256,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jsp-2.0-api-%{sver_jsp_2_0}.jar \ geronimo-jsp-2.0-api.jar popd -touch %{buildroot}%{_javadir}/jsp.jar # for %ghost -touch %{buildroot}%{_javadir}/jsp_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jsp_2_0_api.jar # for %ghost 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 @@ -1337,9 +1267,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jsp-2.1-api-%{sver_jsp_2_1}.jar \ geronimo-jsp-2.1-api.jar popd -touch %{buildroot}%{_javadir}/jsp.jar # for %ghost -touch %{buildroot}%{_javadir}/jsp_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jsp_2_1_api.jar # for %ghost 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 @@ -1351,9 +1278,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jta-1.0.1B-api-%{sver_jta_1_0_1B}.jar \ geronimo-jta-1.0.1B-api.jar popd -touch %{buildroot}%{_javadir}/jta.jar # for %ghost -touch %{buildroot}%{_javadir}/jta_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jta_1_0_1B_api.jar # for %ghost 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 @@ -1365,9 +1289,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-jta-1.1-api-%{sver_jta_1_1}.jar \ geronimo-jta-1.1-api.jar popd -touch %{buildroot}%{_javadir}/jta.jar # for %ghost -touch %{buildroot}%{_javadir}/jta_api.jar # for %ghost -touch %{buildroot}%{_javadir}/jta_1_1_api.jar # for %ghost 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 @@ -1379,8 +1300,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-qname-1.1-api-%{sver_qname_1_1}.jar \ geronimo-qname-1.1-api.jar popd -touch %{buildroot}%{_javadir}/qname_api.jar # for %ghost -touch %{buildroot}%{_javadir}/qname_1_1_api.jar # for %ghost 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 @@ -1392,9 +1311,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-saaj-1.1-api-%{sver_saaj_1_1}.jar \ geronimo-saaj-1.1-api.jar popd -touch %{buildroot}%{_javadir}/saaj.jar # for %ghost -touch %{buildroot}%{_javadir}/saaj_api.jar # for %ghost -touch %{buildroot}%{_javadir}/saaj_1_1_api.jar # for %ghost 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 @@ -1406,9 +1322,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-servlet-2.4-api-%{sver_servlet_2_4}.jar \ geronimo-servlet-2.4-api.jar popd -touch %{buildroot}%{_javadir}/servlet.jar # for %ghost -touch %{buildroot}%{_javadir}/servlet_api.jar # for %ghost -touch %{buildroot}%{_javadir}/servlet_2_4_api.jar # for %ghost 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 @@ -1420,9 +1333,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-servlet-2.5-api-%{sver_servlet_2_5}.jar \ geronimo-servlet-2.5-api.jar popd -touch %{buildroot}%{_javadir}/servlet.jar # for %ghost -touch %{buildroot}%{_javadir}/servlet_api.jar # for %ghost -touch %{buildroot}%{_javadir}/servlet_2_5_api.jar # for %ghost 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 @@ -1434,8 +1344,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-stax-1.0-api-%{sver_stax_1_0}.jar \ geronimo-stax-1.0-api.jar popd -touch %{buildroot}%{_javadir}/stax_api.jar # for %ghost -touch %{buildroot}%{_javadir}/stax_1_0_api.jar # for %ghost 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 @@ -1447,8 +1355,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-ws-metadata-2.0-api-%{sver_ws_metadata_2_0}.jar \ geronimo-ws-metadata-2.0-api.jar popd -touch %{buildroot}%{_javadir}/ws_metadata_api.jar # for %ghost -touch %{buildroot}%{_javadir}/ws_metadata_2_0_api.jar # for %ghost 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 @@ -1460,8 +1366,6 @@ pushd %{buildroot}%{_javadir} ln -sf geronimo-commonj-1.1-apis-%{sver_commonj_1_1}.jar \ geronimo-commonj-1.1-apis.jar popd -touch %{buildroot}%{_javadir}/commonj_apis.jar # for %ghost -touch %{buildroot}%{_javadir}/commonj_1_1_apis.jar # for %ghost 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 @@ -1825,8 +1729,148 @@ export NO_BRP_STALE_LINK_ERROR="yes" %endif %fdupes -s %{buildroot}/%{_javadocdir}/%{name}-%{version} -%clean -rm -rf %{buildroot} +# update-alternatives symlinks +mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ +touch %{buildroot}%{_sysconfdir}/alternatives/annotation_api.jar +ln -sf %{_sysconfdir}/alternatives/annotation_api.jar %{buildroot}%{_javadir}/annotation_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/annotation_1_0_api.jar +ln -sf %{_sysconfdir}/alternatives/annotation_1_0_api.jar %{buildroot}%{_javadir}/annotation_1_0_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/commonj_apis.jar +ln -sf %{_sysconfdir}/alternatives/commonj_apis.jar %{buildroot}%{_javadir}/commonj_apis.jar +touch %{buildroot}%{_sysconfdir}/alternatives/commonj_1_1_apis.jar +ln -sf %{_sysconfdir}/alternatives/commonj_1_1_apis.jar %{buildroot}%{_javadir}/commonj_1_1_apis.jar +touch %{buildroot}%{_sysconfdir}/alternatives/corba_apis.jar +ln -sf %{_sysconfdir}/alternatives/corba_apis.jar %{buildroot}%{_javadir}/corba_apis.jar +touch %{buildroot}%{_sysconfdir}/alternatives/corba_1_0_apis.jar +ln -sf %{_sysconfdir}/alternatives/corba_1_0_apis.jar %{buildroot}%{_javadir}/corba_1_0_apis.jar +touch %{buildroot}%{_sysconfdir}/alternatives/corba_2_3_apis.jar +ln -sf %{_sysconfdir}/alternatives/corba_2_3_apis.jar %{buildroot}%{_javadir}/corba_2_3_apis.jar +touch %{buildroot}%{_sysconfdir}/alternatives/ejb_api.jar +ln -sf %{_sysconfdir}/alternatives/ejb_api.jar %{buildroot}%{_javadir}/ejb_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/ejb.jar +ln -sf %{_sysconfdir}/alternatives/ejb.jar %{buildroot}%{_javadir}/ejb.jar +touch %{buildroot}%{_sysconfdir}/alternatives/ejb_2_1_api.jar +ln -sf %{_sysconfdir}/alternatives/ejb_2_1_api.jar %{buildroot}%{_javadir}/ejb_2_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/ejb_3_0_api.jar +ln -sf %{_sysconfdir}/alternatives/ejb_3_0_api.jar %{buildroot}%{_javadir}/ejb_3_0_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/el_api.jar +ln -sf %{_sysconfdir}/alternatives/el_api.jar %{buildroot}%{_javadir}/el_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/el_1_0_api.jar +ln -sf %{_sysconfdir}/alternatives/el_1_0_api.jar %{buildroot}%{_javadir}/el_1_0_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/interceptor_api.jar +ln -sf %{_sysconfdir}/alternatives/interceptor_api.jar %{buildroot}%{_javadir}/interceptor_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/interceptor_3_0_api.jar +ln -sf %{_sysconfdir}/alternatives/interceptor_3_0_api.jar %{buildroot}%{_javadir}/interceptor_3_0_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jacc_api.jar +ln -sf %{_sysconfdir}/alternatives/jacc_api.jar %{buildroot}%{_javadir}/jacc_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jacc.jar +ln -sf %{_sysconfdir}/alternatives/jacc.jar %{buildroot}%{_javadir}/jacc.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jacc_1_0_api.jar +ln -sf %{_sysconfdir}/alternatives/jacc_1_0_api.jar %{buildroot}%{_javadir}/jacc_1_0_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jacc_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/jacc_1_1_api.jar %{buildroot}%{_javadir}/jacc_1_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jaf_api.jar +ln -sf %{_sysconfdir}/alternatives/jaf_api.jar %{buildroot}%{_javadir}/jaf_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jaf.jar +ln -sf %{_sysconfdir}/alternatives/jaf.jar %{buildroot}%{_javadir}/jaf.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jaf_1_0_2_api.jar +ln -sf %{_sysconfdir}/alternatives/jaf_1_0_2_api.jar %{buildroot}%{_javadir}/jaf_1_0_2_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jaf_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/jaf_1_1_api.jar %{buildroot}%{_javadir}/jaf_1_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/javaee_deployment_api.jar +ln -sf %{_sysconfdir}/alternatives/javaee_deployment_api.jar %{buildroot}%{_javadir}/javaee_deployment_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/javaee_deployment_1_1MR3_api.jar +ln -sf %{_sysconfdir}/alternatives/javaee_deployment_1_1MR3_api.jar %{buildroot}%{_javadir}/javaee_deployment_1_1MR3_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/javamail_api.jar +ln -sf %{_sysconfdir}/alternatives/javamail_api.jar %{buildroot}%{_javadir}/javamail_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/javamail_1_3_1_api.jar +ln -sf %{_sysconfdir}/alternatives/javamail_1_3_1_api.jar %{buildroot}%{_javadir}/javamail_1_3_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/javamail_1_4_api.jar +ln -sf %{_sysconfdir}/alternatives/javamail_1_4_api.jar %{buildroot}%{_javadir}/javamail_1_4_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jaxr_api.jar +ln -sf %{_sysconfdir}/alternatives/jaxr_api.jar %{buildroot}%{_javadir}/jaxr_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jaxr.jar +ln -sf %{_sysconfdir}/alternatives/jaxr.jar %{buildroot}%{_javadir}/jaxr.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jaxrpc_api.jar +ln -sf %{_sysconfdir}/alternatives/jaxrpc_api.jar %{buildroot}%{_javadir}/jaxrpc_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jaxrpc.jar +ln -sf %{_sysconfdir}/alternatives/jaxrpc.jar %{buildroot}%{_javadir}/jaxrpc.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jaxrpc_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/jaxrpc_1_1_api.jar %{buildroot}%{_javadir}/jaxrpc_1_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jaxr_1_0_api.jar +ln -sf %{_sysconfdir}/alternatives/jaxr_1_0_api.jar %{buildroot}%{_javadir}/jaxr_1_0_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jms_api.jar +ln -sf %{_sysconfdir}/alternatives/jms_api.jar %{buildroot}%{_javadir}/jms_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jms.jar +ln -sf %{_sysconfdir}/alternatives/jms.jar %{buildroot}%{_javadir}/jms.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jms_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/jms_1_1_api.jar %{buildroot}%{_javadir}/jms_1_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jpa_api.jar +ln -sf %{_sysconfdir}/alternatives/jpa_api.jar %{buildroot}%{_javadir}/jpa_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jpa_3_0_api.jar +ln -sf %{_sysconfdir}/alternatives/jpa_3_0_api.jar %{buildroot}%{_javadir}/jpa_3_0_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jsp_api.jar +ln -sf %{_sysconfdir}/alternatives/jsp_api.jar %{buildroot}%{_javadir}/jsp_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jsp.jar +ln -sf %{_sysconfdir}/alternatives/jsp.jar %{buildroot}%{_javadir}/jsp.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jsp_2_0_api.jar +ln -sf %{_sysconfdir}/alternatives/jsp_2_0_api.jar %{buildroot}%{_javadir}/jsp_2_0_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jsp_2_1_api.jar +ln -sf %{_sysconfdir}/alternatives/jsp_2_1_api.jar %{buildroot}%{_javadir}/jsp_2_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jta_api.jar +ln -sf %{_sysconfdir}/alternatives/jta_api.jar %{buildroot}%{_javadir}/jta_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jta.jar +ln -sf %{_sysconfdir}/alternatives/jta.jar %{buildroot}%{_javadir}/jta.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jta_1_0_1B_api.jar +ln -sf %{_sysconfdir}/alternatives/jta_1_0_1B_api.jar %{buildroot}%{_javadir}/jta_1_0_1B_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/jta_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/jta_1_1_api.jar %{buildroot}%{_javadir}/jta_1_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_connector_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_connector_api.jar %{buildroot}%{_javadir}/j2ee_connector_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/j2ee-connector.jar +ln -sf %{_sysconfdir}/alternatives/j2ee-connector.jar %{buildroot}%{_javadir}/j2ee-connector.jar +touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_connector_1_5_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_connector_1_5_api.jar %{buildroot}%{_javadir}/j2ee_connector_1_5_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_deployment_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_deployment_api.jar %{buildroot}%{_javadir}/j2ee_deployment_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/j2ee-deployment.jar +ln -sf %{_sysconfdir}/alternatives/j2ee-deployment.jar %{buildroot}%{_javadir}/j2ee-deployment.jar +touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_deployment_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_deployment_1_1_api.jar %{buildroot}%{_javadir}/j2ee_deployment_1_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_management_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_management_api.jar %{buildroot}%{_javadir}/j2ee_management_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/j2ee-management.jar +ln -sf %{_sysconfdir}/alternatives/j2ee-management.jar %{buildroot}%{_javadir}/j2ee-management.jar +touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_management_1_0_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_management_1_0_api.jar %{buildroot}%{_javadir}/j2ee_management_1_0_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_management_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_management_1_1_api.jar %{buildroot}%{_javadir}/j2ee_management_1_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/qname_api.jar +ln -sf %{_sysconfdir}/alternatives/qname_api.jar %{buildroot}%{_javadir}/qname_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/qname_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/qname_1_1_api.jar %{buildroot}%{_javadir}/qname_1_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/saaj_api.jar +ln -sf %{_sysconfdir}/alternatives/saaj_api.jar %{buildroot}%{_javadir}/saaj_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/saaj.jar +ln -sf %{_sysconfdir}/alternatives/saaj.jar %{buildroot}%{_javadir}/saaj.jar +touch %{buildroot}%{_sysconfdir}/alternatives/saaj_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/saaj_1_1_api.jar %{buildroot}%{_javadir}/saaj_1_1_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/servlet_api.jar +ln -sf %{_sysconfdir}/alternatives/servlet_api.jar %{buildroot}%{_javadir}/servlet_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/servlet.jar +ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar +touch %{buildroot}%{_sysconfdir}/alternatives/servlet_2_4_api.jar +ln -sf %{_sysconfdir}/alternatives/servlet_2_4_api.jar %{buildroot}%{_javadir}/servlet_2_4_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/servlet_2_5_api.jar +ln -sf %{_sysconfdir}/alternatives/servlet_2_5_api.jar %{buildroot}%{_javadir}/servlet_2_5_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/stax_api.jar +ln -sf %{_sysconfdir}/alternatives/stax_api.jar %{buildroot}%{_javadir}/stax_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/stax_1_0_api.jar +ln -sf %{_sysconfdir}/alternatives/stax_1_0_api.jar %{buildroot}%{_javadir}/stax_1_0_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/ws_metadata_api.jar +ln -sf %{_sysconfdir}/alternatives/ws_metadata_api.jar %{buildroot}%{_javadir}/ws_metadata_api.jar +touch %{buildroot}%{_sysconfdir}/alternatives/ws_metadata_2_0_api.jar +ln -sf %{_sysconfdir}/alternatives/ws_metadata_2_0_api.jar %{buildroot}%{_javadir}/ws_metadata_2_0_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 @@ -2374,8 +2418,10 @@ fi %files -n geronimo-commonj-1_1-apis %defattr(0644,root,root,0755) %{_javadir}/geronimo-commonj-1.1-apis*.jar -%ghost %{_javadir}/commonj_1_1_apis.jar -%ghost %{_javadir}/commonj_apis.jar +%{_javadir}/commonj_1_1_apis.jar +%ghost %{_sysconfdir}/alternatives/commonj_1_1_apis.jar +%{_javadir}/commonj_apis.jar +%ghost %{_sysconfdir}/alternatives/commonj_apis.jar %doc %{_docdir}/%{name}-%{version}/commonj-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/commonj-1.1 %dir %{_docdir}/%{name}-%{version} @@ -2386,9 +2432,12 @@ fi %doc %{_docdir}/%{name}-%{version}/jaf-1.0.2/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jaf-1.0.2 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jaf.jar -%ghost %{_javadir}/jaf_api.jar -%ghost %{_javadir}/jaf_1_0_2_api.jar +%{_javadir}/jaf.jar +%ghost %{_sysconfdir}/alternatives/jaf.jar +%{_javadir}/jaf_api.jar +%ghost %{_sysconfdir}/alternatives/jaf_api.jar +%{_javadir}/jaf_1_0_2_api.jar +%ghost %{_sysconfdir}/alternatives/jaf_1_0_2_api.jar %files -n geronimo-jaf-1_1-api %defattr(0644,root,root,0755) @@ -2396,25 +2445,32 @@ fi %doc %{_docdir}/%{name}-%{version}/jaf-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jaf-1.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jaf.jar -%ghost %{_javadir}/jaf_api.jar -%ghost %{_javadir}/jaf_1_1_api.jar +%{_javadir}/jaf.jar +%ghost %{_sysconfdir}/alternatives/jaf.jar +%{_javadir}/jaf_api.jar +%ghost %{_sysconfdir}/alternatives/jaf_api.jar +%{_javadir}/jaf_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/jaf_1_1_api.jar %files -n geronimo-annotation-1_0-api %defattr(0644,root,root,0755) %doc %{_docdir}/%{name}-%{version}/annotation-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/annotation-1.0 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/annotation_api.jar -%ghost %{_javadir}/annotation_1_0_api.jar +%{_javadir}/annotation_api.jar +%ghost %{_sysconfdir}/alternatives/annotation_api.jar +%{_javadir}/annotation_1_0_api.jar +%ghost %{_sysconfdir}/alternatives/annotation_1_0_api.jar %{_javadir}/geronimo-annotation-1.0-api*.jar %files -n geronimo-corba-1_0-apis %defattr(0644,root,root,0755) %{_javadir}/geronimo-corba-1.0-apis*.jar #%doc %{_docdir}/%{name}-%{version}/corba-1.0/LICENSE.txt -%ghost %{_javadir}/corba_apis.jar -%ghost %{_javadir}/corba_1_0_apis.jar +%{_javadir}/corba_apis.jar +%ghost %{_sysconfdir}/alternatives/corba_apis.jar +%{_javadir}/corba_1_0_apis.jar +%ghost %{_sysconfdir}/alternatives/corba_1_0_apis.jar %files -n geronimo-corba-2_3-apis %defattr(0644,root,root,0755) @@ -2422,8 +2478,10 @@ fi %doc %{_docdir}/%{name}-%{version}/corba-2.3/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/corba-2.3 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/corba_apis.jar -%ghost %{_javadir}/corba_2_3_apis.jar +%{_javadir}/corba_apis.jar +%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(0644,root,root,0755) #%{_javadir}/geronimo-corba-3.0-apis*.jar @@ -2440,9 +2498,12 @@ fi %doc %{_docdir}/%{name}-%{version}/ejb-2.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/ejb-2.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/ejb.jar -%ghost %{_javadir}/ejb_api.jar -%ghost %{_javadir}/ejb_2_1_api.jar +%{_javadir}/ejb.jar +%ghost %{_sysconfdir}/alternatives/ejb.jar +%{_javadir}/ejb_api.jar +%ghost %{_sysconfdir}/alternatives/ejb_api.jar +%{_javadir}/ejb_2_1_api.jar +%ghost %{_sysconfdir}/alternatives/ejb_2_1_api.jar %{_javadir}/geronimo-ejb-2.1-api*.jar %files -n geronimo-ejb-3_0-api @@ -2450,9 +2511,12 @@ fi %doc %{_docdir}/%{name}-%{version}/ejb-3.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/ejb-3.0 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/ejb.jar -%ghost %{_javadir}/ejb_api.jar -%ghost %{_javadir}/ejb_3_0_api.jar +%{_javadir}/ejb.jar +%ghost %{_sysconfdir}/alternatives/ejb.jar +%{_javadir}/ejb_api.jar +%ghost %{_sysconfdir}/alternatives/ejb_api.jar +%{_javadir}/ejb_3_0_api.jar +%ghost %{_sysconfdir}/alternatives/ejb_3_0_api.jar %{_javadir}/geronimo-ejb-3.0-api*.jar %files -n geronimo-el-1_0-api @@ -2461,16 +2525,20 @@ fi %doc %{_docdir}/%{name}-%{version}/el-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/el-1.0 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/el_api.jar -%ghost %{_javadir}/el_1_0_api.jar +%{_javadir}/el_api.jar +%ghost %{_sysconfdir}/alternatives/el_api.jar +%{_javadir}/el_1_0_api.jar +%ghost %{_sysconfdir}/alternatives/el_1_0_api.jar %files -n geronimo-interceptor-3_0-api %defattr(0644,root,root,0755) %doc %{_docdir}/%{name}-%{version}/interceptor-3.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/interceptor-3.0 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/interceptor_api.jar -%ghost %{_javadir}/interceptor_3_0_api.jar +%{_javadir}/interceptor_api.jar +%ghost %{_sysconfdir}/alternatives/interceptor_api.jar +%{_javadir}/interceptor_3_0_api.jar +%ghost %{_sysconfdir}/alternatives/interceptor_3_0_api.jar %{_javadir}/geronimo-interceptor-3.0-api*.jar %files -n geronimo-j2ee-1_4-apis @@ -2486,9 +2554,12 @@ fi %doc %{_docdir}/%{name}-%{version}/j2ee-connector-1.5/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/j2ee-connector-1.5 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/j2ee-connector.jar -%ghost %{_javadir}/j2ee_connector_api.jar -%ghost %{_javadir}/j2ee_connector_1_5_api.jar +%{_javadir}/j2ee-connector.jar +%ghost %{_sysconfdir}/alternatives/j2ee-connector.jar +%{_javadir}/j2ee_connector_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_connector_api.jar +%{_javadir}/j2ee_connector_1_5_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_connector_1_5_api.jar %files -n geronimo-j2ee-deployment-1_1-api %defattr(0644,root,root,0755) @@ -2496,9 +2567,12 @@ fi %doc %{_docdir}/%{name}-%{version}/j2ee-deployment-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/j2ee-deployment-1.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/j2ee-deployment.jar -%ghost %{_javadir}/j2ee_deployment_api.jar -%ghost %{_javadir}/j2ee_deployment_1_1_api.jar +%{_javadir}/j2ee-deployment.jar +%ghost %{_sysconfdir}/alternatives/j2ee-deployment.jar +%{_javadir}/j2ee_deployment_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_deployment_api.jar +%{_javadir}/j2ee_deployment_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_deployment_1_1_api.jar %files -n geronimo-javaee-deployment-1_1-api %defattr(0644,root,root,0755) @@ -2506,8 +2580,10 @@ fi %doc %{_docdir}/%{name}-%{version}/javaee-deployment-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/javaee-deployment-1.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/javaee_deployment_api.jar -%ghost %{_javadir}/javaee_deployment_1_1MR3_api.jar +%{_javadir}/javaee_deployment_api.jar +%ghost %{_sysconfdir}/alternatives/javaee_deployment_api.jar +%{_javadir}/javaee_deployment_1_1MR3_api.jar +%ghost %{_sysconfdir}/alternatives/javaee_deployment_1_1MR3_api.jar %files -n geronimo-jacc-1_0-api %defattr(0644,root,root,0755) @@ -2515,9 +2591,12 @@ fi %doc %{_docdir}/%{name}-%{version}/jacc-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jacc-1.0 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jacc.jar -%ghost %{_javadir}/jacc_api.jar -%ghost %{_javadir}/jacc_1_0_api.jar +%{_javadir}/jacc.jar +%ghost %{_sysconfdir}/alternatives/jacc.jar +%{_javadir}/jacc_api.jar +%ghost %{_sysconfdir}/alternatives/jacc_api.jar +%{_javadir}/jacc_1_0_api.jar +%ghost %{_sysconfdir}/alternatives/jacc_1_0_api.jar %files -n geronimo-jacc-1_1-api %defattr(0644,root,root,0755) @@ -2525,8 +2604,10 @@ fi %doc %{_docdir}/%{name}-%{version}/jacc-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jacc-1.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jacc_api.jar -%ghost %{_javadir}/jacc_1_1_api.jar +%{_javadir}/jacc_api.jar +%ghost %{_sysconfdir}/alternatives/jacc_api.jar +%{_javadir}/jacc_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/jacc_1_1_api.jar %files -n geronimo-j2ee-management-1_0-api %defattr(0644,root,root,0755) @@ -2534,9 +2615,12 @@ fi %doc %{_docdir}/%{name}-%{version}/j2ee-management-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/j2ee-management-1.0 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/j2ee-management.jar -%ghost %{_javadir}/j2ee_management_api.jar -%ghost %{_javadir}/j2ee_management_1_0_api.jar +%{_javadir}/j2ee-management.jar +%ghost %{_sysconfdir}/alternatives/j2ee-management.jar +%{_javadir}/j2ee_management_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_management_api.jar +%{_javadir}/j2ee_management_1_0_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_management_1_0_api.jar %files -n geronimo-j2ee-management-1_1-api %defattr(0644,root,root,0755) @@ -2544,9 +2628,12 @@ fi %doc %{_docdir}/%{name}-%{version}/j2ee-management-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/j2ee-management-1.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/j2ee-management.jar -%ghost %{_javadir}/j2ee_management_api.jar -%ghost %{_javadir}/j2ee_management_1_1_api.jar +%{_javadir}/j2ee-management.jar +%ghost %{_sysconfdir}/alternatives/j2ee-management.jar +%{_javadir}/j2ee_management_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_management_api.jar +%{_javadir}/j2ee_management_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_management_1_1_api.jar %files -n geronimo-javamail-1_3_1-api %defattr(0644,root,root,0755) @@ -2558,8 +2645,10 @@ fi # our 'javamail' alternative means the providers as well # all in a single jar file called 'javamail.jar' #%ghost %{_javadir}/javamail.jar -%ghost %{_javadir}/javamail_api.jar -%ghost %{_javadir}/javamail_1_3_1_api.jar +%{_javadir}/javamail_api.jar +%ghost %{_sysconfdir}/alternatives/javamail_api.jar +%{_javadir}/javamail_1_3_1_api.jar +%ghost %{_sysconfdir}/alternatives/javamail_1_3_1_api.jar %files -n geronimo-javamail-1_4-api %defattr(0644,root,root,0755) @@ -2571,8 +2660,10 @@ fi # our 'javamail' alternative means the providers as well # all in a single jar file called 'javamail.jar' #%ghost %{_javadir}/javamail.jar -%ghost %{_javadir}/javamail_api.jar -%ghost %{_javadir}/javamail_1_4_api.jar +%{_javadir}/javamail_api.jar +%ghost %{_sysconfdir}/alternatives/javamail_api.jar +%{_javadir}/javamail_1_4_api.jar +%ghost %{_sysconfdir}/alternatives/javamail_1_4_api.jar %files -n geronimo-jaxr-1_0-api %defattr(0644,root,root,0755) @@ -2580,9 +2671,12 @@ fi %doc %{_docdir}/%{name}-%{version}/jaxr-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jaxr-1.0 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jaxr.jar -%ghost %{_javadir}/jaxr_api.jar -%ghost %{_javadir}/jaxr_1_0_api.jar +%{_javadir}/jaxr.jar +%ghost %{_sysconfdir}/alternatives/jaxr.jar +%{_javadir}/jaxr_api.jar +%ghost %{_sysconfdir}/alternatives/jaxr_api.jar +%{_javadir}/jaxr_1_0_api.jar +%ghost %{_sysconfdir}/alternatives/jaxr_1_0_api.jar %files -n geronimo-jaxrpc-1_1-api %defattr(0644,root,root,0755) @@ -2590,9 +2684,12 @@ fi %doc %{_docdir}/%{name}-%{version}/jaxrpc-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jaxrpc-1.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jaxrpc.jar -%ghost %{_javadir}/jaxrpc_api.jar -%ghost %{_javadir}/jaxrpc_1_1_api.jar +%{_javadir}/jaxrpc.jar +%ghost %{_sysconfdir}/alternatives/jaxrpc.jar +%{_javadir}/jaxrpc_api.jar +%ghost %{_sysconfdir}/alternatives/jaxrpc_api.jar +%{_javadir}/jaxrpc_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/jaxrpc_1_1_api.jar %files -n geronimo-jms-1_1-api %defattr(0644,root,root,0755) @@ -2600,9 +2697,12 @@ fi %doc %{_docdir}/%{name}-%{version}/jms-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jms-1.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jms.jar -%ghost %{_javadir}/jms_api.jar -%ghost %{_javadir}/jms_1_1_api.jar +%{_javadir}/jms.jar +%ghost %{_sysconfdir}/alternatives/jms.jar +%{_javadir}/jms_api.jar +%ghost %{_sysconfdir}/alternatives/jms_api.jar +%{_javadir}/jms_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/jms_1_1_api.jar %files -n geronimo-jpa-3_0-api %defattr(0644,root,root,0755) @@ -2610,8 +2710,10 @@ fi %doc %{_docdir}/%{name}-%{version}/jpa-3.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jpa-3.0 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jpa_api.jar -%ghost %{_javadir}/jpa_3_0_api.jar +%{_javadir}/jpa_api.jar +%ghost %{_sysconfdir}/alternatives/jpa_api.jar +%{_javadir}/jpa_3_0_api.jar +%ghost %{_sysconfdir}/alternatives/jpa_3_0_api.jar %files -n geronimo-jsp-2_0-api %defattr(0644,root,root,0755) @@ -2619,9 +2721,12 @@ fi %doc %{_docdir}/%{name}-%{version}/jsp-2.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jsp-2.0 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jsp.jar -%ghost %{_javadir}/jsp_api.jar -%ghost %{_javadir}/jsp_2_0_api.jar +%{_javadir}/jsp.jar +%ghost %{_sysconfdir}/alternatives/jsp.jar +%{_javadir}/jsp_api.jar +%ghost %{_sysconfdir}/alternatives/jsp_api.jar +%{_javadir}/jsp_2_0_api.jar +%ghost %{_sysconfdir}/alternatives/jsp_2_0_api.jar %files -n geronimo-jsp-2_1-api %defattr(0644,root,root,0755) @@ -2629,9 +2734,12 @@ fi %doc %{_docdir}/%{name}-%{version}/jsp-2.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jsp-2.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jsp.jar -%ghost %{_javadir}/jsp_api.jar -%ghost %{_javadir}/jsp_2_1_api.jar +%{_javadir}/jsp.jar +%ghost %{_sysconfdir}/alternatives/jsp.jar +%{_javadir}/jsp_api.jar +%ghost %{_sysconfdir}/alternatives/jsp_api.jar +%{_javadir}/jsp_2_1_api.jar +%ghost %{_sysconfdir}/alternatives/jsp_2_1_api.jar %files -n geronimo-jta-1_0_1B-api %defattr(0644,root,root,0755) @@ -2639,9 +2747,12 @@ fi %doc %{_docdir}/%{name}-%{version}/jta-1.0.1B/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jta-1.0.1B %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jta.jar -%ghost %{_javadir}/jta_api.jar -%ghost %{_javadir}/jta_1_0_1B_api.jar +%{_javadir}/jta.jar +%ghost %{_sysconfdir}/alternatives/jta.jar +%{_javadir}/jta_api.jar +%ghost %{_sysconfdir}/alternatives/jta_api.jar +%{_javadir}/jta_1_0_1B_api.jar +%ghost %{_sysconfdir}/alternatives/jta_1_0_1B_api.jar %files -n geronimo-jta-1_1-api %defattr(0644,root,root,0755) @@ -2649,9 +2760,12 @@ fi %doc %{_docdir}/%{name}-%{version}/jta-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jta-1.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/jta.jar -%ghost %{_javadir}/jta_api.jar -%ghost %{_javadir}/jta_1_1_api.jar +%{_javadir}/jta.jar +%ghost %{_sysconfdir}/alternatives/jta.jar +%{_javadir}/jta_api.jar +%ghost %{_sysconfdir}/alternatives/jta_api.jar +%{_javadir}/jta_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/jta_1_1_api.jar %files -n geronimo-qname-1_1-api %defattr(0644,root,root,0755) @@ -2659,8 +2773,10 @@ fi %doc %{_docdir}/%{name}-%{version}/qname-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/qname-1.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/qname_api.jar -%ghost %{_javadir}/qname_1_1_api.jar +%{_javadir}/qname_api.jar +%ghost %{_sysconfdir}/alternatives/qname_api.jar +%{_javadir}/qname_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/qname_1_1_api.jar %files -n geronimo-saaj-1_1-api %defattr(0644,root,root,0755) @@ -2668,9 +2784,12 @@ fi %doc %{_docdir}/%{name}-%{version}/saaj-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/saaj-1.1 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/saaj.jar -%ghost %{_javadir}/saaj_api.jar -%ghost %{_javadir}/saaj_1_1_api.jar +%{_javadir}/saaj.jar +%ghost %{_sysconfdir}/alternatives/saaj.jar +%{_javadir}/saaj_api.jar +%ghost %{_sysconfdir}/alternatives/saaj_api.jar +%{_javadir}/saaj_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/saaj_1_1_api.jar %files -n geronimo-servlet-2_4-api %defattr(0644,root,root,0755) @@ -2678,9 +2797,12 @@ fi %doc %{_docdir}/%{name}-%{version}/servlet-2.4/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/servlet-2.4 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/servlet.jar -%ghost %{_javadir}/servlet_api.jar -%ghost %{_javadir}/servlet_2_4_api.jar +%{_javadir}/servlet.jar +%ghost %{_sysconfdir}/alternatives/servlet.jar +%{_javadir}/servlet_api.jar +%ghost %{_sysconfdir}/alternatives/servlet_api.jar +%{_javadir}/servlet_2_4_api.jar +%ghost %{_sysconfdir}/alternatives/servlet_2_4_api.jar %files -n geronimo-servlet-2_5-api %defattr(0644,root,root,0755) @@ -2688,9 +2810,12 @@ fi %doc %{_docdir}/%{name}-%{version}/servlet-2.5/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/servlet-2.5 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/servlet.jar -%ghost %{_javadir}/servlet_api.jar -%ghost %{_javadir}/servlet_2_5_api.jar +%{_javadir}/servlet.jar +%ghost %{_sysconfdir}/alternatives/servlet.jar +%{_javadir}/servlet_api.jar +%ghost %{_sysconfdir}/alternatives/servlet_api.jar +%{_javadir}/servlet_2_5_api.jar +%ghost %{_sysconfdir}/alternatives/servlet_2_5_api.jar %files -n geronimo-stax-1_0-api %defattr(0644,root,root,0755) @@ -2698,8 +2823,10 @@ fi %doc %{_docdir}/%{name}-%{version}/stax-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/stax-1.0 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/stax_api.jar -%ghost %{_javadir}/stax_1_0_api.jar +%{_javadir}/stax_api.jar +%ghost %{_sysconfdir}/alternatives/stax_api.jar +%{_javadir}/stax_1_0_api.jar +%ghost %{_sysconfdir}/alternatives/stax_1_0_api.jar %files -n geronimo-ws-metadata-2_0-api %defattr(0644,root,root,0755) @@ -2707,7 +2834,9 @@ fi %doc %{_docdir}/%{name}-%{version}/ws-metadata-2.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/ws-metadata-2.0 %dir %{_docdir}/%{name}-%{version} -%ghost %{_javadir}/ws_metadata_api.jar -%ghost %{_javadir}/ws_metadata_2_0_api.jar +%{_javadir}/ws_metadata_api.jar +%ghost %{_sysconfdir}/alternatives/ws_metadata_api.jar +%{_javadir}/ws_metadata_2_0_api.jar +%ghost %{_sysconfdir}/alternatives/ws_metadata_2_0_api.jar %changelog From f3a9043de83fe47bdc0945e1dfef3db83e5ac9aa6966393b2423b9c153e7eaa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 28 Jul 2014 06:56:44 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=13 --- geronimo-specs.spec | 70 --------------------------------------------- 1 file changed, 70 deletions(-) diff --git a/geronimo-specs.spec b/geronimo-specs.spec index b5d590f..c7e50ee 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -1731,145 +1731,75 @@ export NO_BRP_STALE_LINK_ERROR="yes" # update-alternatives symlinks mkdir -p %{buildroot}%{_sysconfdir}/alternatives/ -touch %{buildroot}%{_sysconfdir}/alternatives/annotation_api.jar ln -sf %{_sysconfdir}/alternatives/annotation_api.jar %{buildroot}%{_javadir}/annotation_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/annotation_1_0_api.jar ln -sf %{_sysconfdir}/alternatives/annotation_1_0_api.jar %{buildroot}%{_javadir}/annotation_1_0_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/commonj_apis.jar ln -sf %{_sysconfdir}/alternatives/commonj_apis.jar %{buildroot}%{_javadir}/commonj_apis.jar -touch %{buildroot}%{_sysconfdir}/alternatives/commonj_1_1_apis.jar ln -sf %{_sysconfdir}/alternatives/commonj_1_1_apis.jar %{buildroot}%{_javadir}/commonj_1_1_apis.jar -touch %{buildroot}%{_sysconfdir}/alternatives/corba_apis.jar ln -sf %{_sysconfdir}/alternatives/corba_apis.jar %{buildroot}%{_javadir}/corba_apis.jar -touch %{buildroot}%{_sysconfdir}/alternatives/corba_1_0_apis.jar ln -sf %{_sysconfdir}/alternatives/corba_1_0_apis.jar %{buildroot}%{_javadir}/corba_1_0_apis.jar -touch %{buildroot}%{_sysconfdir}/alternatives/corba_2_3_apis.jar ln -sf %{_sysconfdir}/alternatives/corba_2_3_apis.jar %{buildroot}%{_javadir}/corba_2_3_apis.jar -touch %{buildroot}%{_sysconfdir}/alternatives/ejb_api.jar ln -sf %{_sysconfdir}/alternatives/ejb_api.jar %{buildroot}%{_javadir}/ejb_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/ejb.jar ln -sf %{_sysconfdir}/alternatives/ejb.jar %{buildroot}%{_javadir}/ejb.jar -touch %{buildroot}%{_sysconfdir}/alternatives/ejb_2_1_api.jar ln -sf %{_sysconfdir}/alternatives/ejb_2_1_api.jar %{buildroot}%{_javadir}/ejb_2_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/ejb_3_0_api.jar ln -sf %{_sysconfdir}/alternatives/ejb_3_0_api.jar %{buildroot}%{_javadir}/ejb_3_0_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/el_api.jar ln -sf %{_sysconfdir}/alternatives/el_api.jar %{buildroot}%{_javadir}/el_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/el_1_0_api.jar ln -sf %{_sysconfdir}/alternatives/el_1_0_api.jar %{buildroot}%{_javadir}/el_1_0_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/interceptor_api.jar ln -sf %{_sysconfdir}/alternatives/interceptor_api.jar %{buildroot}%{_javadir}/interceptor_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/interceptor_3_0_api.jar ln -sf %{_sysconfdir}/alternatives/interceptor_3_0_api.jar %{buildroot}%{_javadir}/interceptor_3_0_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jacc_api.jar ln -sf %{_sysconfdir}/alternatives/jacc_api.jar %{buildroot}%{_javadir}/jacc_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jacc.jar ln -sf %{_sysconfdir}/alternatives/jacc.jar %{buildroot}%{_javadir}/jacc.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jacc_1_0_api.jar ln -sf %{_sysconfdir}/alternatives/jacc_1_0_api.jar %{buildroot}%{_javadir}/jacc_1_0_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jacc_1_1_api.jar ln -sf %{_sysconfdir}/alternatives/jacc_1_1_api.jar %{buildroot}%{_javadir}/jacc_1_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaf_api.jar ln -sf %{_sysconfdir}/alternatives/jaf_api.jar %{buildroot}%{_javadir}/jaf_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaf.jar ln -sf %{_sysconfdir}/alternatives/jaf.jar %{buildroot}%{_javadir}/jaf.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaf_1_0_2_api.jar ln -sf %{_sysconfdir}/alternatives/jaf_1_0_2_api.jar %{buildroot}%{_javadir}/jaf_1_0_2_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaf_1_1_api.jar ln -sf %{_sysconfdir}/alternatives/jaf_1_1_api.jar %{buildroot}%{_javadir}/jaf_1_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/javaee_deployment_api.jar ln -sf %{_sysconfdir}/alternatives/javaee_deployment_api.jar %{buildroot}%{_javadir}/javaee_deployment_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/javaee_deployment_1_1MR3_api.jar ln -sf %{_sysconfdir}/alternatives/javaee_deployment_1_1MR3_api.jar %{buildroot}%{_javadir}/javaee_deployment_1_1MR3_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/javamail_api.jar ln -sf %{_sysconfdir}/alternatives/javamail_api.jar %{buildroot}%{_javadir}/javamail_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/javamail_1_3_1_api.jar ln -sf %{_sysconfdir}/alternatives/javamail_1_3_1_api.jar %{buildroot}%{_javadir}/javamail_1_3_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/javamail_1_4_api.jar ln -sf %{_sysconfdir}/alternatives/javamail_1_4_api.jar %{buildroot}%{_javadir}/javamail_1_4_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaxr_api.jar ln -sf %{_sysconfdir}/alternatives/jaxr_api.jar %{buildroot}%{_javadir}/jaxr_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaxr.jar ln -sf %{_sysconfdir}/alternatives/jaxr.jar %{buildroot}%{_javadir}/jaxr.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaxrpc_api.jar ln -sf %{_sysconfdir}/alternatives/jaxrpc_api.jar %{buildroot}%{_javadir}/jaxrpc_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaxrpc.jar ln -sf %{_sysconfdir}/alternatives/jaxrpc.jar %{buildroot}%{_javadir}/jaxrpc.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaxrpc_1_1_api.jar ln -sf %{_sysconfdir}/alternatives/jaxrpc_1_1_api.jar %{buildroot}%{_javadir}/jaxrpc_1_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jaxr_1_0_api.jar ln -sf %{_sysconfdir}/alternatives/jaxr_1_0_api.jar %{buildroot}%{_javadir}/jaxr_1_0_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jms_api.jar ln -sf %{_sysconfdir}/alternatives/jms_api.jar %{buildroot}%{_javadir}/jms_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jms.jar ln -sf %{_sysconfdir}/alternatives/jms.jar %{buildroot}%{_javadir}/jms.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jms_1_1_api.jar ln -sf %{_sysconfdir}/alternatives/jms_1_1_api.jar %{buildroot}%{_javadir}/jms_1_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jpa_api.jar ln -sf %{_sysconfdir}/alternatives/jpa_api.jar %{buildroot}%{_javadir}/jpa_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jpa_3_0_api.jar ln -sf %{_sysconfdir}/alternatives/jpa_3_0_api.jar %{buildroot}%{_javadir}/jpa_3_0_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jsp_api.jar ln -sf %{_sysconfdir}/alternatives/jsp_api.jar %{buildroot}%{_javadir}/jsp_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jsp.jar ln -sf %{_sysconfdir}/alternatives/jsp.jar %{buildroot}%{_javadir}/jsp.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jsp_2_0_api.jar ln -sf %{_sysconfdir}/alternatives/jsp_2_0_api.jar %{buildroot}%{_javadir}/jsp_2_0_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jsp_2_1_api.jar ln -sf %{_sysconfdir}/alternatives/jsp_2_1_api.jar %{buildroot}%{_javadir}/jsp_2_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jta_api.jar ln -sf %{_sysconfdir}/alternatives/jta_api.jar %{buildroot}%{_javadir}/jta_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jta.jar ln -sf %{_sysconfdir}/alternatives/jta.jar %{buildroot}%{_javadir}/jta.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jta_1_0_1B_api.jar ln -sf %{_sysconfdir}/alternatives/jta_1_0_1B_api.jar %{buildroot}%{_javadir}/jta_1_0_1B_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/jta_1_1_api.jar ln -sf %{_sysconfdir}/alternatives/jta_1_1_api.jar %{buildroot}%{_javadir}/jta_1_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_connector_api.jar ln -sf %{_sysconfdir}/alternatives/j2ee_connector_api.jar %{buildroot}%{_javadir}/j2ee_connector_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/j2ee-connector.jar ln -sf %{_sysconfdir}/alternatives/j2ee-connector.jar %{buildroot}%{_javadir}/j2ee-connector.jar -touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_connector_1_5_api.jar ln -sf %{_sysconfdir}/alternatives/j2ee_connector_1_5_api.jar %{buildroot}%{_javadir}/j2ee_connector_1_5_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_deployment_api.jar ln -sf %{_sysconfdir}/alternatives/j2ee_deployment_api.jar %{buildroot}%{_javadir}/j2ee_deployment_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/j2ee-deployment.jar ln -sf %{_sysconfdir}/alternatives/j2ee-deployment.jar %{buildroot}%{_javadir}/j2ee-deployment.jar -touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_deployment_1_1_api.jar ln -sf %{_sysconfdir}/alternatives/j2ee_deployment_1_1_api.jar %{buildroot}%{_javadir}/j2ee_deployment_1_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_management_api.jar ln -sf %{_sysconfdir}/alternatives/j2ee_management_api.jar %{buildroot}%{_javadir}/j2ee_management_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/j2ee-management.jar ln -sf %{_sysconfdir}/alternatives/j2ee-management.jar %{buildroot}%{_javadir}/j2ee-management.jar -touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_management_1_0_api.jar ln -sf %{_sysconfdir}/alternatives/j2ee_management_1_0_api.jar %{buildroot}%{_javadir}/j2ee_management_1_0_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/j2ee_management_1_1_api.jar ln -sf %{_sysconfdir}/alternatives/j2ee_management_1_1_api.jar %{buildroot}%{_javadir}/j2ee_management_1_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/qname_api.jar ln -sf %{_sysconfdir}/alternatives/qname_api.jar %{buildroot}%{_javadir}/qname_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/qname_1_1_api.jar ln -sf %{_sysconfdir}/alternatives/qname_1_1_api.jar %{buildroot}%{_javadir}/qname_1_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/saaj_api.jar ln -sf %{_sysconfdir}/alternatives/saaj_api.jar %{buildroot}%{_javadir}/saaj_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/saaj.jar ln -sf %{_sysconfdir}/alternatives/saaj.jar %{buildroot}%{_javadir}/saaj.jar -touch %{buildroot}%{_sysconfdir}/alternatives/saaj_1_1_api.jar ln -sf %{_sysconfdir}/alternatives/saaj_1_1_api.jar %{buildroot}%{_javadir}/saaj_1_1_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/servlet_api.jar ln -sf %{_sysconfdir}/alternatives/servlet_api.jar %{buildroot}%{_javadir}/servlet_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/servlet.jar ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.jar -touch %{buildroot}%{_sysconfdir}/alternatives/servlet_2_4_api.jar ln -sf %{_sysconfdir}/alternatives/servlet_2_4_api.jar %{buildroot}%{_javadir}/servlet_2_4_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/servlet_2_5_api.jar ln -sf %{_sysconfdir}/alternatives/servlet_2_5_api.jar %{buildroot}%{_javadir}/servlet_2_5_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/stax_api.jar ln -sf %{_sysconfdir}/alternatives/stax_api.jar %{buildroot}%{_javadir}/stax_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/stax_1_0_api.jar ln -sf %{_sysconfdir}/alternatives/stax_1_0_api.jar %{buildroot}%{_javadir}/stax_1_0_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/ws_metadata_api.jar ln -sf %{_sysconfdir}/alternatives/ws_metadata_api.jar %{buildroot}%{_javadir}/ws_metadata_api.jar -touch %{buildroot}%{_sysconfdir}/alternatives/ws_metadata_2_0_api.jar ln -sf %{_sysconfdir}/alternatives/ws_metadata_2_0_api.jar %{buildroot}%{_javadir}/ws_metadata_2_0_api.jar %post -n geronimo-commonj-1_1-apis From c0390dfd8a536d68eb7c670317d6e191f580d6b14394d4076618a04d67e6a38a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 29 Jul 2014 11:26:40 +0000 Subject: [PATCH 3/5] - Do not mess with defattr as it is pointless. OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=14 --- geronimo-specs.changes | 5 +++ geronimo-specs.spec | 76 +++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index c078f0c..0931cdb 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 29 11:26:17 UTC 2014 - tchvatal@suse.com + +- Do not mess with defattr as it is pointless. + ------------------------------------------------------------------- Fri Jul 25 12:18:42 UTC 2014 - tchvatal@suse.com diff --git a/geronimo-specs.spec b/geronimo-specs.spec index c7e50ee..089999a 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -2331,22 +2331,22 @@ if [ "$1" = "0" ]; then fi %files -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc %{_docdir}/%{name}-%{version}/LICENSE.txt %dir %{_javadir}/geronimo %{_javadir}/geronimo/* %files javadoc -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc %{_javadocdir}/* %files poms -%defattr(0644,root,root,0755) +%defattr(-,root,root) %config %{_mavendepmapfragdir}/* %{_mavenpomdir}/* %files -n geronimo-commonj-1_1-apis -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-commonj-1.1-apis*.jar %{_javadir}/commonj_1_1_apis.jar %ghost %{_sysconfdir}/alternatives/commonj_1_1_apis.jar @@ -2357,7 +2357,7 @@ fi %dir %{_docdir}/%{name}-%{version} %files -n geronimo-jaf-1_0_2-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jaf-1.0.2-api*.jar %doc %{_docdir}/%{name}-%{version}/jaf-1.0.2/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jaf-1.0.2 @@ -2370,7 +2370,7 @@ fi %ghost %{_sysconfdir}/alternatives/jaf_1_0_2_api.jar %files -n geronimo-jaf-1_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jaf-1.1-api*.jar %doc %{_docdir}/%{name}-%{version}/jaf-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jaf-1.1 @@ -2383,7 +2383,7 @@ fi %ghost %{_sysconfdir}/alternatives/jaf_1_1_api.jar %files -n geronimo-annotation-1_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc %{_docdir}/%{name}-%{version}/annotation-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/annotation-1.0 %dir %{_docdir}/%{name}-%{version} @@ -2394,7 +2394,7 @@ fi %{_javadir}/geronimo-annotation-1.0-api*.jar %files -n geronimo-corba-1_0-apis -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-corba-1.0-apis*.jar #%doc %{_docdir}/%{name}-%{version}/corba-1.0/LICENSE.txt %{_javadir}/corba_apis.jar @@ -2403,7 +2403,7 @@ fi %ghost %{_sysconfdir}/alternatives/corba_1_0_apis.jar %files -n geronimo-corba-2_3-apis -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-corba-2.3-apis*.jar %doc %{_docdir}/%{name}-%{version}/corba-2.3/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/corba-2.3 @@ -2413,7 +2413,7 @@ fi %{_javadir}/corba_2_3_apis.jar %ghost %{_sysconfdir}/alternatives/corba_2_3_apis.jar #% files -n geronimo-corba-3.0-apis -#%defattr(0644,root,root,0755) +#%defattr(-,root,root) #%{_javadir}/geronimo-corba-3.0-apis*.jar #%doc %{_docdir}/%{name}-%{version}/corba-3.0/LICENSE.txt #%ghost %{_javadir}/corba_apis.jar @@ -2424,7 +2424,7 @@ fi #%endif %files -n geronimo-ejb-2_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc %{_docdir}/%{name}-%{version}/ejb-2.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/ejb-2.1 %dir %{_docdir}/%{name}-%{version} @@ -2437,7 +2437,7 @@ fi %{_javadir}/geronimo-ejb-2.1-api*.jar %files -n geronimo-ejb-3_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc %{_docdir}/%{name}-%{version}/ejb-3.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/ejb-3.0 %dir %{_docdir}/%{name}-%{version} @@ -2450,7 +2450,7 @@ fi %{_javadir}/geronimo-ejb-3.0-api*.jar %files -n geronimo-el-1_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-el-1.0-api*.jar %doc %{_docdir}/%{name}-%{version}/el-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/el-1.0 @@ -2461,7 +2461,7 @@ fi %ghost %{_sysconfdir}/alternatives/el_1_0_api.jar %files -n geronimo-interceptor-3_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc %{_docdir}/%{name}-%{version}/interceptor-3.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/interceptor-3.0 %dir %{_docdir}/%{name}-%{version} @@ -2472,14 +2472,14 @@ fi %{_javadir}/geronimo-interceptor-3.0-api*.jar %files -n geronimo-j2ee-1_4-apis -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-j2ee-1.4-apis*.jar %doc %{_docdir}/%{name}-%{version}/j2ee-1.4/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/j2ee-1.4 %dir %{_docdir}/%{name}-%{version} %files -n geronimo-j2ee-connector-1_5-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-j2ee-connector-1.5-api*.jar %doc %{_docdir}/%{name}-%{version}/j2ee-connector-1.5/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/j2ee-connector-1.5 @@ -2492,7 +2492,7 @@ fi %ghost %{_sysconfdir}/alternatives/j2ee_connector_1_5_api.jar %files -n geronimo-j2ee-deployment-1_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-j2ee-deployment-1.1-api*.jar %doc %{_docdir}/%{name}-%{version}/j2ee-deployment-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/j2ee-deployment-1.1 @@ -2505,7 +2505,7 @@ fi %ghost %{_sysconfdir}/alternatives/j2ee_deployment_1_1_api.jar %files -n geronimo-javaee-deployment-1_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-javaee-deployment-1.1-api*.jar %doc %{_docdir}/%{name}-%{version}/javaee-deployment-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/javaee-deployment-1.1 @@ -2516,7 +2516,7 @@ fi %ghost %{_sysconfdir}/alternatives/javaee_deployment_1_1MR3_api.jar %files -n geronimo-jacc-1_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jacc-1.0-api*.jar %doc %{_docdir}/%{name}-%{version}/jacc-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jacc-1.0 @@ -2529,7 +2529,7 @@ fi %ghost %{_sysconfdir}/alternatives/jacc_1_0_api.jar %files -n geronimo-jacc-1_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jacc-1.1-api*.jar %doc %{_docdir}/%{name}-%{version}/jacc-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jacc-1.1 @@ -2540,7 +2540,7 @@ fi %ghost %{_sysconfdir}/alternatives/jacc_1_1_api.jar %files -n geronimo-j2ee-management-1_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-j2ee-management-1.0-api*.jar %doc %{_docdir}/%{name}-%{version}/j2ee-management-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/j2ee-management-1.0 @@ -2553,7 +2553,7 @@ fi %ghost %{_sysconfdir}/alternatives/j2ee_management_1_0_api.jar %files -n geronimo-j2ee-management-1_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-j2ee-management-1.1-api*.jar %doc %{_docdir}/%{name}-%{version}/j2ee-management-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/j2ee-management-1.1 @@ -2566,7 +2566,7 @@ fi %ghost %{_sysconfdir}/alternatives/j2ee_management_1_1_api.jar %files -n geronimo-javamail-1_3_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-javamail-1.3.1-api*.jar %doc %{_docdir}/%{name}-%{version}/javamail-1.3.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/javamail-1.3.1 @@ -2581,7 +2581,7 @@ fi %ghost %{_sysconfdir}/alternatives/javamail_1_3_1_api.jar %files -n geronimo-javamail-1_4-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-javamail-1.4-api*.jar %doc %{_docdir}/%{name}-%{version}/javamail-1.4/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/javamail-1.4 @@ -2596,7 +2596,7 @@ fi %ghost %{_sysconfdir}/alternatives/javamail_1_4_api.jar %files -n geronimo-jaxr-1_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jaxr-1.0-api*.jar %doc %{_docdir}/%{name}-%{version}/jaxr-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jaxr-1.0 @@ -2609,7 +2609,7 @@ fi %ghost %{_sysconfdir}/alternatives/jaxr_1_0_api.jar %files -n geronimo-jaxrpc-1_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jaxrpc-1.1-api*.jar %doc %{_docdir}/%{name}-%{version}/jaxrpc-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jaxrpc-1.1 @@ -2622,7 +2622,7 @@ fi %ghost %{_sysconfdir}/alternatives/jaxrpc_1_1_api.jar %files -n geronimo-jms-1_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jms-1.1-api*.jar %doc %{_docdir}/%{name}-%{version}/jms-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jms-1.1 @@ -2635,7 +2635,7 @@ fi %ghost %{_sysconfdir}/alternatives/jms_1_1_api.jar %files -n geronimo-jpa-3_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jpa-3.0-api*.jar %doc %{_docdir}/%{name}-%{version}/jpa-3.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jpa-3.0 @@ -2646,7 +2646,7 @@ fi %ghost %{_sysconfdir}/alternatives/jpa_3_0_api.jar %files -n geronimo-jsp-2_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jsp-2.0-api*.jar %doc %{_docdir}/%{name}-%{version}/jsp-2.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jsp-2.0 @@ -2659,7 +2659,7 @@ fi %ghost %{_sysconfdir}/alternatives/jsp_2_0_api.jar %files -n geronimo-jsp-2_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jsp-2.1-api*.jar %doc %{_docdir}/%{name}-%{version}/jsp-2.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jsp-2.1 @@ -2672,7 +2672,7 @@ fi %ghost %{_sysconfdir}/alternatives/jsp_2_1_api.jar %files -n geronimo-jta-1_0_1B-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jta-1.0.1B-api*.jar %doc %{_docdir}/%{name}-%{version}/jta-1.0.1B/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jta-1.0.1B @@ -2685,7 +2685,7 @@ fi %ghost %{_sysconfdir}/alternatives/jta_1_0_1B_api.jar %files -n geronimo-jta-1_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-jta-1.1-api*.jar %doc %{_docdir}/%{name}-%{version}/jta-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/jta-1.1 @@ -2698,7 +2698,7 @@ fi %ghost %{_sysconfdir}/alternatives/jta_1_1_api.jar %files -n geronimo-qname-1_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-qname-1.1-api*.jar %doc %{_docdir}/%{name}-%{version}/qname-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/qname-1.1 @@ -2709,7 +2709,7 @@ fi %ghost %{_sysconfdir}/alternatives/qname_1_1_api.jar %files -n geronimo-saaj-1_1-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-saaj-1.1-api*.jar %doc %{_docdir}/%{name}-%{version}/saaj-1.1/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/saaj-1.1 @@ -2722,7 +2722,7 @@ fi %ghost %{_sysconfdir}/alternatives/saaj_1_1_api.jar %files -n geronimo-servlet-2_4-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-servlet-2.4-api*.jar %doc %{_docdir}/%{name}-%{version}/servlet-2.4/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/servlet-2.4 @@ -2735,7 +2735,7 @@ fi %ghost %{_sysconfdir}/alternatives/servlet_2_4_api.jar %files -n geronimo-servlet-2_5-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-servlet-2.5-api*.jar %doc %{_docdir}/%{name}-%{version}/servlet-2.5/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/servlet-2.5 @@ -2748,7 +2748,7 @@ fi %ghost %{_sysconfdir}/alternatives/servlet_2_5_api.jar %files -n geronimo-stax-1_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-stax-1.0-api*.jar %doc %{_docdir}/%{name}-%{version}/stax-1.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/stax-1.0 @@ -2759,7 +2759,7 @@ fi %ghost %{_sysconfdir}/alternatives/stax_1_0_api.jar %files -n geronimo-ws-metadata-2_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/geronimo-ws-metadata-2.0-api*.jar %doc %{_docdir}/%{name}-%{version}/ws-metadata-2.0/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/ws-metadata-2.0 From 6c2d29379628dbc560f969a925e0622f0791cdcca42746350169a92d8dfa171a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 1 Aug 2014 08:47:27 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=15 --- geronimo-specs.spec | 110 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/geronimo-specs.spec b/geronimo-specs.spec index 089999a..b2165bc 100644 --- a/geronimo-specs.spec +++ b/geronimo-specs.spec @@ -1801,6 +1801,42 @@ ln -sf %{_sysconfdir}/alternatives/stax_api.jar %{buildroot}%{_javadir}/stax_api ln -sf %{_sysconfdir}/alternatives/stax_1_0_api.jar %{buildroot}%{_javadir}/stax_1_0_api.jar ln -sf %{_sysconfdir}/alternatives/ws_metadata_api.jar %{buildroot}%{_javadir}/ws_metadata_api.jar ln -sf %{_sysconfdir}/alternatives/ws_metadata_2_0_api.jar %{buildroot}%{_javadir}/ws_metadata_2_0_api.jar +ln -sf %{_sysconfdir}/alternatives/commonj_apis.jar %{buildroot}%{_javadir}/commonj_apis.jar +ln -sf %{_sysconfdir}/alternatives/commonj_1_1_apis.jar %{buildroot}%{_javadir}/commonj_1_1_apis.jar +ln -sf %{_sysconfdir}/alternatives/corba_apis.jar %{buildroot}%{_javadir}/corba_apis.jar +ln -sf %{_sysconfdir}/alternatives/corba_2_3_apis.jar %{buildroot}%{_javadir}/corba_2_3_apis.jar +ln -sf %{_sysconfdir}/alternatives/ejb_api.jar %{buildroot}%{_javadir}/ejb_api.jar +ln -sf %{_sysconfdir}/alternatives/ejb_2_1_api.jar %{buildroot}%{_javadir}/ejb_2_1_api.jar +ln -sf %{_sysconfdir}/alternatives/jacc_api.jar %{buildroot}%{_javadir}/jacc_api.jar +ln -sf %{_sysconfdir}/alternatives/jacc_1_0_api.jar %{buildroot}%{_javadir}/jacc_1_0_api.jar +ln -sf %{_sysconfdir}/alternatives/jaf_api.jar %{buildroot}%{_javadir}/jaf_api.jar +ln -sf %{_sysconfdir}/alternatives/jaf_1_0_2_api.jar %{buildroot}%{_javadir}/jaf_1_0_2_api.jar +ln -sf %{_sysconfdir}/alternatives/javamail_api.jar %{buildroot}%{_javadir}/javamail_api.jar +ln -sf %{_sysconfdir}/alternatives/javamail.jar %{buildroot}%{_javadir}/javamail.jar +ln -sf %{_sysconfdir}/alternatives/javamail_1_3_1_api.jar %{buildroot}%{_javadir}/javamail_1_3_1_api.jar +ln -sf %{_sysconfdir}/alternatives/jaxr_api.jar %{buildroot}%{_javadir}/jaxr_api.jar +ln -sf %{_sysconfdir}/alternatives/jaxrpc_api.jar %{buildroot}%{_javadir}/jaxrpc_api.jar +ln -sf %{_sysconfdir}/alternatives/jaxrpc_1_1_api.jar %{buildroot}%{_javadir}/jaxrpc_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/jaxr_1_0_api.jar %{buildroot}%{_javadir}/jaxr_1_0_api.jar +ln -sf %{_sysconfdir}/alternatives/jms_api.jar %{buildroot}%{_javadir}/jms_api.jar +ln -sf %{_sysconfdir}/alternatives/jms_1_1_api.jar %{buildroot}%{_javadir}/jms_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/jsp_api.jar %{buildroot}%{_javadir}/jsp_api.jar +ln -sf %{_sysconfdir}/alternatives/jsp_2_0_api.jar %{buildroot}%{_javadir}/jsp_2_0_api.jar +ln -sf %{_sysconfdir}/alternatives/jta_api.jar %{buildroot}%{_javadir}/jta_api.jar +ln -sf %{_sysconfdir}/alternatives/jta_1_0_1B_api.jar %{buildroot}%{_javadir}/jta_1_0_1B_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_connector_api.jar %{buildroot}%{_javadir}/j2ee_connector_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee-connector.jar %{buildroot}%{_javadir}/j2ee-connector.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_connector_1_5_api.jar %{buildroot}%{_javadir}/j2ee_connector_1_5_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_deployment_api.jar %{buildroot}%{_javadir}/j2ee_deployment_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_deployment_1_1_api.jar %{buildroot}%{_javadir}/j2ee_deployment_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_management_api.jar %{buildroot}%{_javadir}/j2ee_management_api.jar +ln -sf %{_sysconfdir}/alternatives/j2ee_management_1_0_api.jar %{buildroot}%{_javadir}/j2ee_management_1_0_api.jar +ln -sf %{_sysconfdir}/alternatives/qname_api.jar %{buildroot}%{_javadir}/qname_api.jar +ln -sf %{_sysconfdir}/alternatives/qname_1_1_api.jar %{buildroot}%{_javadir}/qname_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/saaj_api.jar %{buildroot}%{_javadir}/saaj_api.jar +ln -sf %{_sysconfdir}/alternatives/saaj_1_1_api.jar %{buildroot}%{_javadir}/saaj_1_1_api.jar +ln -sf %{_sysconfdir}/alternatives/servlet_api.jar %{buildroot}%{_javadir}/servlet_api.jar +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 @@ -2477,6 +2513,76 @@ fi %doc %{_docdir}/%{name}-%{version}/j2ee-1.4/LICENSE.txt %dir %{_docdir}/%{name}-%{version}/j2ee-1.4 %dir %{_docdir}/%{name}-%{version} +%ghost %{_sysconfdir}/alternatives/commonj_apis.jar +%{_javadir}/commonj_apis.jar +%ghost %{_sysconfdir}/alternatives/commonj_1_1_apis.jar +%{_javadir}/commonj_1_1_apis.jar +%ghost %{_sysconfdir}/alternatives/corba_apis.jar +%{_javadir}/corba_apis.jar +%ghost %{_sysconfdir}/alternatives/corba_2_3_apis.jar +%{_javadir}/corba_2_3_apis.jar +%ghost %{_sysconfdir}/alternatives/ejb_api.jar +%{_javadir}/ejb_api.jar +%ghost %{_sysconfdir}/alternatives/ejb_2_1_api.jar +%{_javadir}/ejb_2_1_api.jar +%ghost %{_sysconfdir}/alternatives/jacc_api.jar +%{_javadir}/jacc_api.jar +%ghost %{_sysconfdir}/alternatives/jacc_1_0_api.jar +%{_javadir}/jacc_1_0_api.jar +%ghost %{_sysconfdir}/alternatives/jaf_api.jar +%{_javadir}/jaf_api.jar +%ghost %{_sysconfdir}/alternatives/jaf_1_0_2_api.jar +%{_javadir}/jaf_1_0_2_api.jar +%ghost %{_sysconfdir}/alternatives/javamail_api.jar +%{_javadir}/javamail_api.jar +%ghost %{_sysconfdir}/alternatives/javamail_1_3_1_api.jar +%{_javadir}/javamail_1_3_1_api.jar +%ghost %{_sysconfdir}/alternatives/jaxr_api.jar +%{_javadir}/jaxr_api.jar +%ghost %{_sysconfdir}/alternatives/jaxrpc_api.jar +%{_javadir}/jaxrpc_api.jar +%ghost %{_sysconfdir}/alternatives/jaxrpc_1_1_api.jar +%{_javadir}/jaxrpc_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/jaxr_1_0_api.jar +%{_javadir}/jaxr_1_0_api.jar +%ghost %{_sysconfdir}/alternatives/jms_api.jar +%{_javadir}/jms_api.jar +%ghost %{_sysconfdir}/alternatives/jms_1_1_api.jar +%{_javadir}/jms_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/jsp_api.jar +%{_javadir}/jsp_api.jar +%ghost %{_sysconfdir}/alternatives/jsp_2_0_api.jar +%{_javadir}/jsp_2_0_api.jar +%ghost %{_sysconfdir}/alternatives/jta_api.jar +%{_javadir}/jta_api.jar +%ghost %{_sysconfdir}/alternatives/jta_1_0_1B_api.jar +%{_javadir}/jta_1_0_1B_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_connector_api.jar +%{_javadir}/j2ee_connector_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee-connector.jar +%{_javadir}/j2ee-connector.jar +%ghost %{_sysconfdir}/alternatives/j2ee_connector_1_5_api.jar +%{_javadir}/j2ee_connector_1_5_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_deployment_api.jar +%{_javadir}/j2ee_deployment_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_deployment_1_1_api.jar +%{_javadir}/j2ee_deployment_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_management_api.jar +%{_javadir}/j2ee_management_api.jar +%ghost %{_sysconfdir}/alternatives/j2ee_management_1_0_api.jar +%{_javadir}/j2ee_management_1_0_api.jar +%ghost %{_sysconfdir}/alternatives/qname_api.jar +%{_javadir}/qname_api.jar +%ghost %{_sysconfdir}/alternatives/qname_1_1_api.jar +%{_javadir}/qname_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/saaj_api.jar +%{_javadir}/saaj_api.jar +%ghost %{_sysconfdir}/alternatives/saaj_1_1_api.jar +%{_javadir}/saaj_1_1_api.jar +%ghost %{_sysconfdir}/alternatives/servlet_api.jar +%{_javadir}/servlet_api.jar +%ghost %{_sysconfdir}/alternatives/servlet_2_4_api.jar +%{_javadir}/servlet_2_4_api.jar %files -n geronimo-j2ee-connector-1_5-api %defattr(-,root,root) @@ -2579,6 +2685,8 @@ fi %ghost %{_sysconfdir}/alternatives/javamail_api.jar %{_javadir}/javamail_1_3_1_api.jar %ghost %{_sysconfdir}/alternatives/javamail_1_3_1_api.jar +%{_javadir}/javamail.jar +%ghost %{_sysconfdir}/alternatives/javamail.jar %files -n geronimo-javamail-1_4-api %defattr(-,root,root) @@ -2594,6 +2702,8 @@ fi %ghost %{_sysconfdir}/alternatives/javamail_api.jar %{_javadir}/javamail_1_4_api.jar %ghost %{_sysconfdir}/alternatives/javamail_1_4_api.jar +%{_javadir}/javamail.jar +%ghost %{_sysconfdir}/alternatives/javamail.jar %files -n geronimo-jaxr-1_0-api %defattr(-,root,root) From 659ba2762f2f72a3588c441d4d615de30f33b4f72858de05f33e75dbf5cc5b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 1 Aug 2014 10:53:27 +0000 Subject: [PATCH 5/5] - Try to use the update-alternatives properly. OBS-URL: https://build.opensuse.org/package/show/Java:packages/geronimo-specs?expand=0&rev=16 --- geronimo-specs.changes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/geronimo-specs.changes b/geronimo-specs.changes index 0931cdb..eee624b 100644 --- a/geronimo-specs.changes +++ b/geronimo-specs.changes @@ -6,8 +6,7 @@ Tue Jul 29 11:26:17 UTC 2014 - tchvatal@suse.com ------------------------------------------------------------------- Fri Jul 25 12:18:42 UTC 2014 - tchvatal@suse.com -- Try to use the update-alternatives properly. Still some missing. - But left for someone in the future. +- Try to use the update-alternatives properly. ------------------------------------------------------------------- Mon Sep 9 11:05:41 UTC 2013 - tchvatal@suse.com