Merge master.

[dcpomatic.git] / cscript

diff --git a/cscript b/cscript
index cfd5f67620458b6ab0d011bec235d8bacaf264de..795cf0a35000f85b6ec96a220d4fa7455b97c203 100644 (file)
--- a/cscript
+++ b/cscript
@@ -156,8 +156,9 @@ def make_control(debian_version, bits, filename, debug):
         print >>f,''
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '7e95caa'),
-            ('libdcp', '2001bef5b3a6256eedf1cada4977a3ba8a3732cd'))
+    return (('ffmpeg-cdist', '2dffa11'),
+            ('libdcp', '1.0'),
+            ('libsub', None))
 
 def build(target, options):
     cmd = './waf configure --prefix=%s' % target.directory
@@ -230,7 +231,7 @@ def package_centos(target, cpu, version):
         "%s/SOURCES/dcpomatic-%s.tar.bz2" % (topdir, version)
         )
 
-    target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic.spec' % topdir)
+    target.command('rpmbuild --define \'_topdir %s\' -bb build/platform/linux/dcpomatic2.spec' % topdir)
     rpms = []
 
     if cpu == "amd64":