Possibly better way to enable bytecode builds.

Don't disable the -data subpackage this time.
This commit is contained in:
Richard W.M. Jones 2015-07-21 14:30:38 +01:00
parent f70ead5cbd
commit 49b685990e
2 changed files with 17 additions and 11 deletions

View File

@ -0,0 +1,11 @@
--- camomile-0.8.5/Makefile.in.orig 2015-07-21 14:28:26.837692955 +0100
+++ camomile-0.8.5/Makefile.in 2015-07-21 14:28:47.560716204 +0100
@@ -70,7 +70,7 @@
# Generic targets
#################
-all : byte $(OCAMLBEST) opt unidata unimaps charmap_data locale_data
+all : byte $(OCAMLBEST) unidata unimaps charmap_data locale_data
# Build the library
###################

View File

@ -2,7 +2,7 @@
Name: ocaml-camomile Name: ocaml-camomile
Version: 0.8.5 Version: 0.8.5
Release: 11%{?dist} Release: 12%{?dist}
Summary: Unicode library for OCaml Summary: Unicode library for OCaml
# Several files are MIT and UCD licensed, but the overall work is LGPLv2+ # Several files are MIT and UCD licensed, but the overall work is LGPLv2+
@ -15,6 +15,9 @@ Source0: http://downloads.sourceforge.net/camomile/camomile-%{version}.ta
# Use ocamlopt -g option to enable debuginfo. # Use ocamlopt -g option to enable debuginfo.
Patch1: camomile-0.8.3-enable-debug.patch Patch1: camomile-0.8.3-enable-debug.patch
# Don't compile native code when ocamlopt not detected.
Patch2: camomile-0.8.5-bytecode.patch
BuildRequires: ocaml >= 3.12.1-12 BuildRequires: ocaml >= 3.12.1-12
BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ocamldoc
@ -38,7 +41,6 @@ The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}. developing applications that use %{name}.
%if %opt
%package data %package data
Summary: Data files for %{name} Summary: Data files for %{name}
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
@ -47,24 +49,20 @@ Requires: %{name} = %{version}-%{release}
%description data %description data
The %{name}-data package contains data files for developing The %{name}-data package contains data files for developing
applications that use %{name}. applications that use %{name}.
%endif
%prep %prep
%setup -q -n camomile-%{version} %setup -q -n camomile-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
# Parallel builds don't work. # Parallel builds don't work.
unset MAKEFLAGS unset MAKEFLAGS
./configure --prefix=%{_prefix} --datadir=%{_datadir} --libdir=%{_libdir} ./configure --prefix=%{_prefix} --datadir=%{_datadir} --libdir=%{_libdir}
%if %opt
make make
%else
make byte
%endif
make dochtml make dochtml
make man make man
@ -108,18 +106,15 @@ cp tools/camomilelocaledef.opt $RPM_BUILD_ROOT%{_bindir}/camomilelocaledef
%{_libdir}/ocaml/camomile/*.mli %{_libdir}/ocaml/camomile/*.mli
%if %opt
%files data %files data
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README %doc README
%{_datadir}/camomile/ %{_datadir}/camomile/
%endif
%changelog %changelog
* Tue Jul 21 2015 Richard W.M. Jones <rjones@redhat.com> - 0.8.5-11 * Tue Jul 21 2015 Richard W.M. Jones <rjones@redhat.com> - 0.8.5-12
- Enable bytecode builds. - Enable bytecode builds.
- Disable the ocaml-camomile-data package on bytecode builds.
* Tue Jun 23 2015 Richard W.M. Jones <rjones@redhat.com> - 0.8.5-10 * Tue Jun 23 2015 Richard W.M. Jones <rjones@redhat.com> - 0.8.5-10
- Bump release and rebuild. - Bump release and rebuild.