From 6f3bd7f8b5eb02a4fc8d1f93583b02191b08fbb8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 4 Aug 2014 21:02:13 +0100 Subject: More RPM tweaks. --- cscript | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'cscript') diff --git a/cscript b/cscript index 4d4737865..05a7f868c 100644 --- a/cscript +++ b/cscript @@ -217,25 +217,26 @@ def package_debian(target, cpu, version): return debs def package_centos(target, cpu, version): - os.makedirs('build/rpmbuild/BUILD') - os.makedirs('build/rpmbuild/RPMS') - os.makedirs('build/rpmbuild/SOURCES') - os.makedirs('build/rpmbuild/SPECS') - os.makedirs('build/rpmbuild/SRPMS') + topdir = os.path.realpath('build/rpmbuild') + os.makedirs('%s/BUILD' % topdir) + os.makedirs('%s/RPMS' % topdir) + os.makedirs('%s/SOURCES' % topdir) + os.makedirs('%s/SPECS' % topdir) + os.makedirs('%s/SRPMS' % topdir) target.command('./waf dist') shutil.copyfile( "%s/src/dcpomatic/dcpomatic-%s.tar.bz2" % (target.directory, version), - "build/rpmbuild/SOURCES/dcpomatic-%s.tar.bz2" % version + "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version) ) - target.command('rpmbuild --define \'_topdir build/rpmbuild\' -bb build/platform/linux/dcpomatic.spec') + target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic.spec' % topdir) rpms = [] if cpu == "amd64": cpu = "x86_64" - for p in glob.glob('build/rpmbuild/RPMS/%s/*.rpm' % cpu): + for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)): rpms.append(os.path.abspath(p)) return rpms -- cgit v1.2.3