From 89434fe0348d5da190c13590455fba592afc1f47 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 17 Aug 2014 12:54:04 +0000 Subject: [PATCH 1/4] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ocaml-gettext.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec index 5d02628..0960cce 100644 --- a/ocaml-gettext.spec +++ b/ocaml-gettext.spec @@ -2,7 +2,7 @@ Name: ocaml-gettext Version: 0.3.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: OCaml library for i18n License: LGPLv2+ with exceptions @@ -198,6 +198,9 @@ chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so %changelog +* Sun Aug 17 2014 Fedora Release Engineering - 0.3.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 0.3.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 08b58fc1b8e221a7bb6a311c4f1865da25f5a3e3 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 24 Sep 2014 22:55:41 +0100 Subject: [PATCH 2/4] Bump and rebuild for camlp4 change. --- ocaml-gettext-0.3.4-use-ocamlopt-g.patch | 33 ------------------------ ocaml-gettext.spec | 5 +++- 2 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 ocaml-gettext-0.3.4-use-ocamlopt-g.patch diff --git a/ocaml-gettext-0.3.4-use-ocamlopt-g.patch b/ocaml-gettext-0.3.4-use-ocamlopt-g.patch deleted file mode 100644 index f8f05b5..0000000 --- a/ocaml-gettext-0.3.4-use-ocamlopt-g.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 0960cce..79f2a5a 100644 --- a/ocaml-gettext.spec +++ b/ocaml-gettext.spec @@ -2,7 +2,7 @@ Name: ocaml-gettext Version: 0.3.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: OCaml library for i18n License: LGPLv2+ with exceptions @@ -198,6 +198,9 @@ chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so %changelog +* Wed Sep 24 2014 Richard W.M. Jones - 0.3.4-14 +- Bump and rebuild for camlp4 change. + * Sun Aug 17 2014 Fedora Release Engineering - 0.3.4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 4c0ab26e93470d78a9a7c4f8cf0623bc9949cbcc Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 25 Sep 2014 08:26:07 +0100 Subject: [PATCH 3/4] Add missing patch. --- ocaml-gettext-0.3.4-use-ocamlopt-g.patch | 33 ++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 ocaml-gettext-0.3.4-use-ocamlopt-g.patch 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) $< From 0a98c586b8797009266a2656bd09a243b1d457a1 Mon Sep 17 00:00:00 2001 From: Parag Nemade Date: Thu, 25 Sep 2014 22:16:55 +0530 Subject: [PATCH 4/4] Rebuild for broken deps --- ocaml-gettext.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec index 79f2a5a..b668d4c 100644 --- a/ocaml-gettext.spec +++ b/ocaml-gettext.spec @@ -2,7 +2,7 @@ Name: ocaml-gettext Version: 0.3.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: OCaml library for i18n License: LGPLv2+ with exceptions @@ -198,6 +198,9 @@ chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so %changelog +* Thu Sep 25 2014 Parag Nemade - 0.3.4-15 +- Rebuild for broken deps + * Wed Sep 24 2014 Richard W.M. Jones - 0.3.4-14 - Bump and rebuild for camlp4 change.