Merge master.

3 files changed, 24 insertions, 13 deletions

diff --git a/platform/linux/dcpomatic.spec.in b/platform/linux/dcpomatic.spec.in
index 46a0d1ce4..f39c2cbd8 100644
--- a/platform/linux/dcpomatic.spec.in
+++ b/platform/linux/dcpomatic.spec.in
@@ -1,6 +1,6 @@
 Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files
 Name:dcpomatic
-Version:@version@
+Version:@VERSION@
 Release:1%{?dist}
 License:GPL
 Group:Applications/Multimedia
@@ -49,15 +49,15 @@ digital projectors.
 %{_datadir}/locale/nl_NL/LC_MESSAGES/libdcpomatic.mo
 
 %prep
-rm -rf $RPM_BUILD_DIR/dcpomatic-@version@
-tar xjf $RPM_SOURCE_DIR/dcpomatic-@version@.tar.bz2
+rm -rf $RPM_BUILD_DIR/dcpomatic-@VERSION@
+tar xjf $RPM_SOURCE_DIR/dcpomatic-@VERSION@.tar.bz2
 %build
-cd dcpomatic-@version@
+cd dcpomatic-@VERSION@
 export PKG_CONFIG_PATH=/home/carl/lib/pkgconfig:/usr/local/lib/pkgconfig
-CXXFLAGS="-I/home/carl/include" LDFLAGS="-L/home/carl/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos
+CXXFLAGS="-I/home/carl/include" LDFLAGS="-L/home/carl/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos-@CENTOS_VERSION@ --disable-tests
 ./waf
 %install
-cd dcpomatic-@version@
+cd dcpomatic-@VERSION@
 ./waf install
 
 %post
diff --git a/platform/linux/wscript b/platform/linux/wscript
index fe6f4e2db..3aab4f7fb 100644
--- a/platform/linux/wscript
+++ b/platform/linux/wscript
@@ -1,25 +1,30 @@
 def build(bld):
-    d = { 'INSTALL_PREFIX' : bld.env.INSTALL_PREFIX }
-    d = { 'VERSION' : bld.env.VERSION }
-
     obj = bld(features='subst')
     obj.source = 'dcpomatic.desktop.in'
     obj.target = 'dcpomatic.desktop'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
 
     obj = bld(features='subst')
     obj.source = 'dcpomatic_batch.desktop.in'
     obj.target = 'dcpomatic_batch.desktop'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
 
     obj = bld(features='subst')
     obj.source = 'dcpomatic_server.desktop.in'
     obj.target = 'dcpomatic_server.desktop'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
 
     obj = bld(features='subst')
     obj.source = 'dcpomatic.spec.in'
     obj.target = 'dcpomatic.spec'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
+    if bld.env.TARGET_CENTOS_6:
+        obj.CENTOS_VERSION = '6'
+    elif bld.env.TARGET_CENTOS_7:
+        obj.CENTOS_VERSION = '7'
 
     bld.install_files('${PREFIX}/share/applications', ['dcpomatic.desktop', 'dcpomatic_batch.desktop', 'dcpomatic_server.desktop'])
diff --git a/platform/windows/wscript b/platform/windows/wscript
index 65989300b..19c204f62 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -132,26 +132,32 @@ SetOutPath "$INSTDIR\\locale\\fr\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/fr_FR/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/fr_FR/dcpomatic.mo"
+File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\it\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/it_IT/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/it_IT/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/it_IT/dcpomatic.mo"
+File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\es\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/es_ES/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/es_ES/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/es_ES/dcpomatic.mo"
+File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\sv\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo"
+File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\de\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/de_DE/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/de_DE/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/de_DE/dcpomatic.mo"
+File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\nl\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/nl_NL/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/nl_NL/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/nl_NL/dcpomatic.mo"
+File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd.mo"
 
 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)"
 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "UninstallString" "$INSTDIR\\Uninstall.exe"