rpm/tomcat
SHA256
1
0
Fork 0
forked from pool/tomcat
Code Pull Requests Activity

* merge the jsvc into tomcat-sysd code, the -jsvc-sysd is a symlink

Browse Source 
* properly use jsvc with pid file to start and stop

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=6
This commit is contained in:
Michal Vyskocil
2012-07-19 08:58:29 +00:00
committed by Git OBS Bridge
parent a1a7392be9
commit 3b8b9e494f
8 changed files with 98 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tomcat.spec
View File

@@ -61,16 +61,14 @@ Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script
Source8: servlet-api-OSGi-MANIFEST.MF
Source9: jsp-api-OSGi-MANIFEST.MF
Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties
Source11: %{name}-%{major_version}.%{minor_version}.service
Source11: tomcat-7.0.service
Source12: el-api-OSGi-MANIFEST.MF
Source13: jasper-el-OSGi-MANIFEST.MF
Source14: jasper-OSGi-MANIFEST.MF
Source15: tomcat-api-OSGi-MANIFEST.MF
Source16: tomcat-juli-OSGi-MANIFEST.MF
Source17: tomcat-7.0-tomcat-sysd
Source18: %{name}-%{major_version}.%{minor_version}-tomcat-jsvc-sysd
Source19: %{name}-%{major_version}.%{minor_version}-jsvc.wrapper
Source20: %{name}-%{major_version}.%{minor_version}-jsvc.service
Source20: tomcat-7.0-jsvc.service
Source1000: tomcat-rpmlintrc
#PATCH-FIX-UPSTREAM: from jpackage.org package
@@ -189,6 +187,7 @@ Requires(postun): %{_sbindir}/update-alternatives
%description jsp-2_2-api
Apache Tomcat JSP API implementation classes
%if 0%{?suse_version} > 1140
%package jsvc
Summary: Apache jsvc wrapper for Apache Tomcat as separate service
Group: Productivity/Networking/Web/Servers
@@ -199,7 +198,7 @@ Requires: apache-commons-daemon-jsvc
Systemd service and wrapper scripts to start tomcat with jsvc,
which allows tomcat to perform some privileged operations
(e.g. bind to a port < 1024) and then switch identity to a non-privileged user.
%endif
%package lib
Summary: Libraries needed to run the Tomcat Web container
@@ -385,14 +384,9 @@ popd
${RPM_BUILD_ROOT}%{_unitdir}/%{name}.service
%{__install} -m 0644 %{SOURCE17} \
${RPM_BUILD_ROOT}%{_sbindir}/%{name}-sysd
%endif
%{__install} -m 0644 %{SOURCE19} \
${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc
%if 0%{?suse_version} > 1140
%{__install} -m 0644 %{SOURCE20} \
${RPM_BUILD_ROOT}%{_unitdir}/%{name}-jsvc.service
%{__install} -m 0644 %{SOURCE18} \
${RPM_BUILD_ROOT}%{_sbindir}/%{name}-jsvc-sysd
(cd ${RPM_BUILD_ROOT}%{_sbindir}; ln -s %{name}-sysd %{name}-jsvc-sysd)
%endif
%{__sed} -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
> ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}
@@ -708,10 +702,9 @@ fi
%{appdir}/examples
%{appdir}/sample
%if 0%{?suse_version} > 1140
%files jsvc
%defattr(755,root,root,0755)
%{_sbindir}/%{name}-jsvc
%if 0%{?suse_version} > 1140
%{_sbindir}/%{name}-jsvc-sysd
%attr(0644,root,root) %{_unitdir}/%{name}-jsvc.service
%endif