Update to 3.2.2

4 files changed, 25 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8810b1c01246..8dd55121ecf1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hudson
 	pkgdesc = Extensible continuous integration server
-	pkgver = 3.1.2
+	pkgver = 3.2.2
 	pkgrel = 1
 	url = http://hudson-ci.org
 	install = hudson.install
@@ -9,17 +9,14 @@ pkgbase = hudson
 	depends = java-runtime
 	depends = ttf-dejavu
 	depends = libcups
-	provides = hudson
-	conflicts = hudson
-	replaces = hudson
-	noextract = hudson.war
+	noextract = hudson-3.2.2.war
 	backup = etc/conf.d/hudson
-	source = http://hudson-ci.org/downloads/war/3.1.2/hudson.war
+	source = http://hudson-ci.org/downloads/war/hudson-3.2.2.war
 	source = hudson.conf
 	source = hudson.service
 	source = hudson.tmpfiles.d
-	sha256sums = b33b62559c658b3152f4e905c40ebcf0241b2e36d8bf2bd9f2f23d0c2bb9a8dd
-	sha256sums = 514f755b90bcb3a88339ab7f4104e9b7fcfebe70038abc008fa8acf450b1a531
+	sha256sums = 31d7a97d09118a06990e5a3c7a1e0f39131971c73f32f0efb4299b00bc10e3d1
+	sha256sums = 784a07d6d0cc2a1fd53114e765ccf44e022e9372c398bfacfa743e95eb7ddc40
 	sha256sums = 00a96b88bb9e98d14697e7e9eb443b0785f074eb1bbba207d3e7dd30d10ebbdf
 	sha256sums = c61cbcf85c887379a605c1908b5474599b0fce25bd2f8dd567da3ace6a631b08
 
diff --git a/PKGBUILD b/PKGBUILD
index ff8827278b5a..bffee8d0dc8d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,33 @@
-# Maintainer: Marcel Huber <marcelhuberfoo at gmail dott com>
+# Maintainer:  Vlad M. <vlad@archlinux.net>
+# Contributor: Marcel Huber <marcelhuberfoo at gmail dott com>
 # Contributor: Markus M. May <mmay AT javafreedom DOT org>
 # Contributor: Yahya Mohajer < yaya_2013 At yahoo Dot com >
 
 pkgname=hudson
-pkgver=3.1.2
+pkgver=3.2.2
 pkgrel=1
-epoch=
 pkgdesc="Extensible continuous integration server"
-arch=(any)
+arch=('any')
 url="http://hudson-ci.org"
 license=('EPL')
-groups=()
-depends=(java-runtime ttf-dejavu libcups)
-makedepends=()
-checkdepends=()
-optdepends=()
-provides=(hudson)
-conflicts=(hudson)
-replaces=(hudson)
-backup=(etc/conf.d/hudson)
-options=()
+depends=('java-runtime'
+         'ttf-dejavu'
+         'libcups')
+backup=('etc/conf.d/hudson')
 install=hudson.install
-changelog=
-source=(http://hudson-ci.org/downloads/war/$pkgver/hudson.war
-        hudson.conf
-        hudson.service
-        hudson.tmpfiles.d
-        )
-noextract=(hudson.war)
-sha256sums=('b33b62559c658b3152f4e905c40ebcf0241b2e36d8bf2bd9f2f23d0c2bb9a8dd'
-            '514f755b90bcb3a88339ab7f4104e9b7fcfebe70038abc008fa8acf450b1a531'
+source=("http://hudson-ci.org/downloads/war/$pkgname-$pkgver.war"
+        'hudson.conf'
+        'hudson.service'
+        'hudson.tmpfiles.d')
+sha256sums=('31d7a97d09118a06990e5a3c7a1e0f39131971c73f32f0efb4299b00bc10e3d1'
+            '784a07d6d0cc2a1fd53114e765ccf44e022e9372c398bfacfa743e95eb7ddc40'
             '00a96b88bb9e98d14697e7e9eb443b0785f074eb1bbba207d3e7dd30d10ebbdf'
             'c61cbcf85c887379a605c1908b5474599b0fce25bd2f8dd567da3ace6a631b08')
+noextract=("$pkgname-$pkgver.war")
+
 package() {
-  install -D -m 444 "$srcdir/hudson.war" "$pkgdir/usr/share/java/hudson/hudson.war"
-  install -D -m 644 "$srcdir/hudson.service" "$pkgdir/usr/lib/systemd/system/hudson.service"
-  install -D -m 644 "$srcdir/hudson.tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/hudson.conf"
-  install -D -m 644 "$srcdir/hudson.conf" "$pkgdir/etc/conf.d/hudson"
+  install -Dm444 "$srcdir/$pkgname-$pkgver.war" "$pkgdir/usr/share/java/hudson/hudson.war"
+  install -Dm644 "$srcdir/hudson.service" "$pkgdir/usr/lib/systemd/system/hudson.service"
+  install -Dm644 "$srcdir/hudson.tmpfiles.d" "$pkgdir/usr/lib/tmpfiles.d/hudson.conf"
+  install -Dm644 "$srcdir/hudson.conf" "$pkgdir/etc/conf.d/hudson"
 }
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/hudson.conf b/hudson.conf
index 1bffd6988422..dd0567e4dc69 100644
--- a/hudson.conf
+++ b/hudson.conf
@@ -9,5 +9,3 @@ HUDSON_PORT=--httpPort=8070
 HUDSON_AJPPORT=--ajp13Port=-1
 HUDSON_OPTS=
 HUDSON_COMMAND_LINE="$JAVA $JAVA_ARGS $JAVA_OPTS -jar $HUDSON_WAR $HUDSON_WEBROOT $HUDSON_PORT $HUDSON_AJPPORT $HUDSON_OPTS"
-
-# vim:set ts=2 sw=2 et:
diff --git a/hudson.install b/hudson.install
index 799dda063c30..5c2b62627a7b 100644
--- a/hudson.install
+++ b/hudson.install
@@ -1,5 +1,4 @@
 #!/bin/sh
-# vim:set ts=2 sw=2 et:
 
 _service_name=hudson.service
 _service_username=hudson