From 7aadabd57fb93da426e599d01054ec26e99483c4 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 7 May 2016 20:15:18 -0700 Subject: Remove duplicate entry of "X_RPM_CONFLICTS" in dictionary. (It was there twice) --- src/engine/SCons/Tool/packaging/rpm.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py index 0750113..e5d2f0b 100644 --- a/src/engine/SCons/Tool/packaging/rpm.py +++ b/src/engine/SCons/Tool/packaging/rpm.py @@ -225,7 +225,6 @@ def build_specfile_header(spec): 'X_RPM_EXCLUDEARCH' : 'ExcludeArch: %s\n', 'X_RPM_EXCLUSIVEARCH' : 'ExclusiveArch: %s\n', 'X_RPM_PREFIX' : 'Prefix: %s\n', - 'X_RPM_CONFLICTS' : 'Conflicts: %s\n', # internal use 'X_RPM_BUILDROOT' : 'BuildRoot: %s\n', } -- cgit v0.12