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

Accepting request 841492 from home:jengelh:branches:Java:packages

Browse Source 
- Replace old specfile constructs. Remove support for SUSE 11.x.
- Drop %systemd_requires, which is considered a no-op.
- Trim redundant license mention from description.
- Make documentation noarch.
- Do not suppress errors from useradd.

OBS-URL: https://build.opensuse.org/request/show/841492
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=214
This commit is contained in:
Fridrich Strba 2020-11-03 15:34:19 +00:00 committed by Git OBS Bridge
parent 92414c9e01
commit 5c88b47afb
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tomcat.changes
View File

@ -26,6 +26,15 @@ Tue Oct 13 11:23:32 UTC 2020 - Matei Albu <malbu@suse.com>
- Change /usr/lib/tomcat to /usr/libexec/tomcat in startup
scripts (bsc#1177601)
-------------------------------------------------------------------
Tue Oct 13 10:47:39 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Replace old specfile constructs. Remove support for SUSE 11.x.
- Drop %systemd_requires, which is considered a no-op.
- Trim redundant license mention from description.
- Make documentation noarch.
- Do not suppress errors from useradd.
-------------------------------------------------------------------
Wed Aug 26 06:04:58 UTC 2020 - Fridrich Strba <fstrba@suse.com>

17
tomcat.spec
View File

@ -125,7 +125,6 @@ Requires(pre): %{_sbindir}/useradd
Recommends: libtcnative-1-0 >= 1.1.24
Recommends: logrotate
BuildArch: noarch
%systemd_requires
%description
Tomcat is the servlet container that is used in the official Reference
@ -133,11 +132,6 @@ Implementation for the Java Servlet and JavaServer Pages technologies.
The Java Servlet and JavaServer Pages specifications are developed by
Sun under the Java Community Process.
Tomcat is developed in an open and participatory environment and
released under the Apache Software License version 2.0. Tomcat is
intended to be a collaboration of the best-of-breed developers from
around the world.
ATTENTION: This tomcat is built with java 1.8.0.
%package admin-webapps
@ -180,6 +174,7 @@ Expression Language API version 3.0.
%package javadoc
Summary: Javadoc generated documentation for Apache Tomcat
Group: Documentation/HTML
BuildArch: noarch
%description javadoc
Javadoc generated documentation files for Apache Tomcat.
@ -329,9 +324,6 @@ jar cfe %{_builddir}/tomcat-serverxml-tool-%{serverxmltool_version}/serverxmltoo
popd
%install
%if 0%{?suse_version} == 1110
export NO_BRP_CHECK_BYTECODE_VERSION=true
%endif
# build initial path structure
install -d -m 0755 %{buildroot}%{_bindir}
install -d -m 0755 %{buildroot}%{_sbindir}
@ -587,9 +579,9 @@ popd
%pre
# add the tomcat user and group
%{_sbindir}/groupadd -r tomcat 2>/dev/null || :
%{_sbindir}/useradd -c "Apache Tomcat" -g tomcat \
-s /sbin/nologin -r -d %{homedir} tomcat 2>/dev/null || :
getent group tomcat >/dev/null || %{_sbindir}/groupadd -r tomcat
getent passwd tomcat >/dev/null || %{_sbindir}/useradd -c "Apache Tomcat" \
-g tomcat -s /sbin/nologin -r -d %{homedir} tomcat
%service_add_pre %{name}.service
%post
@ -699,7 +691,6 @@ if [ $1 -eq 0 ]; then # uninstall only
fi
%files
%defattr(-,root,root)
%doc {LICENSE,NOTICE,RELEASE*}
%attr(0755,root,root) %{_bindir}/%{name}-digest
%attr(0755,root,root) %{_bindir}/%{name}-tool-wrapper