diff --git a/make_rpm7.py b/make_rpm7.py index 76f9bab..cf2b271 100755 --- a/make_rpm7.py +++ b/make_rpm7.py @@ -238,14 +238,14 @@ def main(): specdir = os.path.join( rpmbase_dir, "SPECS" ) if not os.path.exists(specdir): os.makedirs(specdir) - b.clean_lts_cc_conf(os.path.join(project_base_dir, 'legatus','Lts', 'Projects')) - specname = b.specname(os.path.join(project_base_dir, 'specs')) - b.copy_spec( specdir, os.path.join(project_base_dir, "specs", specname )) + b.clean_lts_cc_conf(os.path.join(project_base_dir, 'legatus', 'Lts', 'Projects')) + specname = b.specname(os.path.join(project_base_dir,'legatus', 'specs')) + b.copy_spec( specdir, os.path.join(project_base_dir, 'legatus', "specs", specname )) full_version = "%s.%s-%s" % ( b.version_maj, b.version_min, b.version_rev ) b.printOptions() - b.pack_sources( project_base_dir, os.path.join( rpmbase_dir, "SOURCES" ) ) + b.pack_sources( os.path.join(project_base_dir, 'legatus'), os.path.join( rpmbase_dir, "SOURCES" ) ) exec_rpmbuild( specdir, specname ) # move rpms to FOO-1.2-345 dstdir = os.path.join( b.output_dir, "%s-%s-%s" % ( b.project_name, b.repository, full_version ) )