pool/tomcat
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=234

Browse Source
This commit is contained in:
Fridrich Strba 2022-02-22 19:00:44 +00:00 committed by Git OBS Bridge
parent b42b2bcb88
commit ce50f8c0d6
2 changed files with 8 additions and 3 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 Feb 22 19:00:25 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Do not build against the log4j12 packages, use the new reload4j
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 28 14:01:40 UTC 2022 - Michele Bussolotto <michele.bussolotto@suse.com> Fri Jan 28 14:01:40 UTC 2022 - Michele Bussolotto <michele.bussolotto@suse.com>

6
tomcat.spec
View File

@ -108,8 +108,8 @@ BuildRequires: jakarta-taglibs-standard >= 1.1
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: junit BuildRequires: junit
BuildRequires: log4j12
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: reload4j
BuildRequires: sed BuildRequires: sed
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: unzip BuildRequires: unzip
@ -122,7 +122,7 @@ Requires: apache-commons-dbcp
Requires: apache-commons-logging Requires: apache-commons-logging
Requires: apache-commons-pool2 Requires: apache-commons-pool2
Requires: java >= 1.8 Requires: java >= 1.8
Requires: log4j12 Requires: reload4j
Requires(post): %fillup_prereq Requires(post): %fillup_prereq
Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/groupadd
Requires(pre): %{_sbindir}/useradd Requires(pre): %{_sbindir}/useradd
@ -445,7 +445,7 @@ pushd %{buildroot}%{libdir}
rm -f commons-dbcp.jar rm -f commons-dbcp.jar
ln -s $(build-classpath commons-dbcp2) commons-dbcp2.jar ln -s $(build-classpath commons-dbcp2) commons-dbcp2.jar
ln -s $(build-classpath commons-pool2) commons-pool2.jar ln -s $(build-classpath commons-pool2) commons-pool2.jar
ln -s $(build-classpath log4j12/log4j-12) log4j.jar ln -s $(build-classpath reload4j/reload4j) log4j.jar
ln -s $(build-classpath ecj/ecj) jasper-jdt.jar ln -s $(build-classpath ecj/ecj) jasper-jdt.jar
# Temporary copy the juli jar here from %%{_datadir}/java/tomcat (for maven depmap) # Temporary copy the juli jar here from %%{_datadir}/java/tomcat (for maven depmap)