- add back ocaml-ppc64.patch for ppc secondary arch, drop .cmxs files
from file list on ppc
This commit is contained in:
parent
170eee21d4
commit
52c1ade62f
File diff suppressed because it is too large
Load Diff
12
ocaml.spec
12
ocaml.spec
|
@ -2,7 +2,7 @@
|
|||
|
||||
Name: ocaml
|
||||
Version: 3.12.0
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
|
||||
Summary: Objective Caml compiler and programming environment
|
||||
|
||||
|
@ -26,6 +26,7 @@ Patch1: ocaml-user-cflags.patch
|
|||
|
||||
# Fix for RHBZ#691896. This is upstream in 3.12.1.
|
||||
Patch2: 0007-Fix-ocamlopt-w.r.t.-binutils-2.21.patch
|
||||
Patch3: ocaml-ppc64.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
|
@ -204,6 +205,9 @@ man pages and info files.
|
|||
%patch0 -p1 -b .rpath
|
||||
%patch1 -p1 -b .cflags
|
||||
%patch2 -p1 -b .rhbz691896
|
||||
%ifarch ppc ppc64
|
||||
%patch3 -p1 -b .ppc64
|
||||
%endif
|
||||
|
||||
cp %{SOURCE2} refman.pdf
|
||||
|
||||
|
@ -310,7 +314,9 @@ fi
|
|||
%{_libdir}/ocaml/ld.conf
|
||||
%{_libdir}/ocaml/Makefile.config
|
||||
%{_libdir}/ocaml/*.a
|
||||
%ifnarch ppc
|
||||
%{_libdir}/ocaml/*.cmxs
|
||||
%endif
|
||||
%{_libdir}/ocaml/*.cmxa
|
||||
%{_libdir}/ocaml/*.cmx
|
||||
%{_libdir}/ocaml/*.mli
|
||||
|
@ -446,6 +452,10 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Dec 19 2011 Karsten Hopp <karsten@redhat.com> 3.12.0-6
|
||||
- add back ocaml-ppc64.patch for ppc secondary arch, drop .cmxs files
|
||||
from file list on ppc
|
||||
|
||||
* Wed Mar 30 2011 Richard W.M. Jones <rjones@redhat.com> - 3.12.0-5
|
||||
- Fix for invalid assembler generation (RHBZ#691896).
|
||||
|
||||
|
|
Loading…
Reference in New Issue