From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 23 Nov 2011 22:54:27 +0000 (+0100)
Subject: mstpd: Replace rstp package.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43a405aa48216dc988314fc35253358ffc2e53c8;p=ipfire-3.x.git

mstpd: Replace rstp package.
---

diff --git a/mstpd/mstpd.nm b/mstpd/mstpd.nm
index d98100ad7..24fd0925b 100644
--- a/mstpd/mstpd.nm
+++ b/mstpd/mstpd.nm
@@ -6,7 +6,7 @@
 name       = mstpd
 version    = 0.01
 svn_ver    = 16
-release    = 0.2-svn%{svn_ver}.3
+release    = 0.2-svn%{svn_ver}.4
 thisapp    = %{name}-%{version}-svn%{svn_ver}
 
 groups     = Networking/Tools
@@ -40,6 +40,10 @@ packages
 		# was brought up. It was fixed in 3.0.4-11.
 		conflicts += kernel<3.0.4-11
 
+		# Replace rstp.
+		provides  += rstp=0.21-9
+		obsoletes += rstp<0.21-9
+
 		script postin
 			/bin/systemctl daemon-reload >/dev/null 2>&1 || :
 			/bin/systemctl --no-reload enable mstpd.service >/dev/null 2>&1 || :