Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tomcat for openSUSE:Factory checked
in at 2022-07-14 16:34:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tomcat (Old)
and /work/SRC/openSUSE:Factory/.tomcat.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat"
Thu Jul 14 16:34:22 2022 rev:86 rq:989036 version:9.0.43
Changes:
--------
--- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2022-07-08
14:03:10.742534977 +0200
+++ /work/SRC/openSUSE:Factory/.tomcat.new.1523/tomcat.changes 2022-07-14
16:34:48.076658751 +0200
@@ -1,0 +2,8 @@
+Wed Jul 13 13:41:43 UTC 2022 - Fridrich Strba <fst...@suse.com>
+
+- Do not hardcode /usr/libexec but use %%_libexecdir during the
+ build
+ * Fixes for platforms, where /usr/libexec and %%_libexecdir are
+ different
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tomcat.spec ++++++
--- /var/tmp/diff_new_pack.RIm5Nb/_old 2022-07-14 16:34:48.820659483 +0200
+++ /var/tmp/diff_new_pack.RIm5Nb/_new 2022-07-14 16:34:48.828659491 +0200
@@ -385,12 +385,12 @@
-e "s|\@\@\@TCTEMP\@\@\@|%{tempdir}|g" \
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE3} \
> %{buildroot}%{_fillupdir}/sysconfig.%{name}
-install -m 0644 %{SOURCE4} \
- %{buildroot}%{_sbindir}/%{name}
-install -m 0644 %{SOURCE11} \
- %{buildroot}%{_unitdir}/%{name}.service
-install -m 0644 %{SOURCE20} \
- %{buildroot}%{_unitdir}/%{name}-jsvc.service
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE4} \
+ > %{buildroot}%{_sbindir}/%{name}
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE11} \
+ > %{buildroot}%{_unitdir}/%{name}.service
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE20} \
+ > %{buildroot}%{_unitdir}/%{name}-jsvc.service
sed -e "s|\@\@\@TCLOG\@\@\@|%{logdir}|g" %{SOURCE5} \
> %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
sed -e "s|\@\@\@TCHOME\@\@\@|%{homedir}|g" \
@@ -402,14 +402,16 @@
-e "s|\@\@\@LIBDIR\@\@\@|%{_libdir}|g" %{SOURCE7} \
> %{buildroot}%{_bindir}/%{name}-tool-wrapper
-install -m 0644 %{SOURCE21} \
- %{buildroot}%{_libexecdir}/%{name}/functions
-install -m 0755 %{SOURCE30} \
- %{buildroot}%{_libexecdir}/%{name}/preamble
-install -m 0755 %{SOURCE31} \
- %{buildroot}%{_libexecdir}/%{name}/server
-install -m 0644 %{SOURCE32} \
- %{buildroot}%{_unitdir}/%{name}@.service
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE21} \
+ > %{buildroot}%{_libexecdir}/%{name}/functions
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE30} \
+ > %{buildroot}%{_libexecdir}/%{name}/preamble
+chmod 0755 %{buildroot}%{_libexecdir}/%{name}/preamble
+sed -e "s|@LIBEXECDIR@|%{_libexecdir}|g" %{SOURCE31} \
+ > %{buildroot}%{_libexecdir}/%{name}/server
+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}-jsvc
++++++ tomcat-9.0-jsvc.service ++++++
--- /var/tmp/diff_new_pack.RIm5Nb/_old 2022-07-14 16:34:48.900659562 +0200
+++ /var/tmp/diff_new_pack.RIm5Nb/_new 2022-07-14 16:34:48.904659566 +0200
@@ -14,8 +14,8 @@
Type=simple
EnvironmentFile=/etc/tomcat/tomcat.conf
Environment="NAME=" "USE_JSVC=true"
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
+ExecStart=@LIBEXECDIR@/tomcat/server start
+ExecStop=@LIBEXECDIR@/tomcat/server stop
[Install]
WantedBy=multi-user.target
++++++ tomcat-9.0.service ++++++
--- /var/tmp/diff_new_pack.RIm5Nb/_old 2022-07-14 16:34:48.960659621 +0200
+++ /var/tmp/diff_new_pack.RIm5Nb/_new 2022-07-14 16:34:48.960659621 +0200
@@ -14,8 +14,8 @@
EnvironmentFile=/etc/tomcat/tomcat.conf
Environment="NAME="
EnvironmentFile=-/etc/sysconfig/tomcat
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
+ExecStart=@LIBEXECDIR@/tomcat/server start
+ExecStop=@LIBEXECDIR@/tomcat/server stop
SuccessExitStatus=143
User=tomcat
Group=tomcat
++++++ tomcat-9.0.wrapper ++++++
--- /var/tmp/diff_new_pack.RIm5Nb/_old 2022-07-14 16:34:48.980659641 +0200
+++ /var/tmp/diff_new_pack.RIm5Nb/_new 2022-07-14 16:34:48.984659645 +0200
@@ -1,7 +1,7 @@
#!/bin/bash
if [ "$1" = "version" ]; then
- . /usr/libexec/tomcat/preamble
+ . @LIBEXECDIR@/tomcat/preamble
exec ${JAVACMD} -classpath ${CATALINA_HOME}/lib/catalina.jar \
org.apache.catalina.util.ServerInfo
fi
++++++ tomcat-named.service ++++++
--- /var/tmp/diff_new_pack.RIm5Nb/_old 2022-07-14 16:34:49.012659673 +0200
+++ /var/tmp/diff_new_pack.RIm5Nb/_new 2022-07-14 16:34:49.012659673 +0200
@@ -15,8 +15,8 @@
EnvironmentFile=/etc/tomcat/tomcat.conf
Environment="NAME=%I"
EnvironmentFile=-/etc/sysconfig/tomcat@%I
-ExecStart=/usr/libexec/tomcat/server start
-ExecStop=/usr/libexec/tomcat/server stop
+ExecStart=@LIBEXECDIR@/tomcat/server start
+ExecStop=@LIBEXECDIR@/tomcat/server stop
SuccessExitStatus=143
User=tomcat
Group=tomcat
++++++ tomcat-preamble ++++++
--- /var/tmp/diff_new_pack.RIm5Nb/_old 2022-07-14 16:34:49.028659688 +0200
+++ /var/tmp/diff_new_pack.RIm5Nb/_new 2022-07-14 16:34:49.028659688 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
-. /usr/libexec/tomcat/functions
+. @LIBEXECDIR@/tomcat/functions
# Get the tomcat config (use this for environment specific settings)
++++++ tomcat-server ++++++
--- /var/tmp/diff_new_pack.RIm5Nb/_old 2022-07-14 16:34:49.052659712 +0200
+++ /var/tmp/diff_new_pack.RIm5Nb/_new 2022-07-14 16:34:49.056659716 +0200
@@ -1,6 +1,6 @@
#!/bin/bash
-. /usr/libexec/tomcat/preamble
+. @LIBEXECDIR@/tomcat/preamble
MAIN_CLASS=org.apache.catalina.startup.Bootstrap
