From 9d6259ecc8dcd01ee6e0c9e4af70dcd40329f4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 8 Mar 2024 16:44:25 +0100
Subject: [PATCH] Sync from SUSE:ALP:Source:Standard:1.0 tomcat revision
 9833cf680863ca06c4f802c621f47f6a

---
 tomcat.changes | 12 ++++++++++++
 tomcat.spec    | 12 +++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/tomcat.changes b/tomcat.changes
index 72bc58c..b6ef1df 100644
--- a/tomcat.changes
+++ b/tomcat.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Mar  6 07:18:06 UTC 2024 - Dan Čermák <dcermak@suse.com>
+
+- Add missing Requires(post): util-linux to have runuser into post
+
+-------------------------------------------------------------------
+Mon Mar  4 16:49:37 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Add %%systemd_ordering to packages with systemd unit files, so
+  that the order is the right one if those packages find themselves
+  in the same transaction with systemd
+
 -------------------------------------------------------------------
 Sat Feb 17 14:55:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/tomcat.spec b/tomcat.spec
index 252b4d1..a6c0152 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -117,12 +117,15 @@ Requires:       apache-commons-pool2
 Requires:       java >= 1.8
 Requires(post): %fillup_prereq
 Requires(post): libxslt-tools
+# for runuser
+Requires(post): util-linux
 Requires(pre):  shadow
+%systemd_ordering
 Recommends:     libtcnative-1-0 >= 1.1.24
 Recommends:     logrotate
-BuildArch:      noarch
 Provides:       group(tomcat)
 Provides:       user(tomcat)
+BuildArch:      noarch
 
 %description
 Tomcat is the servlet container that is used in the official Reference
@@ -137,6 +140,8 @@ Summary:        The host manager and manager web applications for Apache Tomcat
 Group:          Productivity/Networking/Web/Servers
 Requires:       %{name} = %{version}-%{release}
 Requires(post): libxslt-tools
+# for runuser
+Requires(post): util-linux
 
 %description admin-webapps
 The host manager and manager web-based applications for Apache Tomcat.
@@ -153,6 +158,8 @@ Summary:        The "docs" web application for Apache Tomcat
 Group:          Productivity/Networking/Web/Servers
 Requires:       %{name} = %{version}-%{release}
 Requires(post): libxslt-tools
+# for runuser
+Requires(post): util-linux
 
 %description docs-webapp
 The documentation of web application for Apache Tomcat.
@@ -200,6 +207,7 @@ Summary:        Apache jsvc wrapper for Apache Tomcat as separate service
 Group:          Productivity/Networking/Web/Servers
 Requires:       %{name} = %{version}-%{release}
 Requires:       apache-commons-daemon-jsvc
+%systemd_ordering
 
 %description jsvc
 Systemd service and wrapper scripts to start tomcat with jsvc,
@@ -242,6 +250,8 @@ Group:          Productivity/Networking/Web/Servers
 Requires:       %{name} = %{version}-%{release}
 Requires:       jakarta-taglibs-standard >= 1.1
 Requires(post): libxslt-tools
+# for runuser
+Requires(post): util-linux
 
 %description webapps
 The ROOT and examples web applications for Apache Tomcat