Disallow referencing of Interop DCPs in SMPTE films, and vice versa (#804).

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index 60c825780201fed04163acf7a1276944d7e4dc28..e969a523614b349f9911d4f6fb43564bb2872636 100644 (file)
--- a/cscript
+++ b/cscript
@@ -205,7 +205,7 @@ def make_spec(filename, version, target):
     print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig' % (target.directory, target.directory), file=f)
 
     if target.distro == 'centos' and target.version == '5':
-        prefix = './usr'
+        prefix = 'BUILDROOT/usr'
     else:
         prefix = '%%{buildroot}/usr'
 
@@ -236,7 +236,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'cd922b8', ffmpeg_options),
-            ('libdcp', '4e6b78d'),
+            ('libdcp', '043d382'),
             ('libsub', 'b082fb6'))
 
 def configure_options(target):
@@ -323,7 +323,10 @@ def package_rpm(target, cpu, version):
         )
 
     make_spec('build/platform/linux/dcpomatic2.spec', version, target)
-    target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir)
+    cmd = 'rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir
+    if target.distro == 'centos' and target.version == '5':
+        cmd += ' --buildroot %s/BUILD/dcpomatic-%s/BUILDROOT' % (topdir, version)
+    target.command(cmd)
     rpms = []
 
     if cpu == "amd64":