From 4f8a3a75b44dfdbaf99e30a8fb7b4e9e8b765bd7cd82f8f057d6dc11763a2ad6 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 1 Jul 2013 14:31:56 +0000 Subject: [PATCH] Accepting request 181632 from home:bernhard-voelker:branches:Base:System Correct condition for Conflicts of sysvinit-tools. OBS-URL: https://build.opensuse.org/request/show/181632 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=176 --- util-linux.changes | 7 ++++++- util-linux.spec | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/util-linux.changes b/util-linux.changes index d73a92c..b0154a4 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Mon Jul 1 13:43:23 UTC 2013 - mail@bernhard-voelker.de + +- Correct condition for Conflicts of sysvinit-tools. + ------------------------------------------------------------------- Mon Jul 1 07:08:46 UTC 2013 - werner@suse.de -- Correct version in source URL path +- Correct version in source URL path. ------------------------------------------------------------------- Fri Jun 28 17:42:14 CEST 2013 - sbrabec@suse.cz diff --git a/util-linux.spec b/util-linux.spec index f31bd3f..bfb2abf 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -125,7 +125,7 @@ Obsoletes: login < 4.0-33.7 # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. Conflicts: coreutils < 8.21 %endif -%if %{with enable_su} +%if %{with sysvinit_tools} # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 %endif