Moved info file and binaries to proper places.

2 files changed, 47 insertions, 15 deletions

diff --git a/etc/ProofGeneral.patch b/etc/ProofGeneral.patch
index 0f7bf186..1a976fc2 100644
--- a/etc/ProofGeneral.patch
+++ b/etc/ProofGeneral.patch
@@ -5,12 +5,12 @@ diff -cr ProofGeneral-2.0/coq/coqtags ProofGeneral-2.0.new/coq/coqtags
 *** 1,4 ****
 ! #!/usr/local/bin/perl4
   #
-  # $Id: coqtags,v 2.1 1998/09/09 14:02:29 da Exp $
+  # $Id: ProofGeneral.patch,v 1.1 1998/09/24 16:47:51 da Exp $
   #
 --- 1,4 ----
 ! #!/usr/bin/perl
   #
-  # $Id: coqtags,v 2.1 1998/09/09 14:02:29 da Exp $
+  # $Id: ProofGeneral.patch,v 1.1 1998/09/24 16:47:51 da Exp $
   #
 diff -cr ProofGeneral-2.0/lego/legotags ProofGeneral-2.0.new/lego/legotags
 *** ProofGeneral-2.0/lego/legotags	Thu Sep 24 16:36:30 1998
@@ -19,11 +19,29 @@ diff -cr ProofGeneral-2.0/lego/legotags ProofGeneral-2.0.new/lego/legotags
 *** 1,4 ****
 ! #!/usr/local/bin/perl
   #
-  # $Id: legotags,v 2.1 1998/09/09 14:02:46 da Exp $
+  # $Id: ProofGeneral.patch,v 1.1 1998/09/24 16:47:51 da Exp $
   #
 --- 1,4 ----
 ! #!/usr/bin/perl
   #
-  # $Id: legotags,v 2.1 1998/09/09 14:02:46 da Exp $
+  # $Id: ProofGeneral.patch,v 1.1 1998/09/24 16:47:51 da Exp $
   #
-
+*** ProofGeneral-2.0/generic/proof-site.el	Thu Sep 24 18:17:33 1998
+--- ProofGeneral-2.0.new/generic/proof-site.el	Thu Sep 24 18:17:43 1998
+***************
+*** 60,66 ****
+    :group 'proof-general)
+  
+  (defcustom proof-info-dir 
+!   (concat proof-home "doc/")
+    "*Where Proof General Info files are installed."
+    :type 'directory
+    :group 'proof-general)
+--- 60,66 ----
+    :group 'proof-general)
+  
+  (defcustom proof-info-dir 
+!   "/usr/info/"
+    "*Where Proof General Info files are installed."
+    :type 'directory
+    :group 'proof-general)
\ No newline at end of file
diff --git a/etc/ProofGeneral.spec b/etc/ProofGeneral.spec
index 1506c2b9..71288007 100644
--- a/etc/ProofGeneral.spec
+++ b/etc/ProofGeneral.spec
@@ -9,6 +9,7 @@ Packager:	David Aspinall <da@dcs.ed.ac.uk>
 Source:		http://www.dcs.ed.ac.uk/proofgen/dist/ProofGeneral-%{version}.tar.gz
 BuildRoot:	/tmp/ProofGeneral-root
 Patch:		ProofGeneral.patch
+PreReq:		/sbin/install-info
 BuildArchitectures: noarch
 
 %description
@@ -36,16 +37,38 @@ rm -f */*.orig
 %build
 
 %install
-mkdir -p ${RPM_BUILD_ROOT}/usr/lib/ProofGeneral
+mkdir -p ${RPM_BUILD_ROOT}/usr/lib/emacs/ProofGeneral
+
+# Put binaries in proper place
+mkdir -p ${RPM_BUILD_ROOT}/usr/bin
+mv lego/legotags coq/coqtags ${RPM_BUILD_ROOT}/usr/bin
+
+# Put info file in proper place.
+mkdir -p ${RPM_BUILD_ROOT}/usr/info
+mv doc/ProofGeneral.info ${RPM_BUILD_ROOT}/usr/info
+gzip ${RPM_BUILD_ROOT}/usr/info/ProofGeneral.info
+# Remove duff bits
+rm -f doc/dir doc/localdir doc/ProofGeneral.texi
+
 cp -pr coq lego isa images generic ${RPM_BUILD_ROOT}/usr/lib/emacs/ProofGeneral
 
+
 %clean
 if [ "X" != "${RPM_BUILD_ROOT}X" ]; then
     rm -rf $RPM_BUILD_ROOT
 fi
 
+%post
+/sbin/install-info /usr/info/ProofGeneral.info.gz /usr/info/dir
+
+%preun
+/sbin/install-info --delete /usr/info/ProofGeneral.info.gz /usr/info/dir
+
 %files
 %attr(-,root,root) %doc BUGS INSTALL doc/*
+%attr(-,root,root) /usr/info/ProofGeneral.info.gz
+%attr(-,root,root) /usr/bin/coqtags
+%attr(-,root,root) /usr/bin/legotags
 %attr(0755,root,root) %dir /usr/lib/emacs/ProofGeneral
 %attr(0755,root,root) %dir /usr/lib/emacs/ProofGeneral/coq
 %attr(-,root,root) %dir /usr/lib/emacs/ProofGeneral/coq/*
@@ -57,12 +80,3 @@ fi
 %attr(-,root,root) %dir /usr/lib/emacs/ProofGeneral/images/*
 %attr(0755,root,root) %dir /usr/lib/emacs/ProofGeneral/generic
 %attr(-,root,root) %dir /usr/lib/emacs/ProofGeneral/generic/*
-
-
-
-
-
-
-
-
-