From e91bfc7e23105600283a240eeb8d66d6273b3164 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 29 Jan 2022 16:49:27 +0100 Subject: [PATCH] - updated to 1.3 - updated destdir patch --- ocaml-dbm-destdir.patch | 18 +++++++++--------- ocaml-dbm.spec | 8 +++++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ocaml-dbm-destdir.patch b/ocaml-dbm-destdir.patch index cb36943..b9e4f47 100644 --- a/ocaml-dbm-destdir.patch +++ b/ocaml-dbm-destdir.patch @@ -1,23 +1,23 @@ ---- camldbm-1.0/Makefile.orig 2011-11-22 16:56:49.000000000 +0100 -+++ camldbm-1.0/Makefile 2014-11-06 21:00:16.398248365 +0100 -@@ -57,13 +57,13 @@ +--- dbm-camldbm-1.3/Makefile.orig 2022-01-29 16:02:30.175985113 +0100 ++++ dbm-camldbm-1.3/Makefile 2022-01-29 16:06:16.238093763 +0100 +@@ -57,13 +57,13 @@ depend: $(OCAMLDEP) *.ml *.mli > .depend install:: - if test -f dllcamldbm.$(SO); then mkdir $(STUBLIBDIR) || echo Ok; cp dllcamldbm.$(SO) $(STUBLIBDIR)/; fi - cp libcamldbm.$(A) $(LIBDIR)/ - cd $(LIBDIR) && ranlib libcamldbm.$(A) -- cp dbm.cma dbm.cmxa dbm.cmi dbm.mli $(LIBDIR)/ +- cp dbm.cmx dbm.cma dbm.cmxa dbm.cmi dbm.mli $(LIBDIR)/ - cp dbm.$(A) $(LIBDIR)/ - cd $(LIBDIR) && ranlib dbm.$(A) - if test -f dbm.cmxs; then cp dbm.cmxs $(LIBDIR)/; fi -+ if test -f dllcamldbm.$(SO); then mkdir $(DESTDIR)$(STUBLIBDIR) || echo Ok; cp dllcamldbm.$(SO) $(DESTDIR)$(STUBLIBDIR)/; fi -+ cp libcamldbm.$(A) $(DESTDIR)$(LIBDIR)/ ++ if test -f dllcamldbm.$(SO); then mkdir $(DESTDIR)$(STUBLIBDIR) || echo Ok; cp -p dllcamldbm.$(SO) $(DESTDIR)$(STUBLIBDIR)/; fi ++ cp -p libcamldbm.$(A) $(DESTDIR)$(LIBDIR)/ + cd $(DESTDIR)$(LIBDIR) && ranlib libcamldbm.$(A) -+ cp dbm.cma dbm.cmxa dbm.cmi dbm.mli $(DESTDIR)$(LIBDIR)/ -+ cp dbm.$(A) $(DESTDIR)$(LIBDIR)/ ++ cp -p dbm.cmx dbm.cma dbm.cmxa dbm.cmi dbm.mli $(DESTDIR)$(LIBDIR)/ ++ cp -p dbm.$(A) $(DESTDIR)$(LIBDIR)/ + cd $(DESTDIR)$(LIBDIR) && ranlib dbm.$(A) -+ if test -f dbm.cmxs; then cp dbm.cmxs $(DESTDIR)$(LIBDIR)/; fi ++ if test -f dbm.cmxs; then cp -p dbm.cmxs $(DESTDIR)$(LIBDIR)/; fi clean:: rm -f *.cm* *.$(O) *.$(A) *.$(SO) diff --git a/ocaml-dbm.spec b/ocaml-dbm.spec index 48fa208..2fd2e05 100644 --- a/ocaml-dbm.spec +++ b/ocaml-dbm.spec @@ -9,12 +9,13 @@ Summary: DBM binding for OCaml Summary(pl.UTF-8): Wiązania DBM dla OCamla Name: ocaml-dbm -Version: 1.2 -Release: 2 +Version: 1.3 +Release: 1 License: LGPL v2 with linking exception Group: Libraries +#Source0Download: https://github.com/ocaml/dbm/releases Source0: https://github.com/ocaml/dbm/archive/camldbm-%{version}/camldbm-%{version}.tar.gz -# Source0-md5: 180133dd10b0b10dc47bdd8a6ab8feab +# Source0-md5: 8ff2a58ecdb5838df9d8f72578f90b9c Patch0: %{name}-destdir.patch Patch1: %{name}-no-ocamlopt.patch URL: https://forge.ocamlcore.org/projects/camldbm/ @@ -95,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/ocaml/dbm.mli %if %{with ocaml_opt} %{_libdir}/ocaml/dbm.a +%{_libdir}/ocaml/dbm.cmx %{_libdir}/ocaml/dbm.cmxa %endif %{_libdir}/ocaml/libcamldbm.a -- 2.44.0