rpms/coq/devel makefile-parser.patch, NONE, 1.1 parser-man.patch, NONE, 1.1 coq.spec, 1.2, 1.3 import.log, 1.2, 1.3
Alan Dunn (amdunn)
fedora-extras-commits at redhat.com
Tue Aug 5 18:57:08 UTC 2008
Author: amdunn
Update of /cvs/pkgs/rpms/coq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16928/devel
Modified Files:
coq.spec import.log
Added Files:
makefile-parser.patch parser-man.patch
Log Message:
Changed parser to coq-parser to avoid name conflict with coda-client.
makefile-parser.patch:
--- NEW FILE makefile-parser.patch ---
--- Makefile 2007-11-12 10:10:25.000000000 -0500
+++ Makefile 2008-08-05 12:14:47.000000000 -0400
@@ -732,9 +732,9 @@
PARSERREQUIRESCMX=$(LINKCMX)
ifeq ($(BEST),opt)
- COQINTERFACE=bin/coq-interface$(EXE) bin/coq-interface.opt$(EXE) bin/parser$(EXE) bin/parser.opt$(EXE)
+ COQINTERFACE=bin/coq-interface$(EXE) bin/coq-interface.opt$(EXE) bin/coq-parser$(EXE) bin/coq-parser.opt$(EXE)
else
- COQINTERFACE=bin/coq-interface$(EXE) bin/parser$(EXE)
+ COQINTERFACE=bin/coq-interface$(EXE) bin/coq-parser$(EXE)
endif
pcoq-binaries:: $(COQINTERFACE)
@@ -752,12 +752,12 @@
PARSERCMO=$(PARSERREQUIRES) $(PARSERCODE)
PARSERCMX= $(PARSERREQUIRESCMX) $(PARSERCODE:.cmo=.cmx)
-bin/parser$(EXE):$(LIBCOQRUN) $(PARSERCMO)
+bin/coq-parser$(EXE):$(LIBCOQRUN) $(PARSERCMO)
$(SHOW)'OCAMLC -o $@'
$(HIDE)$(OCAMLC) -custom -linkall $(BYTEFLAGS) -o $@ \
dynlink.cma $(LIBCOQRUN) $(CMA) $(PARSERCMO)
-bin/parser.opt$(EXE): $(LIBCOQRUN) $(PARSERCMX)
+bin/coq-parser.opt$(EXE): $(LIBCOQRUN) $(PARSERCMX)
$(SHOW)'OCAMLOPT -o $@'
$(HIDE)$(OCAMLOPT) -linkall $(OPTFLAGS) -o $@ \
$(LIBCOQRUN) $(CMXA) $(PARSERCMX)
@@ -769,7 +769,7 @@
pcoq-files:: $(INTERFACEVO) $(INTERFACERC)
clean::
- rm -f bin/parser$(EXE) bin/parser.opt$(EXE) bin/coq-interface$(EXE) bin/coq-interface.opt$(EXE)
+ rm -f bin/coq-parser$(EXE) bin/coq-parser.opt$(EXE) bin/coq-interface$(EXE) bin/coq-interface.opt$(EXE)
# install targets
install-pcoq:: install-pcoq-binaries install-pcoq-files install-pcoq-manpages
@@ -782,7 +782,7 @@
$(MKDIR) $(FULLCOQLIB)/contrib/interface
cp $(INTERFACERC) $(FULLCOQLIB)/contrib/interface
-PCOQMANPAGES=man/coq-interface.1 man/parser.1
+PCOQMANPAGES=man/coq-interface.1 man/coq-parser.1
install-pcoq-manpages:
$(MKDIR) $(FULLMANDIR)/man1
parser-man.patch:
--- NEW FILE parser-man.patch ---
--- man/parser.1 2001-04-25 09:51:01.000000000 -0400
+++ man/parser.1 2008-08-05 12:21:00.000000000 -0400
@@ -1,18 +1,18 @@
.TH COQ 1 "April 25, 2001"
.SH NAME
-parser \- Coq parser
+coq-parser \- Coq parser
.SH SYNOPSIS
-.B parser
+.B coq-parser
[
.B options
]
.SH DESCRIPTION
-.B parser
+.B coq-parser
is a program reading Coq proof developments and outputing them in the
structured format given in the INRIA technical report RT154. This
program is not for the casual user.
Index: coq.spec
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/coq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coq.spec 20 Jul 2008 09:33:24 -0000 1.2
+++ coq.spec 5 Aug 2008 18:56:38 -0000 1.3
@@ -25,7 +25,7 @@
Name: coq
Version: 8.1pl3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Coq proof management system
Group: Applications/Engineering
@@ -46,6 +46,8 @@
Patch1: cmxa-install.patch
Patch2: makefile-strip.patch
Patch3: check.patch
+Patch4: makefile-parser.patch
+Patch5: parser-man.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
@@ -160,6 +162,14 @@
# work properly without it.
%patch3
+# Rename binary parser -> coq-parser to avoid a name conflict with
+# other packages (and also to be more informative)
+# Patch manpage as well.
+# Upstream agreed this was a good idea.
+%patch4
+%patch5
+mv man/parser.1 man/coq-parser.1
+
# Fix some files that are not in UTF-8 encoding
for f in CHANGES CREDITS COPYRIGHT; do
@@ -199,8 +209,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 > /dev/null
-make world 2>/dev/null
+bash configure -prefix %{_prefix} -libdir %{_datadir}/coq -bindir %{_bindir} -mandir %{_mandir} -emacs %{emacs_lispdir} -coqdocdir %{tex_dir} %{opt_option} -reals all
+make world
# Fix permissions in the documentation
chmod -R a+rX refman stdlib
@@ -242,15 +252,13 @@
%files
%defattr(-,root,root,-)
%doc CHANGES COMPATIBILITY COPYRIGHT CREDITS INSTALL KNOWN-BUGS LICENSE README
-%doc %{_mandir}/man1/coq*
-%doc %{_mandir}/man1/gallina.1.gz
-%doc %{_mandir}/man1/parser.1.gz
+%doc %{_mandir}/man1/*
%{_datadir}/coq
%{_bindir}/coq*
%{_bindir}/gallina
-%{_bindir}/parser
+%{_bindir}/coq-parser
%if %{opt}
-%{_bindir}/parser.opt
+%{_bindir}/coq-parser.opt
%endif
# Exclude ide files to put in a separate package
%exclude %{_bindir}/coqide*
@@ -292,6 +300,12 @@
%doc README.coq-emacs
%changelog
+* 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
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/coq/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log 20 Jul 2008 09:33:24 -0000 1.2
+++ import.log 5 Aug 2008 18:56:38 -0000 1.3
@@ -1,2 +1,3 @@
coq-8_1pl3-1_fc9:HEAD:coq-8.1pl3-1.fc9.src.rpm:1216233878
coq-8_1pl3-2_fc10:HEAD:coq-8.1pl3-2.fc10.src.rpm:1216546261
+coq-8_1pl3-3_fc9:HEAD:coq-8.1pl3-3.fc9.src.rpm:1217962473
More information about the fedora-extras-commits
mailing list