rpms/coq/F-9 coq-lablgtk-2.12.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cmxa-install.patch, 1.1, 1.2 coq.spec, 1.5, 1.6 import.log, 1.5, 1.6 sources, 1.2, 1.3
Alan Dunn
amdunn at fedoraproject.org
Wed Mar 4 23:53:52 UTC 2009
- Previous message: rpms/coq/F-10 coq-lablgtk-2.12.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cmxa-install.patch, 1.1, 1.2 coq.spec, 1.5, 1.6 import.log, 1.5, 1.6 sources, 1.2, 1.3
- Next message: rpms/PyQwt/F-10 PyQwt.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: amdunn
Update of /cvs/pkgs/rpms/coq/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29902/F-9
Modified Files:
.cvsignore cmxa-install.patch coq.spec import.log sources
Added Files:
coq-lablgtk-2.12.patch
Log Message:
F-9 backport of 8.1pl4 from F-11.
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/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 Jul 2008 18:58:22 -0000 1.2
+++ .cvsignore 4 Mar 2009 23:53:21 -0000 1.3
@@ -2,6 +2,6 @@
Coq-RecTutorial.pdf.gz
Coq-Reference-Manual.pdf.gz
Coq-Tutorial.v.pdf.gz
-coq-8.1pl3.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/F-9/cmxa-install.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmxa-install.patch 16 Jul 2008 18:58:22 -0000 1.1
+++ cmxa-install.patch 4 Mar 2009 23:53:21 -0000 1.2
@@ -1,8 +1,8 @@
---- Makefile 2007-11-12 10:10:25.000000000 -0500
-+++ Makefile 2008-06-16 10:58:38.000000000 -0400
-@@ -1271,7 +1271,12 @@
- parsing/parsing.cma tactics/tactics.cma toplevel/toplevel.cma \
- parsing/highparsing.cma tactics/hightactics.cma contrib/contrib.cma
+--- 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)
-OBJECTCMXA=$(OBJECTCMA:.cma=.cmxa)
+ifeq ($(BEST),opt)
@@ -10,7 +10,6 @@
+else
+ OBJECTCMXA=
+endif
-+
install-library:
$(MKDIR) $(FULLCOQLIB)
Index: coq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coq/F-9/coq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- coq.spec 22 Oct 2008 19:38:36 -0000 1.5
+++ coq.spec 4 Mar 2009 23:53:21 -0000 1.6
@@ -24,8 +24,8 @@
%define debug_package %{nil}
Name: coq
-Version: 8.1pl3
-Release: 5%{?dist}
+Version: 8.1pl4
+Release: 3%{?dist}
Summary: Coq proof management system
Group: Applications/Engineering
@@ -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
@@ -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
@@ -210,8 +217,8 @@
%define opt_option --byte-only
%endif
-bash configure -prefix %{_prefix} -libdir %{_datadir}/coq -bindir %{_bindir} -mandir %{_mandir} -emacs %{emacs_lispdir} -coqdocdir %{tex_dir} %{opt_option} -reals all
-make world
+bash configure -prefix %{_prefix} -libdir %{_datadir}/coq -bindir %{_bindir} -mandir %{_mandir} -emacs %{emacs_lispdir} -coqdocdir %{tex_dir} %{opt_option} -reals all -camlp5dir %{_libdir}/ocaml/camlp5
+make world VERBOSE=1
# Fix permissions in the documentation
chmod -R a+rX refman stdlib
@@ -325,24 +332,45 @@
%doc refman
%doc stdlib
+
%files emacs
%defattr(-,root,root,-)
%{_datadir}/emacs/site-lisp/coq*
%doc README.coq-emacs
+
%changelog
+* Wed Mar 04 2009 Alan Dunn <amdunn at gmail.com> - 8.1pl4-3
+- Minor change to cmxa-install patch instruction
+- Fixed to work with lablgtk 2.12
+
+* 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
+
+* Fri Dec 5 2008 Richard W.M. Jones <rjones at redhat.com> - 8.1pl4-1
+- New upstream version 8.1pl4.
+- Attempt to rebuild against OCaml 3.11.0.
+- Run make with VERBOSE=1 so we can see the actual commands.
+- Pass -camlp5dir to configure so it uses camlp5 (overriding existence
+ of camlp4 if it happens to be installed).
+
* Wed Oct 22 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-5
- Added Coq .v files into the main package at user request.
+
* Tue Sep 09 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-4
- Added creation of prelink blacklist for any bytecode files.
- Fixed execstack status for binaries.
+
* Tue Aug 05 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-3
- Changed parser to coq-parser to avoid name conflict with
coda-client.
- Made make process noisy again.
+
* Sun Jul 20 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-2.1
- Minor bump for Fedora 8 to bring it into line with the rest.
+
* Thu Jul 17 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-2
- Added check for Fedora distribution number to allow for Fedora 8 release.
+
* Wed Jun 14 2008 Alan Dunn <amdunn at gmail.com> 8.1pl3-1
- Initial Fedora RPM version.
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/coq/F-9/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log 22 Oct 2008 19:38:36 -0000 1.5
+++ import.log 4 Mar 2009 23:53:21 -0000 1.6
@@ -3,3 +3,4 @@
coq-8_1pl3-3_fc9:F-9:coq-8.1pl3-3.fc9.src.rpm:1217987203
coq-8_1pl3-4_fc9:F-9:coq-8.1pl3-4.fc9.src.rpm:1221066514
coq-8_1pl3-5_fc9:F-9:coq-8.1pl3-5.fc9.src.rpm:1224704084
+coq-8_1pl4-3_fc10:F-9:coq-8.1pl4-3.fc10.src.rpm:1236210491
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/coq/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 Jul 2008 18:58:22 -0000 1.2
+++ sources 4 Mar 2009 23:53:21 -0000 1.3
@@ -2,6 +2,6 @@
0e3d5eac23416ec75dd59fabdcc1367c Coq-RecTutorial.pdf.gz
021c58a1f2e5d029928ffae0cc9703b0 Coq-Reference-Manual.pdf.gz
bcb4d1c4857bfdae5c22f8fc0be6853c Coq-Tutorial.v.pdf.gz
-84311faf7865b2eab964990cdb365dca coq-8.1pl3.tar.gz
04285e3a76571db6e1d2fbe198c76120 coq-refman-html.tar.gz
17b1edf9122fd89c8b99d4e047b54fb8 coq-stdlib-html.tar.gz
+8fa623538d362d8f48d78e598c43215e coq-8.1pl4.tar.gz
- Previous message: rpms/coq/F-10 coq-lablgtk-2.12.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 cmxa-install.patch, 1.1, 1.2 coq.spec, 1.5, 1.6 import.log, 1.5, 1.6 sources, 1.2, 1.3
- Next message: rpms/PyQwt/F-10 PyQwt.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list