[emacs-common-tuareg] - New upstream version 2.0.4 (RHBZ#729130). - Upstream build system is much more sane than before, s
Richard W.M. Jones
rjones at fedoraproject.org
Mon Aug 8 21:09:42 UTC 2011
commit 2cabdbb7d8e47beb6c1298ed4e50a20579e2ffab
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Aug 8 22:09:19 2011 +0100
- New upstream version 2.0.4 (RHBZ#729130).
- Upstream build system is much more sane than before, so remove
a lot of non-conventional hacks and just use make/make install.
.gitignore | 1 +
emacs-common-tuareg.spec | 42 +++++++++++++++++-----------------------
sources | 2 +-
tuareg-mode-no-sym-lock.patch | 13 ------------
4 files changed, 20 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9ba9671..52b3c76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
tuareg-mode-1.45.6.tar.bz2
+/tuareg-2.0.4.tgz
diff --git a/emacs-common-tuareg.spec b/emacs-common-tuareg.spec
index 47751eb..6d85e48 100644
--- a/emacs-common-tuareg.spec
+++ b/emacs-common-tuareg.spec
@@ -29,18 +29,16 @@
Name: emacs-common-%{pkg}
-Version: 1.45.6
-Release: 10%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
Summary: Emacs and XEmacs mode for editing ocaml
Group: Development/Libraries
License: GPLv2+
-URL: http://www-rocq.inria.fr/~acohen/tuareg/index.html.en
-Source0: http://www-rocq.inria.fr/~acohen/tuareg/mode/tuareg-mode-%{version}.tar.bz2
+URL: https://forge.ocamlcore.org/projects/tuareg/
+Source0: https://forge.ocamlcore.org/frs/download.php/514/tuareg-2.0.4.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch0: tuareg-mode-no-sym-lock.patch
-
BuildArch: noarch
BuildRequires: emacs, emacs-el
BuildRequires: xemacs, xemacs-devel
@@ -116,32 +114,21 @@ XEmacs.
%prep
-%setup -q -n %{pkg}-mode-%{version}
-%patch0 -p1
-for f in HISTORY README LISEZMOI; do
- mv $f $f.old; iconv -f iso-8859-1 -t utf-8 < $f.old > $f
-done
+%setup -q -n %{pkg}-%{version}
+
%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 broken.
-emacs --no-site-file -q -batch -L . -f batch-byte-compile \
- tuareg.el camldebug.el
+make
%install
rm -rf $RPM_BUILD_ROOT
+# Install twice, for emacs and xemacs.
mkdir -p $RPM_BUILD_ROOT/%{emacs_lispdir}/%{pkg}
-#mkdir -p $RPM_BUILD_ROOT/%{emacs_startdir}
-install -m 0644 tuareg.el camldebug.el tuareg.elc camldebug.elc \
- $RPM_BUILD_ROOT/%{emacs_lispdir}/%{pkg}/
-
+make install DEST=$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}/
+make install DEST=$RPM_BUILD_ROOT/%{xemacs_lispdir}/%{pkg}
%clean
@@ -150,13 +137,14 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc COPYING HISTORY LISEZMOI README append-tuareg.el custom-tuareg.el
+%doc COPYING HISTORY README append-tuareg.el custom-tuareg.el
%files -n emacs-%{pkg}
%defattr(-,root,root,-)
%doc COPYING
%{emacs_lispdir}/%{pkg}/*.elc
+%{emacs_lispdir}/%{pkg}/version
#%{emacs_startdir}/*.el
%dir %{emacs_lispdir}/%{pkg}
@@ -171,6 +159,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc COPYING
%{xemacs_lispdir}/%{pkg}/*.elc
+%{xemacs_lispdir}/%{pkg}/version
#%{xemacs_startdir}/*.el
%dir %{xemacs_lispdir}/%{pkg}
@@ -182,6 +171,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 8 2011 Richard W.M. Jones <rjones at redhat.com> - 2.0.4-1
+- New upstream version 2.0.4 (RHBZ#729130).
+- Upstream build system is much more sane than before, so remove
+ a lot of non-conventional hacks and just use make/make install.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.45.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 9744457..20dd7dc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-75df362cba2d32e9828eebe80716009f tuareg-mode-1.45.6.tar.bz2
+6bd7cd7305d5f1d084af4ff5982db964 tuareg-2.0.4.tgz
More information about the scm-commits
mailing list