pool/tomcat
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Do not define default defattr as it is pointless.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=54
This commit is contained in:
Tomáš Chvátal 2014-07-29 11:25:39 +00:00 committed by Git OBS Bridge
parent aa9375002e
commit fb825b29a6
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tomcat.changes
View File

@ -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 Fri Jul 25 09:24:12 UTC 2014 - tchvatal@suse.com

17
tomcat.spec
View File

@ -181,6 +181,7 @@ Provides: jsp22
Apache Tomcat JSP API implementation classes version 2.2 Apache Tomcat JSP API implementation classes version 2.2
%if %{with_systemd} %if %{with_systemd}
%package jsvc %package jsvc
Summary: Apache jsvc wrapper for Apache Tomcat as separate service Summary: Apache jsvc wrapper for Apache Tomcat as separate service
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
@ -576,6 +577,7 @@ ln -sf %{_sysconfdir}/alternatives/servlet.jar %{buildroot}%{_javadir}/servlet.j
%endif %endif
%if %{with_systemd} %if %{with_systemd}
%pre jsvc %pre jsvc
%service_add_pre %{name}-jsvc.service %service_add_pre %{name}-jsvc.service
@ -628,7 +630,7 @@ rm -f \
%{libdir}/\[ecj\].jar >/dev/null 2>&1 %{libdir}/\[ecj\].jar >/dev/null 2>&1
%files %files
%defattr(0644,root,root,0755) %defattr(-,root,root)
%doc {LICENSE,NOTICE,RELEASE*} %doc {LICENSE,NOTICE,RELEASE*}
%attr(0755,root,root) %{_bindir}/%{name}-digest %attr(0755,root,root) %{_bindir}/%{name}-digest
%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper %attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper
@ -679,11 +681,11 @@ rm -f \
%{appdir}/manager %{appdir}/manager
%files docs-webapp %files docs-webapp
%defattr(0644,root,root,0755) %defattr(-,root,root)
%doc %{appdir}/docs %doc %{appdir}/docs
%files el-2_2-api %files el-2_2-api
%defattr(0644,root,root,0755) %defattr(-,root,root)
%{_javadir}/%{name}-el-%{elspec}-api.jar %{_javadir}/%{name}-el-%{elspec}-api.jar
%{_javadir}/%{name}-el-api.jar %{_javadir}/%{name}-el-api.jar
%{libdir}/%{name}-el-%{elspec}-api.jar %{libdir}/%{name}-el-%{elspec}-api.jar
@ -695,7 +697,7 @@ rm -f \
%ghost %{_sysconfdir}/alternatives/el_api.jar %ghost %{_sysconfdir}/alternatives/el_api.jar
%files javadoc %files javadoc
%defattr(0644,root,root,0755) %defattr(-,root,root)
%doc %{_javadocdir}/%{name} %doc %{_javadocdir}/%{name}
%files jsp-2_2-api %files jsp-2_2-api
@ -708,7 +710,7 @@ rm -f \
%{_mavendepmapfragdir}/%{name}-tomcat-jsp-api %{_mavendepmapfragdir}/%{name}-tomcat-jsp-api
%files lib %files lib
%defattr(0644,root,root,0755) %defattr(-,root,root)
%{libdir} %{libdir}
%dir %{bindir} %dir %{bindir}
%{bindir}/tomcat-juli.jar %{bindir}/tomcat-juli.jar
@ -729,7 +731,7 @@ rm -f \
%config(noreplace) %{_sysconfdir}/ant.d/catalina-ant %config(noreplace) %{_sysconfdir}/ant.d/catalina-ant
%files servlet-3_0-api %files servlet-3_0-api
%defattr(0644,root,root,0755) %defattr(-,root,root)
%doc LICENSE %doc LICENSE
%{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
%{_javadir}/%{name}-servlet-api.jar %{_javadir}/%{name}-servlet-api.jar
@ -739,13 +741,14 @@ rm -f \
%{_mavenpomdir}/JPP-%{name}-servlet-api.pom %{_mavenpomdir}/JPP-%{name}-servlet-api.pom
%files webapps %files webapps
%defattr(0644,root,root,0755) %defattr(-,root,root)
#bnc#520532 #bnc#520532
%config(noreplace) %{appdir}/ROOT %config(noreplace) %{appdir}/ROOT
%{appdir}/examples %{appdir}/examples
%{appdir}/sample %{appdir}/sample
%if %{with_systemd} %if %{with_systemd}
%files jsvc %files jsvc
%defattr(755,root,root,0755) %defattr(755,root,root,0755)
%{_sbindir}/%{name}-jsvc-sysd %{_sbindir}/%{name}-jsvc-sysd