summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/CHANGES.txt1
-rw-r--r--src/engine/SCons/Tool/packaging/rpm.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 69fb621..4ae9cb2 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -43,6 +43,7 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
- May find new (previously missed) Dlang dependencies.
- May cause rebuild after upgrade due to dependency changes.
- Updated Fortran-related tests to pass under GCC 5/6.
+ - Fixed SCons.Tool.Packaging.rpm.package source nondeterminism across builds.
RELEASE 2.5.0 - Mon, 09 Apr 2016 11:27:42 -0700
diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py
index 25b5875..0c3e1ed 100644
--- a/src/engine/SCons/Tool/packaging/rpm.py
+++ b/src/engine/SCons/Tool/packaging/rpm.py
@@ -95,6 +95,8 @@ def collectintargz(target, source, env):
# find the .spec file for rpm and add it since it is not necessarily found
# by the FindSourceFiles function.
sources.extend( [s for s in source if str(s).rfind('.spec')!=-1] )
+ # sort to keep sources from changing order across builds
+ sources.sort()
# as the source contains the url of the source package this rpm package
# is built from, we extract the target name