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] - 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