Accepting request 1139489 from home:mbussolotto:branches:Java:packages
- change server.xml during %post instead of %posttrans - add libxslt-tools requirement OBS-URL: https://build.opensuse.org/request/show/1139489 OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=287
This commit is contained in:
parent
00c7f7716c
commit
9c6b265e44
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 17 14:53:08 UTC 2024 - Michele Bussolotto <michele.bussolotto@suse.com>
|
||||
|
||||
- change server.xml during %post instead of %posttrans
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 17 14:20:25 UTC 2024 - Michele Bussolotto <michele.bussolotto@suse.com>
|
||||
|
||||
|
@ -101,7 +101,6 @@ BuildRequires: jakarta-taglibs-standard >= 1.1
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: junit
|
||||
BuildRequires: libxslt-tools
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: sed
|
||||
BuildRequires: systemd-rpm-macros
|
||||
@ -116,6 +115,7 @@ Requires: apache-commons-logging
|
||||
Requires: apache-commons-pool2
|
||||
Requires: java >= 1.8
|
||||
Requires(post): %fillup_prereq
|
||||
Requires(post): libxslt-tools
|
||||
Requires(pre): shadow
|
||||
Recommends: libtcnative-1-0 >= 1.1.24
|
||||
Recommends: logrotate
|
||||
@ -133,6 +133,7 @@ ATTENTION: This tomcat is built with java 1.8.0.
|
||||
Summary: The host manager and manager web applications for Apache Tomcat
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires(post): libxslt-tools
|
||||
|
||||
%description admin-webapps
|
||||
The host manager and manager web-based applications for Apache Tomcat.
|
||||
@ -148,6 +149,7 @@ Embeddeding support (various libraries) for Apache Tomcat.
|
||||
Summary: The "docs" web application for Apache Tomcat
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires(post): libxslt-tools
|
||||
|
||||
%description docs-webapp
|
||||
The documentation of web application for Apache Tomcat.
|
||||
@ -236,6 +238,7 @@ Summary: ROOT and examples web applications for Apache Tomcat
|
||||
Group: Productivity/Networking/Web/Servers
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: jakarta-taglibs-standard >= 1.1
|
||||
Requires(post): libxslt-tools
|
||||
|
||||
%description webapps
|
||||
The ROOT and examples web applications for Apache Tomcat
|
||||
@ -556,6 +559,7 @@ getent passwd tomcat >/dev/null || %{_sbindir}/useradd -c "Apache Tomcat" \
|
||||
%post
|
||||
%service_add_post %{name}.service
|
||||
%{fillup_only %{name}}
|
||||
xsltproc --output %{confdir}/server.xml %{confdir}/valve.xslt %{confdir}/server.xml
|
||||
|
||||
%preun
|
||||
%service_del_preun %{name}.service
|
||||
@ -667,9 +671,6 @@ if [ ! -e %{_datadir}/%{name}/webapps/docs ]; then
|
||||
ln -sf %{tomcatappdir}/docs %{_datadir}/%{name}/webapps/docs
|
||||
fi
|
||||
|
||||
%posttrans
|
||||
xsltproc --output %{confdir}/server.xml %{confdir}/valve.xslt %{confdir}/server.xml
|
||||
|
||||
%files
|
||||
%doc {LICENSE,NOTICE,RELEASE*}
|
||||
%attr(0755,root,root) %{_bindir}/%{name}-digest
|
||||
|
Loading…
x
Reference in New Issue
Block a user