Enable emacs again on riscv64.
This commit is contained in:
parent
0c1300311f
commit
4729dd2ae1
15
ocaml.spec
15
ocaml.spec
@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
Name: ocaml
|
Name: ocaml
|
||||||
Version: 4.07.0
|
Version: 4.07.0
|
||||||
Release: 0.rc1.2%{?dist}
|
Release: 0.rc1.3%{?dist}
|
||||||
|
|
||||||
Summary: OCaml compiler and programming environment
|
Summary: OCaml compiler and programming environment
|
||||||
|
|
||||||
@ -72,9 +72,7 @@ BuildRequires: gcc
|
|||||||
BuildRequires: binutils-devel
|
BuildRequires: binutils-devel
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
BuildRequires: gdbm-devel
|
BuildRequires: gdbm-devel
|
||||||
%ifnarch riscv64
|
|
||||||
BuildRequires: emacs
|
BuildRequires: emacs
|
||||||
%endif
|
|
||||||
BuildRequires: gawk
|
BuildRequires: gawk
|
||||||
BuildRequires: perl-interpreter
|
BuildRequires: perl-interpreter
|
||||||
BuildRequires: util-linux
|
BuildRequires: util-linux
|
||||||
@ -154,7 +152,6 @@ Provides: ocamldoc
|
|||||||
Documentation generator for OCaml.
|
Documentation generator for OCaml.
|
||||||
|
|
||||||
|
|
||||||
%ifnarch riscv64
|
|
||||||
%package emacs
|
%package emacs
|
||||||
Summary: Emacs mode for OCaml
|
Summary: Emacs mode for OCaml
|
||||||
Requires: ocaml = %{version}-%{release}
|
Requires: ocaml = %{version}-%{release}
|
||||||
@ -162,7 +159,6 @@ Requires: emacs(bin)
|
|||||||
|
|
||||||
%description emacs
|
%description emacs
|
||||||
Emacs mode for OCaml.
|
Emacs mode for OCaml.
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%package docs
|
%package docs
|
||||||
@ -220,9 +216,7 @@ $make world
|
|||||||
$make opt
|
$make opt
|
||||||
$make opt.opt
|
$make opt.opt
|
||||||
%endif
|
%endif
|
||||||
%ifnarch riscv64
|
|
||||||
make -C emacs ocamltags
|
make -C emacs ocamltags
|
||||||
%endif
|
|
||||||
|
|
||||||
# Currently these tools are supplied by Debian, but are expected
|
# Currently these tools are supplied by Debian, but are expected
|
||||||
# to go upstream at some point.
|
# to go upstream at some point.
|
||||||
@ -253,7 +247,6 @@ make install \
|
|||||||
MANDIR=$RPM_BUILD_ROOT%{_mandir}
|
MANDIR=$RPM_BUILD_ROOT%{_mandir}
|
||||||
perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
|
perl -pi -e "s|^$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
|
||||||
|
|
||||||
%ifnarch riscv64
|
|
||||||
(
|
(
|
||||||
# install emacs files
|
# install emacs files
|
||||||
cd emacs;
|
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
|
EMACSDIR=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
|
||||||
make install-ocamltags BINDIR=$RPM_BUILD_ROOT%{_bindir}
|
make install-ocamltags BINDIR=$RPM_BUILD_ROOT%{_bindir}
|
||||||
)
|
)
|
||||||
%endif
|
|
||||||
|
|
||||||
echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
|
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/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
|
|
||||||
%ifnarch riscv64
|
|
||||||
%files emacs
|
%files emacs
|
||||||
%doc emacs/README
|
%doc emacs/README
|
||||||
%{_datadir}/emacs/site-lisp/*
|
%{_datadir}/emacs/site-lisp/*
|
||||||
%{_bindir}/ocamltags
|
%{_bindir}/ocamltags
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%files compiler-libs
|
%files compiler-libs
|
||||||
@ -434,6 +424,9 @@ find $RPM_BUILD_ROOT \( -name '*.cmt' -o -name '*.cmti' \) -a -delete
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 26 2018 Richard W.M. Jones <rjones@redhat.com> - 4.07.0-0.rc1.3
|
||||||
|
- Enable emacs again on riscv64.
|
||||||
|
|
||||||
* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 4.07.0-0.rc1.2
|
* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 4.07.0-0.rc1.2
|
||||||
- OCaml 4.07.0-rc1 (RHBZ#1536734).
|
- OCaml 4.07.0-rc1 (RHBZ#1536734).
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user