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

Browse Source
This commit is contained in:
Fridrich Strba 2019-09-25 12:19:17 +00:00 committed by Git OBS Bridge
parent 9f162d6cbb
commit 4e9ec22797
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tomcat.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Sep 25 12:18:29 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Adapt to the new ecj directory layout
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 12 14:50:12 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org> Wed Jun 12 14:50:12 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>

12
tomcat.spec
View File

@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -109,11 +109,11 @@ BuildRequires: javapackages-tools
BuildRequires: junit BuildRequires: junit
BuildRequires: log4j BuildRequires: log4j
BuildRequires: sed BuildRequires: sed
BuildRequires: pkgconfig(systemd)
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: unzip BuildRequires: unzip
BuildRequires: wsdl4j BuildRequires: wsdl4j
BuildRequires: zip BuildRequires: zip
BuildRequires: pkgconfig(systemd)
Requires: %{name}-lib = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release}
Requires: apache-commons-daemon Requires: apache-commons-daemon
Requires: apache-commons-dbcp Requires: apache-commons-dbcp
@ -289,8 +289,8 @@ ant -Dbase.path="." \
-Dcommons-collections.jar="$(build-classpath commons-collections)" \ -Dcommons-collections.jar="$(build-classpath commons-collections)" \
-Dcommons-daemon.jar="$(build-classpath commons-daemon)" \ -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \
-Dcommons-daemon.native.src.tgz="HACK" \ -Dcommons-daemon.native.src.tgz="HACK" \
-Djasper-jdt.jar="$(build-classpath ecj)" \ -Djasper-jdt.jar="$(build-classpath ecj/ecj)" \
-Djdt.jar="$(build-classpath ecj)" \ -Djdt.jar="$(build-classpath ecj/ecj)" \
-Dtomcat-native.tar.gz="HACK" \ -Dtomcat-native.tar.gz="HACK" \
-Dtomcat-native.home="." \ -Dtomcat-native.home="." \
-Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dcommons-daemon.native.win.mgr.exe="HACK" \
@ -428,7 +428,7 @@ popd
pushd output/build pushd output/build
%{_bindir}/build-jar-repository lib commons-collections \ %{_bindir}/build-jar-repository lib commons-collections \
commons-dbcp2 commons-pool2 ecj 2>&1 commons-dbcp2 commons-pool2 ecj/ecj 2>&1
# need to use -p here with b-j-r otherwise the examples webapp fails to # need to use -p here with b-j-r otherwise the examples webapp fails to
# load with a java.io.IOException # load with a java.io.IOException
%{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \ %{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \
@ -445,7 +445,7 @@ pushd %{buildroot}%{libdir}
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 log4j) log4j.jar ln -s $(build-classpath log4j) log4j.jar
ln -s $(build-classpath 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)
cp -a %{buildroot}%{bindir}/tomcat-juli.jar ./ cp -a %{buildroot}%{bindir}/tomcat-juli.jar ./