From d6dff44ec2bb6a0a16d85936236cceb2405d2f0b27564b7c905c0302d86fec4b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 12 Sep 2023 11:12:01 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=264 --- tomcat.changes | 5 ----- tomcat.spec | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tomcat.changes b/tomcat.changes index f644d37..fa54c47 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Sep 12 11:03:44 UTC 2023 - Fridrich Strba - -- Require(pre) shadow because groupadd is needed early - ------------------------------------------------------------------- Tue May 23 04:25:45 UTC 2023 - Fridrich Strba diff --git a/tomcat.spec b/tomcat.spec index b46e869..9374485 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -83,6 +83,7 @@ Patch5: %{name}-%{major_version}.%{minor_version}-jdt.patch Patch6: tomcat-9.0.75-secretRequired-default.patch Patch7: tomcat-9.0-fix_catalina.patch Patch8: tomcat-9.0-logrotate_everything.patch + BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr BuildRequires: apache-commons-collections @@ -118,7 +119,6 @@ Requires: java >= 1.8 Requires(post): %fillup_prereq Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd -Requires(pre): shadow Recommends: libtcnative-1-0 >= 1.1.24 Recommends: logrotate BuildArch: noarch @@ -644,7 +644,7 @@ fi %postun servlet-4_0-api if [ $1 -eq 0 ] ; then if [ ! -f %{_sysconfdir}/alternatives/servlet ]; then - # %{_sysconfdir}/alternatives/servlet was removed on uninstall. + # /etc/alternatives/servlet was removed on uninstall. # Create a broken symlink to make sure update-alternatives works correctly and falls back # to servletapi5 or servletapi4 if they're installed. ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_sysconfdir}/alternatives/servlet