diff --git a/ocaml.spec b/ocaml.spec index 028ad46..86b4972 100644 --- a/ocaml.spec +++ b/ocaml.spec @@ -27,7 +27,7 @@ Name: ocaml Version: 4.07.0 -Release: 0.rc1.2%{?dist} +Release: 0.rc1.3%{?dist} Summary: OCaml compiler and programming environment @@ -72,9 +72,7 @@ BuildRequires: gcc BuildRequires: binutils-devel BuildRequires: ncurses-devel BuildRequires: gdbm-devel -%ifnarch riscv64 BuildRequires: emacs -%endif BuildRequires: gawk BuildRequires: perl-interpreter BuildRequires: util-linux @@ -154,7 +152,6 @@ Provides: ocamldoc Documentation generator for OCaml. -%ifnarch riscv64 %package emacs Summary: Emacs mode for OCaml Requires: ocaml = %{version}-%{release} @@ -162,7 +159,6 @@ Requires: emacs(bin) %description emacs Emacs mode for OCaml. -%endif %package docs @@ -220,9 +216,7 @@ $make world $make opt $make opt.opt %endif -%ifnarch riscv64 make -C emacs ocamltags -%endif # Currently these tools are supplied by Debian, but are expected # to go upstream at some point. @@ -253,7 +247,6 @@ make install \ MANDIR=$RPM_BUILD_ROOT%{_mandir} perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf -%ifnarch riscv64 ( # install emacs files cd emacs; @@ -262,7 +255,6 @@ perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp make install-ocamltags BINDIR=$RPM_BUILD_ROOT%{_bindir} ) -%endif echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release @@ -410,12 +402,10 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete %{_mandir}/man3/* -%ifnarch riscv64 %files emacs %doc emacs/README %{_datadir}/emacs/site-lisp/* %{_bindir}/ocamltags -%endif %files compiler-libs @@ -434,6 +424,9 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete %changelog +* Tue Jun 26 2018 Richard W.M. Jones - 4.07.0-0.rc1.3 +- Enable emacs again on riscv64. + * Tue Jun 19 2018 Richard W.M. Jones - 4.07.0-0.rc1.2 - OCaml 4.07.0-rc1 (RHBZ#1536734).