Date: Thursday, October 6, 2022 @ 07:41:52 Author: alucryd Revision: 457304
upgpkg: tomcat10 10.1.1-1 Modified: tomcat10/trunk/PKGBUILD ----------+ PKGBUILD | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-10-06 07:36:01 UTC (rev 457303) +++ PKGBUILD 2022-10-06 07:41:52 UTC (rev 457304) @@ -2,7 +2,7 @@ # Contributor: Olli <[email protected]> pkgname=tomcat10 -pkgver=10.0.27 +pkgver=10.1.1 pkgrel=1 pkgdesc='Open source implementation of the Java Servlet 5.0 and JavaServer Pages 3.0 technologies' arch=(any) @@ -9,7 +9,7 @@ url=https://tomcat.apache.org/ license=(APACHE) depends=( - 'java-runtime>=8' + 'java-runtime>=11' java-jsvc java-commons-daemon eclipse-ecj @@ -17,7 +17,7 @@ makedepends=( ant git - java-environment=8 + java-environment=11 ) optdepends=('tomcat-native: to allow optimal performance in production environments') backup=( @@ -30,7 +30,7 @@ etc/tomcat10/web.xml ) install=tomcat10.install -_tag=ca8720d41f3be917dc3fcdd03fcca8d3152a13fb +_tag=934df02dc68e72b95a38f372017f1b89b0d13a76 source=( git+https://github.com/apache/tomcat.git#tag=${_tag} tomcat10.service @@ -48,19 +48,15 @@ pkgver() { cd tomcat - _pkgver=$(git describe --tags) - if [[ ${_pkgver} != 10.* ]]; then exit 1 fi - echo ${_pkgver} } prepare() { cd tomcat - cp build.properties.default build.properties sed "/^base\.path=/c\base\.path=${srcdir}" -i build.properties sed "/^compile.debug=/c\compile.debug=false" -i build.properties @@ -69,10 +65,8 @@ build() { cd tomcat - - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk + export JAVA_HOME=/usr/lib/jvm/java-11-openjdk export PATH="$JAVA_HOME/bin:$PATH" - ant }
