Merged revisions 2136-2200,2202-2290,2292-2301 via svnmerge from

[scons.git] / src / engine / SCons / Tool / packaging / rpm.py

diff --git a/src/engine/SCons/Tool/packaging/rpm.py b/src/engine/SCons/Tool/packaging/rpm.py
index 49b8ff85c5d69e0ed4f8ebca63f5755818789a7c..94b7b7aac23c4ab55c60e81bd32f2a831830645e 100644 (file)
--- a/src/engine/SCons/Tool/packaging/rpm.py
+++ b/src/engine/SCons/Tool/packaging/rpm.py
@@ -41,9 +41,7 @@ def package(env, target, source, PACKAGEROOT, NAME, VERSION,
     # initialize the rpm tool
     SCons.Tool.Tool('rpm').generate(env)
 
-    # create the neccesary builder
     bld = env['BUILDERS']['Rpm']
-    env['RPMFLAGS'] = SCons.Util.CLVar('-ta')
 
     bld.push_emitter(targz_emitter)
     bld.push_emitter(specfile_emitter)
@@ -67,8 +65,9 @@ def package(env, target, source, PACKAGEROOT, NAME, VERSION,
         if kw.has_key('ARCHITECTURE'):
             buildarchitecture = kw['ARCHITECTURE']
 
-        srcrpm = '%s-%s-%s.src.rpm' % (NAME, VERSION, PACKAGEVERSION)
-        binrpm = string.replace(srcrpm, 'src', buildarchitecture)
+        fmt = '%s-%s-%s.%s.rpm'
+        srcrpm = fmt % (NAME, VERSION, PACKAGEVERSION, 'src')
+        binrpm = fmt % (NAME, VERSION, PACKAGEVERSION, buildarchitecture)
 
         target = [ srcrpm, binrpm ]