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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=242

Browse Source
This commit is contained in:
Fridrich Strba 2022-07-13 13:43:12 +00:00 committed by Git OBS Bridge
parent c75e4afeff
commit 0a03fd758a
8 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tomcat-9.0-jsvc.service
View File

@ -14,8 +14,8 @@ After=syslog.target network.target
Type=simple Type=simple
EnvironmentFile=/etc/tomcat/tomcat.conf EnvironmentFile=/etc/tomcat/tomcat.conf
Environment="NAME=" "USE_JSVC=true" Environment="NAME=" "USE_JSVC=true"
ExecStart=/usr/libexec/tomcat/server start ExecStart=@LIBEXECDIR@/tomcat/server start
ExecStop=/usr/libexec/tomcat/server stop ExecStop=@LIBEXECDIR@/tomcat/server stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

4
tomcat-9.0.service
View File

@ -14,8 +14,8 @@ Type=simple
EnvironmentFile=/etc/tomcat/tomcat.conf EnvironmentFile=/etc/tomcat/tomcat.conf
Environment="NAME=" Environment="NAME="
EnvironmentFile=-/etc/sysconfig/tomcat EnvironmentFile=-/etc/sysconfig/tomcat
ExecStart=/usr/libexec/tomcat/server start ExecStart=@LIBEXECDIR@/tomcat/server start
ExecStop=/usr/libexec/tomcat/server stop ExecStop=@LIBEXECDIR@/tomcat/server stop
SuccessExitStatus=143 SuccessExitStatus=143
User=tomcat User=tomcat
Group=tomcat Group=tomcat

2
tomcat-9.0.wrapper
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
if [ "$1" = "version" ]; then if [ "$1" = "version" ]; then
. /usr/libexec/tomcat/preamble . @LIBEXECDIR@/tomcat/preamble
exec ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \ exec ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \
org.apache.catalina.util.ServerInfo org.apache.catalina.util.ServerInfo
fi fi

4
tomcat-named.service
View File

@ -15,8 +15,8 @@ Type=simple
EnvironmentFile=/etc/tomcat/tomcat.conf EnvironmentFile=/etc/tomcat/tomcat.conf
Environment="NAME=%I" Environment="NAME=%I"
EnvironmentFile=-/etc/sysconfig/tomcat@%I EnvironmentFile=-/etc/sysconfig/tomcat@%I
ExecStart=/usr/libexec/tomcat/server start ExecStart=@LIBEXECDIR@/tomcat/server start
ExecStop=/usr/libexec/tomcat/server stop ExecStop=@LIBEXECDIR@/tomcat/server stop
SuccessExitStatus=143 SuccessExitStatus=143
User=tomcat User=tomcat
Group=tomcat Group=tomcat

2
tomcat-preamble
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
. /usr/libexec/tomcat/functions . @LIBEXECDIR@/tomcat/functions
# Get the tomcat config (use this for environment specific settings) # Get the tomcat config (use this for environment specific settings)

2
tomcat-server
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
. /usr/libexec/tomcat/preamble . @LIBEXECDIR@/tomcat/preamble
MAIN_CLASS=org.apache.catalina.startup.Bootstrap MAIN_CLASS=org.apache.catalina.startup.Bootstrap

8
tomcat.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jul 13 13:41:43 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Do not hardcode /usr/libexec but use %%_libexecdir during the
build
* Fixes for platforms, where /usr/libexec and %%_libexecdir are
different
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 7 15:35:34 UTC 2022 - Fridrich Strba <fstrba@suse.com> Thu Jul 7 15:35:34 UTC 2022 - Fridrich Strba <fstrba@suse.com>

30
tomcat.spec
View File

@ -385,12 +385,12 @@ sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \ -e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
> %{buildroot}%{_fillupdir}/sysconfig.%{name} > %{buildroot}%{_fillupdir}/sysconfig.%{name}
install -m 0644 %{SOURCE4} \ sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE4} \
%{buildroot}%{_sbindir}/%{name} > %{buildroot}%{_sbindir}/%{name}
install -m 0644 %{SOURCE11} \ sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE11} \
%{buildroot}%{_unitdir}/%{name}.service > %{buildroot}%{_unitdir}/%{name}.service
install -m 0644 %{SOURCE20} \ sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE20} \
%{buildroot}%{_unitdir}/%{name}-jsvc.service > %{buildroot}%{_unitdir}/%{name}-jsvc.service
sed -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \ sed -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
> %{buildroot}%{_sysconfdir}/logrotate.d/%{name} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \ sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
@ -402,14 +402,16 @@ sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \ -e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
> %{buildroot}%{_bindir}/%{name}-tool-wrapper > %{buildroot}%{_bindir}/%{name}-tool-wrapper
install -m 0644 %{SOURCE21} \ sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE21} \
%{buildroot}%{_libexecdir}/%{name}/functions > %{buildroot}%{_libexecdir}/%{name}/functions
install -m 0755 %{SOURCE30} \ sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE30} \
%{buildroot}%{_libexecdir}/%{name}/preamble > %{buildroot}%{_libexecdir}/%{name}/preamble
install -m 0755 %{SOURCE31} \ chmod 0755 %{buildroot}%{_libexecdir}/%{name}/preamble
%{buildroot}%{_libexecdir}/%{name}/server sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE31} \
install -m 0644 %{SOURCE32} \ > %{buildroot}%{_libexecdir}/%{name}/server
%{buildroot}%{_unitdir}/%{name}@.service chmod 0755 %{buildroot}%{_libexecdir}/%{name}/server
sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE32} \
> %{buildroot}%{_unitdir}/%{name}@.service
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name} ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}-jsvc ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}-jsvc