From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Jun 2013 19:15:04 +0000 (+0200)
Subject: systemd: Fix redundant conflict which confuses the solver.
X-Git-Tag: pango~206
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df49f08912dbb535403ead16c1a89a92ba3d7bc7;p=people%2Fstevee%2Fipfire-3.x.git

systemd: Fix redundant conflict which confuses the solver.
---

diff --git a/systemd/systemd.nm b/systemd/systemd.nm
index 5d971f9e0..ea7d6eab7 100644
--- a/systemd/systemd.nm
+++ b/systemd/systemd.nm
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 204
-release    = 3
+release    = 4
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -290,8 +290,6 @@ packages
 		end
 
 		conflicts
-			nss-myhostname <= 0.3-3
-
 			# Ensure that the version of systemd matches systemd-libs.
 			systemd > %{thisver}
 			systemd < %{thisver}