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

- Fix fixme for the prereq preamble value

Browse Source 
- It seems systemd prints error on adding the @ services to macros
  so do not do that

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=84
This commit is contained in:
Tomáš Chvátal 2016-04-07 13:02:00 +00:00 committed by Git OBS Bridge
parent 122197843b
commit c29a84fd86
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tomcat.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Apr 7 13:01:07 UTC 2016 - tchvatal@suse.com
- Fix fixme for the prereq preamble value
- It seems systemd prints error on adding the @ services to macros
so do not do that
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 31 08:18:39 UTC 2016 - dmacvicar@suse.de Thu Mar 31 08:18:39 UTC 2016 - dmacvicar@suse.de

10
tomcat.spec
View File

@ -110,9 +110,7 @@ Requires: jakarta-commons-dbcp
Requires: jakarta-commons-logging Requires: jakarta-commons-logging
Requires: jakarta-commons-pool Requires: jakarta-commons-pool
Requires: log4j Requires: log4j
# FIXME: use proper Requires(pre/post/preun/...) Requires(post): %fillup_prereq
PreReq: %fillup_prereq
Requires(post): systemd-rpm-macros
Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/groupadd
Requires(pre): %{_sbindir}/useradd Requires(pre): %{_sbindir}/useradd
Recommends: libtcnative-1-0 >= 1.1.24 Recommends: libtcnative-1-0 >= 1.1.24
@ -600,21 +598,17 @@ EOF
%{_sbindir}/useradd -c "Apache Tomcat" -g tomcat \ %{_sbindir}/useradd -c "Apache Tomcat" -g tomcat \
-s /bin/sh -r -d %{homedir} tomcat 2>/dev/null || : -s /bin/sh -r -d %{homedir} tomcat 2>/dev/null || :
%service_add_pre %{name}.service %service_add_pre %{name}.service
%service_add_pre %{name}@.service
%post %post
%service_add_post %{name}.service %service_add_post %{name}.service
%service_add_post %{name}@.service %{fillup_only %{name}}
%fillup_only
%{_bindir}/systemd-tmpfiles --create >/dev/null 2>&1 || : %{_bindir}/systemd-tmpfiles --create >/dev/null 2>&1 || :
%preun %preun
%service_del_preun %{name}.service %service_del_preun %{name}.service
%service_del_preun %{name}@.service
%postun %postun
%service_del_postun %{name}.service %service_del_postun %{name}.service
%service_del_postun %{name}@.service
%pre jsvc %pre jsvc
%service_add_pre %{name}-jsvc.service %service_add_pre %{name}-jsvc.service