Fix a bunch of unescaped %s.

diff --git a/cscript b/cscript
index 04ade29247640c3aee35adb77f8f5895f938f64d..10aed75dda0df66a6187ae4ba5e9841c337ac715 100644 (file)
--- a/cscript
+++ b/cscript
@@ -217,36 +217,36 @@ def make_spec(filename, version, target):
     print('Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files', file=f)
     print('Name:dcpomatic2', file=f)
     print('Version:%s' % version, file=f)
-    print('Release:1%{?dist}', file=f)
+    print('Release:1%%{?dist}', file=f)
     print('License:GPL', file=f)
     print('Group:Applications/Multimedia', file=f)
     print('URL:http://dcpomatic.com/', file=f)
     print('Requires: ImageMagick-c++, glibmm24, libzip', file=f)
     print('', file=f)
-    print('%description', file=f)
+    print('%%description', file=f)
     print('DCP-o-matic generates Digital Cinema Packages (DCPs) from video and audio ', file=f)
     print('files (such as those from DVDs or Blu-Rays) for presentation on DCI-compliant ', file=f)
     print('digital projectors.', file=f)
     print('', file=f)
-    print('%files', file=f)
-    print('%{_bindir}/dcpomatic2', file=f)
-    print('%{_bindir}/dcpomatic2_batch', file=f)
-    print('%{_bindir}/dcpomatic2_cli', file=f)
-    print('%{_bindir}/dcpomatic2_create', file=f)
-    print('%{_bindir}/dcpomatic2_kdm', file=f)
-    print('%{_bindir}/dcpomatic2_server', file=f)
-    print('%{_bindir}/dcpomatic2_server_cli', file=f)
-    print('%{_bindir}/dcpomatic2_kdm_cli', file=f)
-    print('%{_bindir}/dcpomatic2_player', file=f)
-    print('%{_datadir}/applications/dcpomatic2.desktop', file=f)
-    print('%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
-    print('%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
-    print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
-    print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f)
-    print('%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
-    print('%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
-    print('%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f)
-    print('%{_datadir}/dcpomatic2/splash.png', file=f)
+    print('%%files', file=f)
+    print('%%{_bindir}/dcpomatic2', file=f)
+    print('%%{_bindir}/dcpomatic2_batch', file=f)
+    print('%%{_bindir}/dcpomatic2_cli', file=f)
+    print('%%{_bindir}/dcpomatic2_create', file=f)
+    print('%%{_bindir}/dcpomatic2_kdm', file=f)
+    print('%%{_bindir}/dcpomatic2_server', file=f)
+    print('%%{_bindir}/dcpomatic2_server_cli', file=f)
+    print('%%{_bindir}/dcpomatic2_kdm_cli', file=f)
+    print('%%{_bindir}/dcpomatic2_player', file=f)
+    print('%%{_datadir}/applications/dcpomatic2.desktop', file=f)
+    print('%%{_datadir}/applications/dcpomatic2_batch.desktop', file=f)
+    print('%%{_datadir}/applications/dcpomatic2_server.desktop', file=f)
+    print('%%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
+    print('%%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f)
+    print('%%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf', file=f)
+    print('%%{_datadir}/dcpomatic2/LiberationSans-Italic.ttf', file=f)
+    print('%%{_datadir}/dcpomatic2/LiberationSans-Bold.ttf', file=f)
+    print('%%{_datadir}/dcpomatic2/splash.png', file=f)
     for r in ['128x128', '16x16', '22x22', '256x256', '32x32', '48x48', '512x512', '64x64']:
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_batch.png' % r, file=f)
@@ -258,31 +258,31 @@ def make_spec(filename, version, target):
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2-wx.mo' % l, file=f)
         print('%%{_datadir}/locale/%s/LC_MESSAGES/libdcpomatic2.mo' % l, file=f)
     print('', file=f)
-    print('%prep', file=f)
+    print('%%prep', file=f)
     print('rm -rf $RPM_BUILD_DIR/dcpomatic-%s' % version, file=f)
     print('tar xjf $RPM_SOURCE_DIR/dcpomatic-%s.tar.bz2' % version, file=f)
-    print('%build', file=f)
+    print('%%build', file=f)
     print('cd dcpomatic-%s' % version, file=f)
     print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig' % (target.directory, target.directory), file=f)
 
-    print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr %s' %
+    print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' %
           (target.directory, target.directory, configure_options(target)), file=f)
     print('./waf', file=f)
-    print('%install', file=f)
+    print('%%install', file=f)
     print('cd dcpomatic-%s' % version, file=f)
     print('./waf install', file=f)
     print('', file=f)
-    print('%post', file=f)
-    print('/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
+    print('%%post', file=f)
+    print('/bin/touch --no-create %%{_datadir}/icons/hicolor &>/dev/null || :', file=f)
     print('', file=f)
-    print('%postun', file=f)
+    print('%%postun', file=f)
     print('if [ $1 -eq 0 ] ; then', file=f)
-    print('    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null', file=f)
-    print('    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
+    print('    /bin/touch --no-create %%{_datadir}/icons/hicolor &>/dev/null', file=f)
+    print('    /usr/bin/gtk-update-icon-cache %%{_datadir}/icons/hicolor &>/dev/null || :', file=f)
     print('fi', file=f)
     print('', file=f)
-    print('%posttrans', file=f)
-    print('/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :', file=f)
+    print('%%posttrans', file=f)
+    print('/usr/bin/gtk-update-icon-cache %%{_datadir}/icons/hicolor &>/dev/null || :', file=f)
 
 def dependencies(target):