2.18.0

2 files changed, 12 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7df935dec2a..b18871ba8bbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = geoserver-bin
 	pkgdesc = Server written in Java that allows users to share and edit geospatial data
-	pkgver = 2.16.0
+	pkgver = 2.18.0
 	pkgrel = 1
 	url = http://geoserver.org
 	install = geoserver.install
 	arch = any
 	license = GPL2+
 	depends = jre8-openjdk-headless
-	source = http://downloads.sourceforge.net/project/geoserver/GeoServer/2.16.0/geoserver-2.16.0-bin.zip
+	source = http://downloads.sourceforge.net/project/geoserver/GeoServer/2.18.0/geoserver-2.18.0-bin.zip
 	source = geoserver.install
 	source = geoserver.service
 	source = geoserver.sysusers
-	sha256sums = 081b8bdb6c754edee60c59200f4761837427da70760dccd856a5620db28611e7
+	sha256sums = 7089efb82e70e814dd0697110ac29d6bddc7215ddb8ab120b19aebf4957762ea
 	sha256sums = 576c36670c418aa25730986e592c8b0f4a0657d3129aafbe7c783ff3ed527abe
 	sha256sums = b746621be690e385341a41d850cd297e6c70e936024e6eea43f98022e53cb301
 	sha256sums = edd692b53b71a684b20e0e7a87b0047aaefc2286574355fb5c08770af2652d08
 
 pkgname = geoserver-bin
-
diff --git a/PKGBUILD b/PKGBUILD
index c4f17dcddcba..ff9792ef1ae4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Christoph Fink <christoph.fink@gmail.com>
 
 pkgname=geoserver-bin
-pkgver=2.16.0
+pkgver=2.18.0
 pkgrel=1
 pkgdesc="Server written in Java that allows users to share and edit geospatial data"
 arch=("any")
@@ -20,7 +20,7 @@ source=(
     "geoserver.service"
     "geoserver.sysusers"
 )
-sha256sums=('081b8bdb6c754edee60c59200f4761837427da70760dccd856a5620db28611e7'
+sha256sums=('7089efb82e70e814dd0697110ac29d6bddc7215ddb8ab120b19aebf4957762ea'
             '576c36670c418aa25730986e592c8b0f4a0657d3129aafbe7c783ff3ed527abe'
             'b746621be690e385341a41d850cd297e6c70e936024e6eea43f98022e53cb301'
             'edd692b53b71a684b20e0e7a87b0047aaefc2286574355fb5c08770af2652d08')
@@ -28,21 +28,22 @@ sha256sums=('081b8bdb6c754edee60c59200f4761837427da70760dccd856a5620db28611e7'
 install="geoserver.install"
 
 package() {
-
-    cd "$srcdir/geoserver-${pkgver}"
-
     # create a dedicated user
     install -Dm644 ../geoserver.sysusers "${pkgdir}/usr/lib/sysusers.d/geoserver.conf"
 
     # clean up: remove windows file, move license file
     # to /usr/share/licenses
     rm bin/{startup,shutdown}.bat
-    install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    rm LICENSE.txt
+    licenses=(license/*)
+    for license in "${licenses[@]}"
+    do
+        install -Dm644 $license "${pkgdir}/usr/share/licenses/${pkgname}/${license}"
+        rm $license
+    done
 
     # install geoserver to /opt/geoserver/${pkgver}
     mkdir -p "${pkgdir}/opt/geoserver/"
-    cp -R "../geoserver-${pkgver}" "${pkgdir}/opt/geoserver/${pkgver}"
+    cp -R . "${pkgdir}/opt/geoserver/${pkgver}"
 
     # adjust data directory permissions
     find "${pkgdir}/opt/geoserver/${pkgver}/data_dir/data" -type d -exec chmod 0775 {} \;