bump vers 4.0.4 - new systemd service upstream

3 files changed, 13 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b0f9758fc40..65115d8e12bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 # Generated by mksrcinfo v8
-# Mon Dec 28 02:38:46 UTC 2015
+# Thu Feb  4 20:57:55 UTC 2016
 pkgbase = collectl
 	pkgdesc = A tool for viewing and gethering system performance metrics.
-	pkgver = 4.0.2
-	pkgrel = 3
+	pkgver = 4.0.4
+	pkgrel = 1
 	url = http://collectl.sourceforge.net/
 	arch = any
 	license = GPL2
 	license = custom:artistic
 	depends = perl
 	backup = etc/collectl.conf
-	source = http://sourceforge.net/projects/collectl/files/collectl/collectl-4.0.2/collectl-4.0.2.src.tar.gz
-	source = collectl.service
-	md5sums = 8502fbb30539e6f9ac962b8577a863b4
-	md5sums = 1a840bf752b462164d9192a5d51816d3
+	source = http://sourceforge.net/projects/collectl/files/collectl/collectl-4.0.4/collectl-4.0.4.src.tar.gz
+	md5sums = 40765d3afc8f96a7744d4249b12fc606
 
 pkgname = collectl
 
diff --git a/PKGBUILD b/PKGBUILD
index 88d6be556634..a3b218cf910b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,25 @@
 # Maintainer: George Angelopoulos <george@usermod.net>
 
 pkgname=collectl
-pkgver=4.0.2
-pkgrel=3
+pkgver=4.0.4
+pkgrel=1
 pkgdesc="A tool for viewing and gethering system performance metrics."
 arch=('any')
 url="http://collectl.sourceforge.net/"
 license=('GPL2' 'custom:artistic')
 depends=('perl')
 backup=('etc/collectl.conf')
-source=("http://sourceforge.net/projects/collectl/files/collectl/${pkgname}-${pkgver}/${pkgname}-${pkgver}.src.tar.gz"
-        "collectl.service")
-md5sums=('8502fbb30539e6f9ac962b8577a863b4'
-         '1a840bf752b462164d9192a5d51816d3')
+source=("http://sourceforge.net/projects/collectl/files/collectl/${pkgname}-${pkgver}/${pkgname}-${pkgver}.src.tar.gz")
+md5sums=('40765d3afc8f96a7744d4249b12fc606')
 
 package() {
 	cd "${pkgname}-${pkgver}"
     DESTDIR="${pkgdir}" ./INSTALL
 
+    # systemd service file exists upstream but is not handled quite well by
+    # the upstream INSTALL script. We install it here explicitly.
+    install -D -m644 service/${pkgname}.service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+
     # we don't have sysv init in arch
     rm -rf ${pkgdir}/etc/init.d
 
@@ -29,5 +31,4 @@ package() {
     # match with any of the common ones in Arch Linux, we'll copy the
     # artistic license here as custom.
     install -D -m644 ARTISTIC "${pkgdir}/usr/share/licenses/${pkgname}/ARTISTIC"
-    install -D -m644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 }
diff --git a/collectl.service b/collectl.service
deleted file mode 100644
index 1aaf1b1c4de7..000000000000
--- a/collectl.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=collectl metric collection
-
-[Service]
-Type=forking
-PIDFile=/var/run/collectl.pid
-ExecStart=/usr/bin/collectl -D
-ExecReload=/bin/kill -USR1 $MAINPID
-
-[Install]
-WantedBy=multi-user.target