packages: ocaml/ocaml.spec - rel 2 - BR emacs, as it doesn't build with xem...

[baggins]

Author: baggins                      Date: Thu Apr  7 09:35:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 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

---- Files affected:
packages/ocaml:
   ocaml.spec (1.121 -> 1.122) 

---- Diffs:

================================================================
Index: packages/ocaml/ocaml.spec
diff -u packages/ocaml/ocaml.spec:1.121 packages/ocaml/ocaml.spec:1.122
--- packages/ocaml/ocaml.spec:1.121	Sun Mar 13 09:16:38 2011
+++ packages/ocaml/ocaml.spec	Thu Apr  7 11:35:03 2011
@@ -15,7 +15,7 @@
 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
@@ -49,9 +49,8 @@
 %{?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
@@ -357,10 +356,10 @@
 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)
@@ -545,6 +544,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.122  2011/04/07 09:35:03  baggins
+- 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
+
 Revision 1.121  2011/03/13 08:16:38  qboosh
 - updated to 3.12.0
 - updated CFLAGS patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ocaml/ocaml.spec?r1=1.121&r2=1.122&f=u