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=265

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-12 11:22:53 +00:00 committed by Git OBS Bridge
parent d6dff44ec2
commit d3b5cc15e7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tomcat.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 12 11:21:45 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Require(pre) groupadd in right package
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 23 04:25:45 UTC 2023 - Fridrich Strba <fstrba@suse.com> Tue May 23 04:25:45 UTC 2023 - Fridrich Strba <fstrba@suse.com>

4
tomcat.spec
View File

@ -83,7 +83,6 @@ Patch5: %{name}-%{major_version}.%{minor_version}-jdt.patch
Patch6: tomcat-9.0.75-secretRequired-default.patch Patch6: tomcat-9.0.75-secretRequired-default.patch
Patch7: tomcat-9.0-fix_catalina.patch Patch7: tomcat-9.0-fix_catalina.patch
Patch8: tomcat-9.0-logrotate_everything.patch Patch8: tomcat-9.0-logrotate_everything.patch
BuildRequires: ant >= 1.8.1 BuildRequires: ant >= 1.8.1
BuildRequires: ant-antlr BuildRequires: ant-antlr
BuildRequires: apache-commons-collections BuildRequires: apache-commons-collections
@ -210,6 +209,7 @@ Requires: %{name}-el-%{elspec}-api = %{version}-%{release}
Requires: %{name}-jsp-%{jspspec}-api = %{version}-%{release} Requires: %{name}-jsp-%{jspspec}-api = %{version}-%{release}
Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release}
Requires(post): ecj >= 4.4 Requires(post): ecj >= 4.4
Requires(pre): %{_sbindir}/groupadd
Requires(preun):coreutils Requires(preun):coreutils
Provides: jakarta-commons-dbcp-tomcat5 = 1.4 Provides: jakarta-commons-dbcp-tomcat5 = 1.4
Obsoletes: jakarta-commons-dbcp-tomcat5 < 1.4 Obsoletes: jakarta-commons-dbcp-tomcat5 < 1.4
@ -644,7 +644,7 @@ fi
%postun servlet-4_0-api %postun servlet-4_0-api
if [ $1 -eq 0 ] ; then if [ $1 -eq 0 ] ; then
if [ ! -f %{_sysconfdir}/alternatives/servlet ]; then if [ ! -f %{_sysconfdir}/alternatives/servlet ]; then
# /etc/alternatives/servlet was removed on uninstall. # %{_sysconfdir}/alternatives/servlet was removed on uninstall.
# Create a broken symlink to make sure update-alternatives works correctly and falls back # Create a broken symlink to make sure update-alternatives works correctly and falls back
# to servletapi5 or servletapi4 if they're installed. # to servletapi5 or servletapi4 if they're installed.
ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_sysconfdir}/alternatives/servlet ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_sysconfdir}/alternatives/servlet