diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-05-08 03:15:18 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-05-08 03:15:18 (GMT) |
| commit | 7aadabd57fb93da426e599d01054ec26e99483c4 (patch) | |
| tree | 1b52a267d64b02af4c93d33aa82ee684da598de2 | |
| parent | 3e0a831c7fcd60384266e14641a3a15f2cba1ced (diff) | |
| download | SCons-7aadabd57fb93da426e599d01054ec26e99483c4.zip SCons-7aadabd57fb93da426e599d01054ec26e99483c4.tar.gz SCons-7aadabd57fb93da426e599d01054ec26e99483c4.tar.bz2 | |
Remove duplicate entry of "X_RPM_CONFLICTS" in dictionary. (It was there twice)
| -rw-r--r-- | src/engine/SCons/Tool/packaging/rpm.py | 1 |
1 files changed, 0 insertions, 1 deletions
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', } |