Merge master.

[dcpomatic.git] / platform / linux / dcpomatic.spec.in

diff --git a/platform/linux/dcpomatic.spec.in b/platform/linux/dcpomatic.spec.in
index 30b4053be6f44ab212843d695c39f2e9611b8c0c..3afb136803f2d6686da14be59a1e53747950a6a4 100644 (file)
--- a/platform/linux/dcpomatic.spec.in
+++ b/platform/linux/dcpomatic.spec.in
@@ -13,48 +13,48 @@ files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant
 digital projectors.
 
 %files
-%{_bindir}/dcpomatic
-%{_bindir}/dcpomatic_batch
-%{_bindir}/dcpomatic_cli
-%{_bindir}/dcpomatic_create
-%{_bindir}/dcpomatic_kdm
-%{_bindir}/dcpomatic_server
-%{_bindir}/dcpomatic_server_cli
-%{_datadir}/applications/dcpomatic.desktop
-%{_datadir}/applications/dcpomatic_batch.desktop
-%{_datadir}/applications/dcpomatic_server.desktop
-%{_datadir}/dcpomatic/taskbar_icon.png
-%{_datadir}/icons/hicolor/128x128/apps/dcpomatic.png
-%{_datadir}/icons/hicolor/22x22/apps/dcpomatic.png
-%{_datadir}/icons/hicolor/32x32/apps/dcpomatic.png
-%{_datadir}/icons/hicolor/48x48/apps/dcpomatic.png
-%{_datadir}/icons/hicolor/64x64/apps/dcpomatic.png
-%{_datadir}/locale/de_DE/LC_MESSAGES/dcpomatic.mo
-%{_datadir}/locale/de_DE/LC_MESSAGES/libdcpomatic-wx.mo
-%{_datadir}/locale/de_DE/LC_MESSAGES/libdcpomatic.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/dcpomatic.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/libdcpomatic-wx.mo
-%{_datadir}/locale/es_ES/LC_MESSAGES/libdcpomatic.mo
-%{_datadir}/locale/fr_FR/LC_MESSAGES/dcpomatic.mo
-%{_datadir}/locale/fr_FR/LC_MESSAGES/libdcpomatic-wx.mo
-%{_datadir}/locale/fr_FR/LC_MESSAGES/libdcpomatic.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/dcpomatic.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/libdcpomatic-wx.mo
-%{_datadir}/locale/it_IT/LC_MESSAGES/libdcpomatic.mo
-%{_datadir}/locale/sv_SE/LC_MESSAGES/dcpomatic.mo
-%{_datadir}/locale/sv_SE/LC_MESSAGES/libdcpomatic-wx.mo
-%{_datadir}/locale/sv_SE/LC_MESSAGES/libdcpomatic.mo
-%{_datadir}/locale/nl_NL/LC_MESSAGES/dcpomatic.mo
-%{_datadir}/locale/nl_NL/LC_MESSAGES/libdcpomatic-wx.mo
-%{_datadir}/locale/nl_NL/LC_MESSAGES/libdcpomatic.mo
+%{_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}/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=%{buildroot}/lib/pkgconfig:/usr/local/lib/pkgconfig
-CXXFLAGS="-I%{buildroot}/include" LDFLAGS="-L%{buildroot}/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos-@CENTOS_VERSION@ --disable-tests
+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@