diff --git a/tomcat.changes b/tomcat.changes index c87ea57..2023252 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 29 11:25:14 UTC 2014 - tchvatal@suse.com + +- Do not define default defattr as it is pointless. + ------------------------------------------------------------------- Fri Jul 25 09:24:12 UTC 2014 - tchvatal@suse.com diff --git a/tomcat.spec b/tomcat.spec index 51c46d0..205b959 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -181,6 +181,7 @@ Provides: jsp22 Apache Tomcat JSP API implementation classes version 2.2 %if %{with_systemd} + %package jsvc Summary: Apache jsvc wrapper for Apache Tomcat as separate service Group: Productivity/Networking/Web/Servers @@ -576,6 +577,7 @@ ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.j %endif %if %{with_systemd} + %pre jsvc %service_add_pre %{name}-jsvc.service @@ -628,7 +630,7 @@ rm -f \ %{libdir}/\[ecj\].jar >/dev/null 2>&1 %files -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc {LICENSE,NOTICE,RELEASE*} %attr(0755,root,root) %{_bindir}/%{name}-digest %attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper @@ -679,11 +681,11 @@ rm -f \ %{appdir}/manager %files docs-webapp -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc %{appdir}/docs %files el-2_2-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{_javadir}/%{name}-el-%{elspec}-api.jar %{_javadir}/%{name}-el-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar @@ -695,7 +697,7 @@ rm -f \ %ghost %{_sysconfdir}/alternatives/el_api.jar %files javadoc -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc %{_javadocdir}/%{name} %files jsp-2_2-api @@ -708,7 +710,7 @@ rm -f \ %{_mavendepmapfragdir}/%{name}-tomcat-jsp-api %files lib -%defattr(0644,root,root,0755) +%defattr(-,root,root) %{libdir} %dir %{bindir} %{bindir}/tomcat-juli.jar @@ -729,7 +731,7 @@ rm -f \ %config(noreplace) %{_sysconfdir}/ant.d/catalina-ant %files servlet-3_0-api -%defattr(0644,root,root,0755) +%defattr(-,root,root) %doc LICENSE %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_javadir}/%{name}-servlet-api.jar @@ -739,13 +741,14 @@ rm -f \ %{_mavenpomdir}/JPP-%{name}-servlet-api.pom %files webapps -%defattr(0644,root,root,0755) +%defattr(-,root,root) #bnc#520532 %config(noreplace) %{appdir}/ROOT %{appdir}/examples %{appdir}/sample %if %{with_systemd} + %files jsvc %defattr(755,root,root,0755) %{_sbindir}/%{name}-jsvc-sysd