From 59954b54752bbc0e2dcfd3a211cd97ecbb190dc6bd21ba4eff540495f39f78f0 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 18 May 2016 21:56:44 +0000 Subject: [PATCH] - Update to upstream version 1.6.2 Adding an "ocamldoc" library, providing the cmi's for ocamldoc plugins Support for OCaml-4.03: recognize that the new -color option has an argument Adding support for dynamically loading packages new "plugin" variable, new Fl_dynload module. New command "ocamlfind lint" for checking META files Allow to query the location of the META file of a package: "ocamlfind query -format '%m'" Get the install path for the META file of packages: "ocamlfind printconf metapath" The switch -only-show did not work as described. OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=37 --- findlib-1.3.3.patch | 42 +++++++++++++++++++++--------------------- findlib-1.5.5.tar.xz | 3 --- findlib-1.6.2.tar.xz | 3 +++ ocaml-findlib.changes | 15 +++++++++++++++ ocaml-findlib.spec | 4 ++-- 5 files changed, 41 insertions(+), 26 deletions(-) delete mode 100644 findlib-1.5.5.tar.xz create mode 100644 findlib-1.6.2.tar.xz diff --git a/findlib-1.3.3.patch b/findlib-1.3.3.patch index 265a5be..ffe2d21 100644 --- a/findlib-1.3.3.patch +++ b/findlib-1.3.3.patch @@ -30,36 +30,36 @@ 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 -- -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 -+ -cp doc/ref-man/ocamlfind.1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 -+ -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(DESTDIR)$(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" ++ -cp doc/ref-man/ocamlfind.1 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1" ++ -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5" .PHONY: uninstall-doc uninstall-doc: -- rm -f $(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1 -- rm -f $(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3 -- rm -f $(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3 -- rm -f $(prefix)$(OCAMLFIND_MAN)/man5/META.5 -- rm -f $(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5 -+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1 -+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3 -+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3 -+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/META.5 -+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5 +- rm -f "$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1" +- rm -f "$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3" +- rm -f "$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3" +- rm -f "$(prefix)$(OCAMLFIND_MAN)/man5/META.5" +- rm -f "$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5" ++ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1" ++ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3" ++ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3" ++ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/META.5" ++ rm -f "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5" .PHONY: install-meta install-meta: -- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done -+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done +- for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done ++ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done .PHONY: uninstall-meta uninstall-meta: -- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" ]; then rm -rf "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done -+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" ]; then rm -rf "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done +- for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then rm -rf "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done ++ for x in `ls site-lib-src`; do if [ -f "site-lib-src/$$x/META" ]; then rm -rf "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done .PHONY: install-config install-config: @@ -99,7 +99,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 META` && \ + 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` && \ - 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.5.5.tar.xz b/findlib-1.5.5.tar.xz deleted file mode 100644 index 21a83d9..0000000 --- a/findlib-1.5.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19b17d1c09e51f891974b462ed81f1ff78ea53ade78646fad90c46b69dc55c5a -size 150476 diff --git a/findlib-1.6.2.tar.xz b/findlib-1.6.2.tar.xz new file mode 100644 index 0000000..7237915 --- /dev/null +++ b/findlib-1.6.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb979f1c85f037614f357ddf0889ef66a79745e24ef3df02507f283aec0ed1c8 +size 156780 diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index cd3b9a6..f3cd041 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed May 18 21:34:23 UTC 2016 - ohering@suse.de + +- Update to upstream version 1.6.2 + Adding an "ocamldoc" library, providing the cmi's for ocamldoc plugins + Support for OCaml-4.03: recognize that the new -color option has an argument + Adding support for dynamically loading packages + new "plugin" variable, new Fl_dynload module. + New command "ocamlfind lint" for checking META files + Allow to query the location of the META file of a package: + "ocamlfind query -format '%m'" + Get the install path for the META file of packages: + "ocamlfind printconf metapath" + The switch -only-show did not work as described. + ------------------------------------------------------------------- Tue Nov 10 10:18:47 UTC 2015 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 846abc2..19bc1cf 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,7 +1,7 @@ # # spec file for package ocaml-findlib # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010-2011 Andrew Psaltis # # All modifications and additions to the file contributed by third parties @@ -17,7 +17,7 @@ # -Version: 1.5.5 +Version: 1.6.2 Release: 0 %{ocaml_preserve_bytecode} Name: ocaml-findlib