diff --git a/findlib-1.3.3.patch b/findlib-1.3.3.patch index ffe2d21..451ed74 100644 --- a/findlib-1.3.3.patch +++ b/findlib-1.3.3.patch @@ -4,10 +4,8 @@ src/findlib/Makefile | 22 +++++++++++----------- 3 files changed, 28 insertions(+), 28 deletions(-) -Index: findlib-1.5.5/Makefile -=================================================================== ---- findlib-1.5.5.orig/Makefile -+++ findlib-1.5.5/Makefile +--- a/Makefile ++++ b/Makefile @@ -17,14 +17,14 @@ opt: for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done @@ -19,7 +17,7 @@ Index: findlib-1.5.5/Makefile $(MAKE) install-config for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done $(MAKE) install-meta - cd src/findlib; $(MAKE) install-num-top + test -z "$(NUMTOP)" || { cd src/findlib; $(MAKE) install-num-top; } if [ $(INSTALL_CAMLP4) -eq 1 ]; then \ - cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"; \ + cp tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"; \ @@ -30,7 +28,7 @@ Index: findlib-1.5.5/Makefile .PHONY: install-doc install-doc: -- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5" +- mkdir -p "$(prefix)$(OCAMLFIND_MAN)/man1" "$(prefix)$(OCAMLFIND_MAN)/man3" "$(prefix)$(OCAMLFIND_MAN)/man5" - -cp doc/ref-man/ocamlfind.1 "$(prefix)$(OCAMLFIND_MAN)/man1" - -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(prefix)$(OCAMLFIND_MAN)/man5" + mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3" "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5" @@ -72,10 +70,8 @@ Index: findlib-1.5.5/Makefile .PHONY: uninstall-config uninstall-config: -Index: findlib-1.5.5/src/findlib-toolbox/Makefile -=================================================================== ---- findlib-1.5.5.orig/src/findlib-toolbox/Makefile -+++ findlib-1.5.5/src/findlib-toolbox/Makefile +--- a/src/findlib-toolbox/Makefile ++++ b/src/findlib-toolbox/Makefile @@ -13,7 +13,7 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m findlib.cma make_wizard.ml @@ -85,11 +81,9 @@ Index: findlib-1.5.5/src/findlib-toolbox/Makefile # uninstall: Nothing to do, because the removal of the findlib core also # deinstalls the make_wizard -Index: findlib-1.5.5/src/findlib/Makefile -=================================================================== ---- findlib-1.5.5.orig/src/findlib/Makefile -+++ findlib-1.5.5/src/findlib/Makefile -@@ -97,30 +97,30 @@ clean: +--- a/src/findlib/Makefile ++++ b/src/findlib/Makefile +@@ -121,30 +121,30 @@ clean: ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX) install: all @@ -99,7 +93,7 @@ Index: findlib-1.5.5/src/findlib/Makefile + mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" + mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)" - files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ + files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ - cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" + cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ diff --git a/findlib-1.6.2.tar.xz b/findlib-1.6.2.tar.xz deleted file mode 100644 index 7237915..0000000 --- a/findlib-1.6.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb979f1c85f037614f357ddf0889ef66a79745e24ef3df02507f283aec0ed1c8 -size 156780 diff --git a/findlib-1.7.3.tar.xz b/findlib-1.7.3.tar.xz new file mode 100644 index 0000000..1a9892d --- /dev/null +++ b/findlib-1.7.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cabb6cd484380e41fb20bf5ec6acc65d20769363754a73c74951dd4238b20111 +size 159972 diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index 5101dd2..b94fcf8 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de + +- Update to upstream version 1.7.3 + Fix regarding num-top: this library is now also optional, as num. + Trying to protect against failures when several package installs are done in parallel. + New subpackage "findlib.top" for the toploop + The "num" library is now optional. + New command "ocamlfind printppx" that outputs how the ppx preprocessor would be called + Support for the raw_spacetime library that comes with OCaml 4.04 + Require that ocamlc and ocamlc.opt are installed to the same directory + "ocamlfind printconf" respects the environment variable OCAMLFIND_CONF + Build with -opaque + Preliminary support for native toplevel + New options: ocamlfind query -qe -qo + ------------------------------------------------------------------- Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index c286da2..97f0222 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -18,7 +18,7 @@ Name: ocaml-findlib -Version: 1.6.2 +Version: 1.7.3 Release: 0 %if %{defined ocaml_preserve_bytecode} %{ocaml_preserve_bytecode}