[pvs-sbcl/f18] more FTBFS fixes

[Rex Dieter]

commit ac1d0a75aea2ec92e28f2e7c01a52fa992e2f460
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 10 09:20:52 2012 -0600

    more FTBFS fixes
    
    ensure %%_texmf_main is defined
    workaround texlive-2012 vs. index{"\|- at ... deathmatch

 pvs-sbcl-5.0-index_vdash.patch |   21 +++++++++++++++++++++
 pvs-sbcl.spec                  |    7 +++++++
 2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/pvs-sbcl-5.0-index_vdash.patch b/pvs-sbcl-5.0-index_vdash.patch
new file mode 100644
index 0000000..5d696cb
--- /dev/null
+++ b/pvs-sbcl-5.0-index_vdash.patch
@@ -0,0 +1,21 @@
+Not exactly sure what the "|-@ is supposed to do, but it seems to
+confuse texlive-2012 in fedora 18+:
+
+! Extra }, or forgotten \endgroup.
+l.35   \item $\vdash$}
+
+So quick-n-dirty fix is to omit that part for now -- rex
+
+
+diff -up pvs-sbcl-5.0/doc/user-guide/ug-commands.tex.vdash pvs-sbcl-5.0/doc/user-guide/ug-commands.tex
+--- pvs-sbcl-5.0/doc/user-guide/ug-commands.tex.vdash	2011-04-15 12:45:08.000000000 -0500
++++ pvs-sbcl-5.0/doc/user-guide/ug-commands.tex	2012-12-10 08:48:10.022024812 -0600
+@@ -1985,7 +1985,7 @@ pathname of \texttt{wish}).
+ 
+ The \cmd{x-show-current-proof} command creates a window showing the
+ cur\-rent proof tree.  Every sequent in the tree is represented by a
+-$\vdash$ symbol\index{"|-@$\vdash$}.  The proof commands used to create
++$\vdash$ symbol\index{$\vdash$}.  The proof commands used to create
+ the tree will also be shown between the $\vdash$ symbols.  This tree will
+ be automatically updated after every proof command.
+ 
diff --git a/pvs-sbcl.spec b/pvs-sbcl.spec
index 5c7bddf..1b05548 100644
--- a/pvs-sbcl.spec
+++ b/pvs-sbcl.spec
@@ -1,3 +1,7 @@
+
+# workaround http://bugzilla.redhat.com/885762
+%{?!_texmf_main:%global _texmf_main %{_datadir}/texmf}}
+
 Name:           pvs-sbcl
 Version:        5.0
 Release:        16%{?dist}
@@ -26,6 +30,8 @@ Patch1:         pvs-hashfn.patch
 Patch2:         pvs-chmod.patch
 # This patch was sent upstream 20 Jan 2012.  It adapts to Emacs 24.
 Patch3:         pvs-emacs.patch
+# fix/workaround problems generating user-guide.pdf on f18+ -- rex
+Patch4:         pvs-sbcl-5.0-index_vdash.patch
 
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils
@@ -74,6 +80,7 @@ the lvm2 package.
 %patch1
 %patch2
 %patch3
+%patch4 -p1 -b .index_vdash
 
 # Upstream didn't give us a configure script
 autoreconf -i