[coq] Drop support for XEmacs due to ProofGeneral dropping support.
Jerry James
jjames at fedoraproject.org
Fri Jul 27 17:54:32 UTC 2012
commit 7bc5fec4e528059219f3284a7ef216a01aa804ac
Author: Jerry James <loganjerry at gmail.com>
Date: Fri Jul 27 11:54:10 2012 -0600
Drop support for XEmacs due to ProofGeneral dropping support.
README.coq-xemacs | 2 --
coq.spec | 52 ++++++++++++----------------------------------------
2 files changed, 12 insertions(+), 42 deletions(-)
---
diff --git a/coq.spec b/coq.spec
index 20070a8..cf166bb 100644
--- a/coq.spec
+++ b/coq.spec
@@ -33,15 +33,13 @@ URL: http://coq.inria.fr/
Source0: http://coq.inria.fr/V%{version}/files/%{name}-%{version}.tar.gz
Source1: coqide.desktop
Source2: README.coq-emacs
-Source3: README.coq-xemacs
Source4: coq.xml
# Adapt to new camlp5 version
Patch0: %{name}-camlp5.patch
BuildRequires: ocaml, ocaml-camlp5-devel, ocaml-lablgtk-devel
-BuildRequires: desktop-file-utils, emacs-nox, xemacs-nox
-BuildRequires: emacs-proofgeneral, xemacs-proofgeneral
+BuildRequires: desktop-file-utils, emacs-nox, emacs-proofgeneral
# For documentation
BuildRequires: tex(latex)
%if %{build_html}
@@ -52,6 +50,12 @@ Requires(postun): tex(tex)
ExclusiveArch: %{ocaml_arches}
+# Remove these once Fedora 18 goes EOL
+Obsoletes: %{name}-xemacs < 8.3pl4
+Provides: %{name}-xemacs = %{version}-%{release}
+Obsoletes: %{name}-xemacs-el < 8.3pl4
+Provides: %{name}-xemacs-el = %{version}-%{release}
+
%description
Coq is a formal proof management system. It allows for the development
of theorems through first order logic that are mechanically checked by
@@ -119,27 +123,6 @@ BuildArch: noarch
This package contains the Elisp source files for Coq's Emacs support.
This package is not needed to use the Emacs interface.
-%package xemacs
-Group: Applications/Engineering
-Summary: XEmacs support for Coq proof management system
-Requires: %{name} = %{version}-%{release}
-Requires: xemacs(bin) >= %{_xemacs_version}
-Requires: xemacs-proofgeneral
-BuildArch: noarch
-
-%description xemacs
-This package provides XEmacs mode files for formatting Coq input.
-
-%package xemacs-el
-Group: Applications/Engineering
-Summary: Elisp source files for Coq proof management system
-Requires: %{name}-xemacs = %{version}-%{release}
-BuildArch: noarch
-
-%description xemacs-el
-This package contains the Elisp source files for Coq's XEmacs support.
-This package is not needed to use the XEmacs interface.
-
%prep
%setup -q
%patch0
@@ -152,7 +135,7 @@ for f in CHANGES CREDITS doc/LICENSE; do
mv -f $f.utf8 $f
done
-cp -p %SOURCE1 %SOURCE2 %SOURCE3 .
+cp -p %SOURCE1 %SOURCE2 .
%build
# Define opt flag based upon prior opt detection and restrictions
@@ -213,7 +196,7 @@ cp -p proofs/decl_expr.cmi %{buildroot}%{coqdatadir}/proofs
# Make a MIME type for .v files
mkdir -p %{buildroot}%{_datadir}/mime/packages
-cp -p %{SOURCE4} %{buildroot}%{_datadir}/mime/packages
+cp -p %{SOURCE3} %{buildroot}%{_datadir}/mime/packages
# Install main Coq .v files
for f in `find plugins theories -name '*.v' -type f`; do
@@ -249,12 +232,6 @@ rm -fr %{buildroot}%{coqdocdir}/ps
# Don't install libcoqrun.a (it might not exist, but get rid of it if it does)
rm -f %{buildroot}%{coqdatadir}/libcoqrun.a
-# Copy the Emacs support files for XEmacs, and byte compile
-mkdir -p %{buildroot}%{_xemacs_sitelispdir}/coq
-cp -p %{buildroot}%{_emacs_sitelispdir}/* %{buildroot}%{_xemacs_sitelispdir}/coq
-cd %{buildroot}%{_xemacs_sitelispdir}/coq
-%{_xemacs_bytecompile} *.el
-
# Move Emacs support files to a subdir and byte compile
mkdir -p %{buildroot}%{_emacs_sitelispdir}/coq
cd %{buildroot}%{_emacs_sitelispdir}/coq
@@ -332,15 +309,10 @@ mktexlsr &> /dev/null
%files emacs-el
%{_emacs_sitelispdir}/coq/*.el
-%files xemacs
-%dir %{_xemacs_sitelispdir}/coq
-%{_xemacs_sitelispdir}/coq/*.elc
-%doc README.coq-xemacs
-
-%files xemacs-el
-%{_xemacs_sitelispdir}/coq/*.el
-
%changelog
+* Fri Jul 27 2012 Jerry James <loganjerry at gmail.com> - 8.3pl4-3
+- ProofGeneral dropped support for XEmacs, so we have to drop it too
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.3pl4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list