diff --git a/ocaml-gettext-0.3.4-use-ocamlopt-g.patch b/ocaml-gettext-0.3.4-use-ocamlopt-g.patch new file mode 100644 index 0000000..f8f05b5 --- /dev/null +++ b/ocaml-gettext-0.3.4-use-ocamlopt-g.patch @@ -0,0 +1,33 @@ +--- ocaml-gettext-0.3.4/TopMakefile.old 2013-09-14 08:54:04.713986462 +0100 ++++ ocaml-gettext-0.3.4/TopMakefile 2013-09-14 08:54:18.319006115 +0100 +@@ -102,7 +102,7 @@ + %.cmxa %.a %.so: + $(if $(STUBSOBJS), \ + $(OCAMLMKLIB) -o $* $^ $(OCAMLMKLIB_FLAGS), \ +- $(OCAMLOPT) -a -o $*.cmxa $^ \ ++ $(OCAMLOPT) -g -a -o $*.cmxa $^ \ + ) + + %.cma %.a %.so: +@@ -161,7 +161,7 @@ + OLIBS = $(addsuffix .cmxa,$(LIBS)) + + install-buildprog-opt: $(CMX) +- $(OCAMLOPT) -o $(NAME) $(INCLUDES) -package "$(REQUIRES)" -linkpkg \ ++ $(OCAMLOPT) -g -o $(NAME) $(INCLUDES) -package "$(REQUIRES)" -linkpkg \ + -predicates "$(PREDICATES)" $(OLIBS) $(CMX) + $(INSTALL) -d $(BUILDBIN) + $(INSTALL_SCRIPT) -t $(BUILDBIN) $(NAME) +@@ -300,10 +300,10 @@ + $(OCAMLC) $(INCLUDES) $(CLI_OCAMLFIND) -c $< + + .ml.o: +- $(OCAMLOPT) $(INCLUDES) $(CLI_OCAMLFIND) -c $< ++ $(OCAMLOPT) -g $(INCLUDES) $(CLI_OCAMLFIND) -c $< + + .ml.cmx: +- $(OCAMLOPT) $(INCLUDES) $(CLI_OCAMLFIND) -c $< ++ $(OCAMLOPT) -g $(INCLUDES) $(CLI_OCAMLFIND) -c $< + + .mll.ml: + $(OCAMLLEX) $< diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec index c44aeaa..fb10aa9 100644 --- a/ocaml-gettext.spec +++ b/ocaml-gettext.spec @@ -1,9 +1,8 @@ %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) -%global debug_package %{nil} Name: ocaml-gettext Version: 0.3.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: OCaml library for i18n License: LGPLv2+ with exceptions @@ -12,6 +11,8 @@ ExcludeArch: sparc64 s390 s390x Source0: http://forge.ocamlcore.org/frs/download.php/676/ocaml-gettext-%{version}.tar.gz +Patch1: ocaml-gettext-0.3.4-use-ocamlopt-g.patch + BuildRequires: ocaml >= 4.00.1 BuildRequires: ocaml-findlib-devel >= 1.3.3-3 BuildRequires: ocaml-ocamldoc @@ -88,8 +89,12 @@ signature files for developing applications that use %prep %setup -q +%patch1 -p1 + %build +# Parallel builds don't work. +unset MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" \ ./configure \ --libdir=%{_libdir} \ @@ -129,9 +134,7 @@ ocamlfind install gettext-camomile _build/lib/gettext-camomile/* install -m 0755 _build/bin/ocaml-gettext $RPM_BUILD_ROOT%{_bindir}/ install -m 0755 _build/bin/ocaml-xgettext $RPM_BUILD_ROOT%{_bindir}/ -strip $OCAMLFIND_DESTDIR/stublibs/dll*.so chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so -strip $RPM_BUILD_ROOT%{_bindir}/ocaml-gettext %files @@ -195,6 +198,10 @@ strip $RPM_BUILD_ROOT%{_bindir}/ocaml-gettext %changelog +* Sat Sep 14 2013 Richard W.M. Jones - 0.3.4-11 +- Rebuild for OCaml 4.01.0. +- Enable debuginfo. + * Sat Aug 03 2013 Fedora Release Engineering - 0.3.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild