From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 7 Apr 2011 09:35:03 +0000 (+0000)
Subject: - rel 2
X-Git-Tag: auto/th/ocaml-3_12_1-1~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Focaml.git;a=commitdiff_plain;h=3889f6d29b06f8cfb12c2df9767dec5719ac6c9f

- rel 2
- BR emacs, as it doesn't build with xemcas
- removed utterly stupid emacs binary guesswork that caused non-deterministic
  builds if both emacs and xemacs were installed

Changed files:
    ocaml.spec -> 1.122
---

diff --git a/ocaml.spec b/ocaml.spec
index 301f5c4..367a1f0 100644
--- a/ocaml.spec
+++ b/ocaml.spec
@@ -14,7 +14,7 @@ Summary:	The Objective Caml compiler and programming environment
 Summary(pl.UTF-8):	Kompilator OCamla (Objective Caml) oraz środowisko programistyczne
 Name:		ocaml
 Version:	3.12.0
-Release:	1
+Release:	2
 Epoch:		1
 License:	distributable
 Group:		Development/Languages
@@ -48,9 +48,8 @@ BuildRequires:	db-devel >= 4.1
 %{?with_x:BuildRequires:	xorg-lib-libX11-devel}
 %if %{with emacs}
 BuildRequires:	sed >= 4.0
-BuildRequires:	xemacs
-BuildRequires:	xemacs-common
-BuildRequires:	xemacs-fsf-compat-pkg
+BuildRequires:	emacs
+BuildRequires:	emacs-common
 %endif
 Requires:	%{name}-runtime = %{epoch}:%{version}-%{release}
 Provides:	ocaml-ocamldoc
@@ -356,10 +355,10 @@ cat > $RPM_BUILD_ROOT%{_libdir}/%{name}/ld.conf <<EOF
 EOF
 
 %if %{with emacs}
-%{__make} -C emacs DESTDIR=$RPM_BUILD_ROOT install \
-	EMACS="`if [ -x %{_bindir}/emacs ]; then echo emacs; \
-	        else echo xemacs; fi`" \
-	EMACSDIR="$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp"
+%{__make} -C emacs install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	EMACSDIR="$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp" \
+	EMACS="emacs"
 %endif
 
 # symlink .opt versions of compilers (if present)