From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 16 Apr 2012 08:56:26 +0000 (+0200)
Subject: radvd: Update to 1.8.5.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=180993faebce075d07e22a798fd1a90355835469;p=ipfire-3.x.git

radvd: Update to 1.8.5.

This release contains minor bugfixes.

Fixes #10091.
---

diff --git a/radvd/radvd.nm b/radvd/radvd.nm
index 7c170ed45..6148528cf 100644
--- a/radvd/radvd.nm
+++ b/radvd/radvd.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = radvd
-version    = 1.8.3
-release    = 4
+version    = 1.8.5
+release    = 1
 
 groups     = System/Daemons
 url        = http://www.litech.org/radvd/
@@ -32,7 +32,6 @@ build
 	end
 
 	configure_options += \
-		--mandir=/usr/share/man \
 		--with-pidfile=/run/radvd/radvd.pid
 
 	prepare_cmds
@@ -59,9 +58,9 @@ end
 
 packages
 	package %{name}
-		requires = /lib/network/network-radvd-config
-
-		prerequires += shadow-utils
+		requires
+			network
+		end
 
 		script prein
 			%{create_user}
diff --git a/radvd/systemd/radvd.service b/radvd/systemd/radvd.service
index 48a6cecd1..02d6874a0 100644
--- a/radvd/systemd/radvd.service
+++ b/radvd/systemd/radvd.service
@@ -4,10 +4,10 @@ Requires=network.target
 After=network.target
 
 [Service]
-ExecStartPre=/lib/network/network-radvd-config start
+ExecStartPre=/usr/lib/network/network-radvd-config start
 ExecStart=/usr/sbin/radvd -C /etc/radvd.conf -u radvd
 ExecReload=/bin/kill -HUP $MAINPID
-ExecStopPost=/lib/network/network-radvd-config stop
+ExecStopPost=/usr/lib/network/network-radvd-config stop
 Type=forking
 PIDFile=/run/radvd/radvd.pid
 Restart=on-failure