More RPM tweaks.

diff --git a/cscript b/cscript
index 4d4737865ca39a757a2ab3e61368d6055611c833..05a7f868ccbfd6ff8c66580377b41767e0fe025a 100644 (file)
--- 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