rpms/coq/devel coq-lablgtk-2.12.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 cmxa-install.patch, 1.2, 1.3 coq.spec, 1.7, 1.8 import.log, 1.5, 1.6 sources, 1.3, 1.4

[Alan Dunn]

Author: amdunn

Update of /cvs/pkgs/rpms/coq/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19959/devel

Modified Files:
	.cvsignore cmxa-install.patch coq.spec import.log sources 
Added Files:
	coq-lablgtk-2.12.patch 
Log Message:
Minor fixes - fixed to work with lablgtk 2.12 (so it build in rawhide),
minor adjustment of another patch's invocation and contents so it
works as desired before.


coq-lablgtk-2.12.patch:

--- NEW FILE coq-lablgtk-2.12.patch ---
--- ide/undo_lablgtk_ge26.mli	2005-11-18 12:09:10.000000000 -0500
+++ ide/undo_lablgtk_ge26.mli	2009-03-03 21:29:37.000000000 -0500
@@ -24,6 +24,7 @@
     ?cursor_visible:bool ->
     ?justification:GtkEnums.justification ->
     ?wrap_mode:GtkEnums.wrap_mode ->
+    ?accepts_tab:bool ->
     ?border_width:int ->
     ?width:int ->
     ?height:int ->


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Dec 2008 15:49:55 -0000	1.3
+++ .cvsignore	4 Mar 2009 16:58:27 -0000	1.4
@@ -2,7 +2,6 @@
 Coq-RecTutorial.pdf.gz
 Coq-Reference-Manual.pdf.gz
 Coq-Tutorial.v.pdf.gz
-coq-8.1pl3.tar.gz
+coq-8.1pl4.tar.gz
 coq-refman-html.tar.gz
 coq-stdlib-html.tar.gz
-coq-8.1pl4.tar.gz

cmxa-install.patch:

Index: cmxa-install.patch
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/cmxa-install.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cmxa-install.patch	5 Dec 2008 15:49:55 -0000	1.2
+++ cmxa-install.patch	4 Mar 2009 16:58:27 -0000	1.3
@@ -1,5 +1,5 @@
---- coq-8.1pl4/Makefile.orig	2008-12-05 15:16:52.000000000 +0000
-+++ coq-8.1pl4/Makefile	2008-12-05 15:17:27.000000000 +0000
+--- Makefile	2009-03-02 12:14:34.000000000 -0500
++++ Makefile	2009-03-02 12:16:02.000000000 -0500
 @@ -1274,7 +1274,11 @@
  
  OBJECTCMI=$(OBJSCMO:.cmo=.cmi)


Index: coq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/coq.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- coq.spec	24 Feb 2009 09:10:32 -0000	1.7
+++ coq.spec	4 Mar 2009 16:58:27 -0000	1.8
@@ -48,9 +48,11 @@
 Patch3:		check.patch
 Patch4:		makefile-parser.patch
 Patch5:		parser-man.patch
+Patch6:		coq-lablgtk-2.12.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ocaml >= 3.08, ocaml-camlp5-devel, gtk2-devel, ocaml-lablgtk-devel, desktop-file-utils, emacs, prelink
 
+
 %if 0%{?fedora} < 9
 BuildRequires: tetex, tetex-latex
 # There's no ocaml-camlp5-devel for ppc64 in Fedora <= 8
@@ -152,7 +154,7 @@
 # variable, but unsure, so no change made
 
 %patch0
-%patch1 -p1
+%patch1
 
 # I created patch3 to consistently strip native-code binaries, unlike
 # the inconsistent way it was done in the original makefile
@@ -171,6 +173,11 @@
 %patch5
 mv man/parser.1 man/coq-parser.1
 
+# Minor fix to accommodate a changed signature in lablgtk 2.12
+if grep accepts_tab %{_libdir}/ocaml/lablgtk2/gText.mli; then
+%patch6
+fi
+
 # Fix some files that are not in UTF-8 encoding
 
 for f in CHANGES CREDITS COPYRIGHT; do
@@ -333,8 +340,9 @@
 
 
 %changelog
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.1pl4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Wed Mar 04 2009 Alan Dunn <amdunn at gmail.com> - 8.1pl4-2
+- Minor change to cmxa-install patch instruction
+- Fixed to work with lablgtk 2.12
 
 * Fri Dec  5 2008 Richard W.M. Jones <rjones at redhat.com> - 8.1pl4-1
 - New upstream version 8.1pl4.


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	22 Oct 2008 19:23:11 -0000	1.5
+++ import.log	4 Mar 2009 16:58:27 -0000	1.6
@@ -3,3 +3,4 @@
 coq-8_1pl3-3_fc9:HEAD:coq-8.1pl3-3.fc9.src.rpm:1217962473
 coq-8_1pl3-4_fc9:HEAD:coq-8.1pl3-4.fc9.src.rpm:1221066400
 coq-8_1pl3-5_fc9:HEAD:coq-8.1pl3-5.fc9.src.rpm:1224703139
+coq-8_1pl4-2_fc10:HEAD:coq-8.1pl4-2.fc10.src.rpm:1236185498


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Dec 2008 15:49:55 -0000	1.3
+++ sources	4 Mar 2009 16:58:27 -0000	1.4
@@ -2,6 +2,6 @@
 0e3d5eac23416ec75dd59fabdcc1367c  Coq-RecTutorial.pdf.gz
 021c58a1f2e5d029928ffae0cc9703b0  Coq-Reference-Manual.pdf.gz
 bcb4d1c4857bfdae5c22f8fc0be6853c  Coq-Tutorial.v.pdf.gz
+8fa623538d362d8f48d78e598c43215e  coq-8.1pl4.tar.gz
 04285e3a76571db6e1d2fbe198c76120  coq-refman-html.tar.gz
 17b1edf9122fd89c8b99d4e047b54fb8  coq-stdlib-html.tar.gz
-8fa623538d362d8f48d78e598c43215e  coq-8.1pl4.tar.gz