else:
ffmpeg_options = {}
- return (('ffmpeg-cdist', '0e27b2b', ffmpeg_options),
- ('libdcp', 'b3adb83'),
- ('libsub', 'e959731'))
+ return (('ffmpeg-cdist', 'd0986a9', ffmpeg_options),
+ ('libdcp', '1f18188'),
+ ('libsub', 'b92c8d3'))
def configure_options(target):
opt = ''
return debs
-def package_centos(target, cpu, version):
+def package_rpm(target, cpu, version):
topdir = os.path.realpath('build/rpmbuild')
os.makedirs('%s/BUILD' % topdir)
os.makedirs('%s/RPMS' % topdir)
else:
cpu = "i686"
+ print 'Looking in %s/RPMS/%s/*.rpm' % (topdir, cpu)
for p in glob.glob('%s/RPMS/%s/*.rpm' % (topdir, cpu)):
+ print 'found %s' % p
rpms.append(os.path.abspath(p))
return rpms
if target.distro == 'debian' or target.distro == 'ubuntu':
return package_debian(target, cpu, version)
- elif target.distro == 'centos':
- return package_centos(target, cpu, version)
+ elif target.distro == 'centos' or target.distro == 'fedora':
+ return package_rpm(target, cpu, version)
elif target.platform == 'osx':
target.command('bash platform/osx/make_dmg.sh %s' % target.directory)
return os.path.abspath(glob.glob('build/platform/osx/DCP-o-matic*.dmg')[0])