Possibly inaccurate port of master; build system cleanups.

2 files changed, 0 insertions, 84 deletions

diff --git a/platform/linux/dcpomatic.spec.in b/platform/linux/dcpomatic.spec.in
deleted file mode 100644
index 7f39716d4..000000000
--- a/platform/linux/dcpomatic.spec.in
+++ /dev/null
@@ -1,74 +0,0 @@
-Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files
-Name:dcpomatic2
-Version:@VERSION@
-Release:1%{?dist}
-License:GPL
-Group:Applications/Multimedia
-URL:http://dcpomatic.com/
-Requires: ImageMagick-c++, glibmm24, libzip
-
-%description
-DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio
-files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
-digital projectors.
-
-%files
-%{_bindir}/dcpomatic2
-%{_bindir}/dcpomatic2_batch
-%{_bindir}/dcpomatic2_cli
-%{_bindir}/dcpomatic2_create
-%{_bindir}/dcpomatic2_kdm
-%{_bindir}/dcpomatic2_server
-%{_bindir}/dcpomatic2_server_cli
-%{_datadir}/applications/dcpomatic2.desktop
-%{_datadir}/applications/dcpomatic2_batch.desktop
-%{_datadir}/applications/dcpomatic2_server.desktop
-%{_datadir}/dcpomatic2/taskbar_icon.png
-%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf
-%{_datadir}/icons/hicolor/128x128/apps/dcpomatic2.png
-%{_datadir}/icons/hicolor/22x22/apps/dcpomatic2.png
-%{_datadir}/icons/hicolor/32x32/apps/dcpomatic2.png
-%{_datadir}/icons/hicolor/48x48/apps/dcpomatic2.png
-%{_datadir}/icons/hicolor/64x64/apps/dcpomatic2.png
-%{_datadir}/locale/de_DE/LC_MESSAGES/dcpomatic2.mo
-%{_datadir}/locale/de_DE/LC_MESSAGES/libdcpomatic2-wx.mo
-%{_datadir}/locale/de_DE/LC_MESSAGES/libdcpomatic2.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/dcpomatic2.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/libdcpomatic2-wx.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/libdcpomatic2.mo
-%{_datadir}/locale/fr_FR/LC_MESSAGES/dcpomatic2.mo
-%{_datadir}/locale/fr_FR/LC_MESSAGES/libdcpomatic2-wx.mo
-%{_datadir}/locale/fr_FR/LC_MESSAGES/libdcpomatic2.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/dcpomatic2.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/libdcpomatic2-wx.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/libdcpomatic2.mo
-%{_datadir}/locale/sv_SE/LC_MESSAGES/dcpomatic2.mo
-%{_datadir}/locale/sv_SE/LC_MESSAGES/libdcpomatic2-wx.mo
-%{_datadir}/locale/sv_SE/LC_MESSAGES/libdcpomatic2.mo
-%{_datadir}/locale/nl_NL/LC_MESSAGES/dcpomatic2.mo
-%{_datadir}/locale/nl_NL/LC_MESSAGES/libdcpomatic2-wx.mo
-%{_datadir}/locale/nl_NL/LC_MESSAGES/libdcpomatic2.mo
-
-%prep
-rm -rf $RPM_BUILD_DIR/dcpomatic-@VERSION@
-tar xjf $RPM_SOURCE_DIR/dcpomatic-@VERSION@.tar.bz2
-%build
-cd dcpomatic-@VERSION@
-export PKG_CONFIG_PATH=@INSTALL_PREFIX@/lib/pkgconfig:/usr/local/lib/pkgconfig
-CXXFLAGS="-I@INSTALL_PREFIX@/include" LDFLAGS="-L@INSTALL_PREFIX@/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos-@CENTOS_VERSION@ --disable-tests
-./waf
-%install
-cd dcpomatic-@VERSION@
-./waf install
-
-%post
-/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
diff --git a/platform/linux/wscript b/platform/linux/wscript
index 336c1bcb0..5f1dc48a2 100644
--- a/platform/linux/wscript
+++ b/platform/linux/wscript
@@ -17,14 +17,4 @@ def build(bld):
     obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
     obj.VERSION = bld.env.VERSION
 
-    obj = bld(features='subst')
-    obj.source = 'dcpomatic.spec.in'
-    obj.target = 'dcpomatic2.spec'
-    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', ['dcpomatic2.desktop', 'dcpomatic2_batch.desktop', 'dcpomatic2_server.desktop'])