Index: lib/viewcvs.py
--- lib/viewcvs.py.orig	2005-08-17 22:45:14.000000000 +0200
+++ lib/viewcvs.py	2006-01-10 06:18:59.000000000 +0100
@@ -479,7 +479,7 @@
 def markup_stream_enscript(lang, fp):
   sys.stdout.flush()
   enscript = popen.pipe_cmds([(os.path.normpath(os.path.join(cfg.options.enscript_path,'enscript')),
-                               '--color', '-W', 'html', '-E' + lang, '-o',
+                               '--color', '--language=html', '-E' + lang, '-o',
                                '-', '-'),
                               ('sed', '-n', '/^<PRE>$/,/<\\/PRE>$/p')])
 
Index: viewcvs-install
--- viewcvs-install.orig	2001-12-21 12:59:45.000000000 +0100
+++ viewcvs-install	2006-01-10 06:17:05.000000000 +0100
@@ -52,6 +52,7 @@
 
 ## installer defaults
 ROOT_DIR = "/usr/local/viewcvs-" + version
+RPM_BUILD_ROOT = "@RPM_BUILD_ROOT@"
 
 
 ## list of files for installation
@@ -75,7 +75,7 @@
     ("lib/PyFontify.py", "lib/PyFontify.py", 0644, 0, 0, 1),
     ("lib/blame.py", "lib/blame.py", 0644, 0, 0, 1),
     ("lib/compat.py", "lib/compat.py", 0644, 0, 0, 1),
-    ("lib/config.py", "lib/config.py", 0644, 0, 0, 1),
+    ("lib/config.py", "lib/config.py", 0644, 1, 0, 1),
     ("lib/cvsdb.py", "lib/cvsdb.py", 0644, 1, 0, 1),
     ("lib/dbi.py", "lib/dbi.py", 0644, 0, 0, 1),
     ("lib/debug.py", "lib/debug.py", 0644, 0, 0, 1),
@@ -159,6 +160,8 @@
 def InstallFile(src_path, dest_path, mode, set_python_paths, prompt_replace,
                 compile_it):
   dest_path = os.path.join(ROOT_DIR, dest_path)
+  dest_path = "." + dest_path
+  dest_path = os.path.join(RPM_BUILD_ROOT, dest_path)
     
   if prompt_replace and os.path.exists(dest_path):
     # Collect ndiff output from ndiff