rpms/emacs-common-tuareg/devel emacs-common-tuareg.spec,1.1,1.2

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/emacs-common-tuareg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14760

Modified Files:
	emacs-common-tuareg.spec 
Log Message:
* Wed Feb 20 2008 Richard W.M. Jones <rjones at redhat.com> - 1.45.6-3
- Reenable support for xemacs.



Index: emacs-common-tuareg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-common-tuareg/devel/emacs-common-tuareg.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-common-tuareg.spec	20 Feb 2008 20:46:09 -0000	1.1
+++ emacs-common-tuareg.spec	20 Feb 2008 22:09:07 -0000	1.2
@@ -30,7 +30,7 @@
 
 Name:           emacs-common-%{pkg}
 Version:        1.45.6
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Emacs mode for editing ocaml
 #Summary:        Emacs and XEmacs mode for editing ocaml
 
@@ -77,36 +77,27 @@
 GNU Emacs.
 
 
-# NB. 'xemacs' support appears to be broken upstream:
-#
-# While compiling toplevel forms in file /tmp/tuareg-mode-1.45.6/sym-lock.el:
-# !! File error (("Cannot open load file" "atomic-extents"))
-# >>Error occurred processing sym-lock.el: Cannot open load file: "atomic-extents"
-#
-# I have only limited understanding of xemacs environment, so
-# for now xemacs is disabled.
-
-#%package -n xemacs-%{pkg}
-#Summary:        Compiled elisp files to run %{pkgname} under XEmacs
-#Group:          Development/Libraries
-#Requires:       xemacs(bin) >= %{xemacs_version}
-#Requires:       emacs-common-%{pkg} = %{version}-%{release}
-#
-#%description -n xemacs-%{pkg}
-#This package contains the byte compiled elisp packages to use
-#%{pkgname} with XEmacs.
-#
-#
-#%package -n xemacs-%{pkg}-el
-#Summary:        Elisp source files for %{pkgname} under XEmacs
-#Group:          Development/Libraries
-#Requires:       xemacs-%{pkg} = %{version}-%{release}
-#
-#%description -n xemacs-%{pkg}-el
-#This package contains the elisp source files for %{pkgname} under
-#XEmacs. You do not need to install this package to run
-#%{pkgname}. Install the xemacs-%{pkg} package to use %{pkgname} with
-#XEmacs.
+%package -n xemacs-%{pkg}
+Summary:        Compiled elisp files to run %{pkgname} under XEmacs
+Group:          Development/Libraries
+Requires:       xemacs(bin) >= %{xemacs_version}
+Requires:       emacs-common-%{pkg} = %{version}-%{release}
+
+%description -n xemacs-%{pkg}
+This package contains the byte compiled elisp packages to use
+%{pkgname} with XEmacs.
+
+
+%package -n xemacs-%{pkg}-el
+Summary:        Elisp source files for %{pkgname} under XEmacs
+Group:          Development/Libraries
+Requires:       xemacs-%{pkg} = %{version}-%{release}
+
+%description -n xemacs-%{pkg}-el
+This package contains the elisp source files for %{pkgname} under
+XEmacs. You do not need to install this package to run
+%{pkgname}. Install the xemacs-%{pkg} package to use %{pkgname} with
+XEmacs.
 
 
 %prep
@@ -118,7 +109,7 @@
 %build
 # 'append-tuareg.el' and 'custom-tuareg.el' are example config
 # files, so they will end up in the documentation directory.
-# 'sym-lock.el' is only used by XEmacs.
+# 'sym-lock.el' is used but not required by XEmacs.
 emacs --no-site-file -q -batch -L . -f batch-byte-compile \
   tuareg.el camldebug.el
 
@@ -131,10 +122,10 @@
 install -m 0644 tuareg.el camldebug.el tuareg.elc camldebug.elc \
   $RPM_BUILD_ROOT/%{emacs_lispdir}/%{pkg}/
 
-#mkdir -p $RPM_BUILD_ROOT/%{xemacs_lispdir}/%{pkg}
-##mkdir -p $RPM_BUILD_ROOT/%{xemacs_startdir}
-#install -m 0644 tuareg.el camldebug.el tuareg.elc camldebug.elc \
-#  $RPM_BUILD_ROOT/%{xemacs_lispdir}/%{pkg}/
+mkdir -p $RPM_BUILD_ROOT/%{xemacs_lispdir}/%{pkg}
+#mkdir -p $RPM_BUILD_ROOT/%{xemacs_startdir}
+install -m 0644 tuareg.el camldebug.el tuareg.elc camldebug.elc \
+  $RPM_BUILD_ROOT/%{xemacs_lispdir}/%{pkg}/
 
 
 %clean
@@ -160,20 +151,23 @@
 %{emacs_lispdir}/%{pkg}/*.el
 
 
-#%files -n xemacs-%{pkg}
-#%defattr(-,root,root,-)
-#%doc COPYING
-#%{xemacs_lispdir}/%{pkg}/*.elc
-##%{xemacs_startdir}/*.el
-#%dir %{xemacs_lispdir}/%{pkg}
-#
-#
-#%files -n xemacs-%{pkg}-el
-#%defattr(-,root,root,-)
-#%doc COPYING
-#%{xemacs_lispdir}/%{pkg}/*.el
+%files -n xemacs-%{pkg}
+%defattr(-,root,root,-)
+%doc COPYING
+%{xemacs_lispdir}/%{pkg}/*.elc
+#%{xemacs_startdir}/*.el
+%dir %{xemacs_lispdir}/%{pkg}
+
+
+%files -n xemacs-%{pkg}-el
+%defattr(-,root,root,-)
+%doc COPYING
+%{xemacs_lispdir}/%{pkg}/*.el
 
 
 %changelog
+* Wed Feb 20 2008 Richard W.M. Jones <rjones at redhat.com> - 1.45.6-3
+- Reenable support for xemacs.
+
 * Tue Feb 19 2008 Richard W.M. Jones <rjones at redhat.com> - 1.45.6-1
 - Initial RPM release.