diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-14 11:53:57 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-15 17:51:26 +0100 |
| commit | cd4ad2186dba563db5b803963a86501f0b1e60f9 (patch) | |
| tree | 5eac3d993f3fba160001a1f1f3acb686a66fa316 /platform/linux | |
| parent | 54722a657f9fe01def18ef7afbac58e30d79a3d5 (diff) | |
More centos build fixes.
Diffstat (limited to 'platform/linux')
| -rw-r--r-- | platform/linux/dcpomatic.spec.in | 12 | ||||
| -rw-r--r-- | platform/linux/wscript | 19 |
2 files changed, 18 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']) |