From ad0715b29c1c161f0ca4838522156fb5c22b3f93b3775972f0c4b27bf606d2f6 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 17 Jul 2017 11:02:17 +0000 Subject: [PATCH 1/8] Remove autodeps for pre openSUSE 12.1 releases OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=62 --- ocaml-findlib.changes | 5 +++++ ocaml-findlib.spec | 14 +------------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index 60dc8da..c7f50e1 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 17 10:48:58 UTC 2017 - ohering@suse.de + +- Remove autodeps for pre openSUSE 12.1 releases + ------------------------------------------------------------------- Wed May 18 21:34:23 UTC 2016 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 3b37225..bcc0b94 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,7 +1,7 @@ # # spec file for package ocaml-findlib # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010-2011 Andrew Psaltis # # All modifications and additions to the file contributed by third parties @@ -29,12 +29,6 @@ Url: http://projects.camlcity.org/projects/findlib.html Source0: findlib-%{version}.tar.xz Patch0: findlib-1.3.3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -# ocaml autodep start for pkg: ocaml-findlib -# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires -%if 0%{?suse_version} < 1210 -Requires: ocaml-findlib-devel -%endif -# ocaml autodep end for pkg: ocaml-findlib # Recommends: ocaml-findlib-camlp4 # @@ -72,12 +66,6 @@ for developing applications that use ocaml-findlib. %package camlp4 -# ocaml autodep start for pkg: ocaml-findlib-camlp4 -# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires -%if 0%{?suse_version} < 1210 -Requires: ocaml-findlib -%endif -# ocaml autodep end for pkg: ocaml-findlib-camlp4 Summary: Development files for ocaml-findlib Group: Development/Libraries/Other Requires: ocaml-camlp4-devel From cdbad4677ebe921a2a89240b550a69a75955c645a4ccff8c7c0950d7c5631917 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 17 Jul 2017 12:41:11 +0000 Subject: [PATCH 2/8] Wrap specfile conditionals to fix quilt setup OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=63 --- ocaml-findlib.changes | 5 +++++ ocaml-findlib.spec | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index c7f50e1..5101dd2 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de + +- Wrap specfile conditionals to fix quilt setup + ------------------------------------------------------------------- Mon Jul 17 10:48:58 UTC 2017 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index bcc0b94..576d8b6 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -20,7 +20,9 @@ Name: ocaml-findlib Version: 1.6.2 Release: 0 +%if %{defined ocaml_preserve_bytecode} %{ocaml_preserve_bytecode} +%endif Summary: Objective CAML package manager and build helper License: MIT Group: Development/Libraries/Other @@ -86,7 +88,7 @@ tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocam -mandir %{_mandir} \ -with-toolbox make all -%if %{ocaml_native_compiler} +%if %{defined ocaml_native_compiler} make opt %endif rm doc/guide-html/TIMESTAMP @@ -128,7 +130,7 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild # %{_libdir}/ocaml/topfind %dir %{_libdir}/ocaml/findlib -%if %{ocaml_native_compiler} +%if %{defined ocaml_native_compiler} %{_libdir}/ocaml/*/*.cmxs %endif @@ -142,7 +144,7 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild %dir %{_libdir}/ocaml/num-top %{_libdir}/ocaml/findlib/META %{_libdir}/ocaml/num-top/META -%if %{ocaml_native_compiler} +%if %{defined ocaml_native_compiler} %{_libdir}/ocaml/*/*.a %{_libdir}/ocaml/*/*.cmxa %endif From 69b2c6b1aa1193996730f3fc7bc423fefafda7d8a5baa71dab12ea40cd3e3c9d Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 17 Jul 2017 14:57:29 +0000 Subject: [PATCH 3/8] fix incorrect ocaml_native_compiler macro change OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=64 --- ocaml-findlib.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 576d8b6..c286da2 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -88,7 +88,7 @@ tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocam -mandir %{_mandir} \ -with-toolbox make all -%if %{defined ocaml_native_compiler} +%if 0%{?ocaml_native_compiler} make opt %endif rm doc/guide-html/TIMESTAMP @@ -130,7 +130,7 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild # %{_libdir}/ocaml/topfind %dir %{_libdir}/ocaml/findlib -%if %{defined ocaml_native_compiler} +%if 0%{?ocaml_native_compiler} %{_libdir}/ocaml/*/*.cmxs %endif @@ -144,7 +144,7 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild %dir %{_libdir}/ocaml/num-top %{_libdir}/ocaml/findlib/META %{_libdir}/ocaml/num-top/META -%if %{defined ocaml_native_compiler} +%if 0%{?ocaml_native_compiler} %{_libdir}/ocaml/*/*.a %{_libdir}/ocaml/*/*.cmxa %endif From a6271ea2f2f03ea9136e0c4053feaa9279a414d22663bc606ea99b8ba9f36bf9 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 18 Jul 2017 16:53:55 +0000 Subject: [PATCH 4/8] - 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 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=65 --- findlib-1.3.3.patch | 26 ++++++++++---------------- findlib-1.6.2.tar.xz | 3 --- findlib-1.7.3.tar.xz | 3 +++ ocaml-findlib.changes | 16 ++++++++++++++++ ocaml-findlib.spec | 2 +- 5 files changed, 30 insertions(+), 20 deletions(-) delete mode 100644 findlib-1.6.2.tar.xz create mode 100644 findlib-1.7.3.tar.xz 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} From ee72571a63f8b3723f9ba020d749e53a561f33186f557a94c61b5e2dcd596aac Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 18 Jul 2017 17:05:37 +0000 Subject: [PATCH 5/8] wildcard for raw_spacetime OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=66 --- ocaml-findlib.spec | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 97f0222..04900e2 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -105,29 +105,15 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild %{_mandir}/man?/* # %dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/bigarray -%{_libdir}/ocaml/bigarray/META -%dir %{_libdir}/ocaml/bytes -%{_libdir}/ocaml/bytes/META -%dir %{_libdir}/ocaml/compiler-libs -%{_libdir}/ocaml/compiler-libs/META -%dir %{_libdir}/ocaml/dynlink -%{_libdir}/ocaml/dynlink/META -%dir %{_libdir}/ocaml/graphics -%{_libdir}/ocaml/graphics/META -%dir %{_libdir}/ocaml/num -%{_libdir}/ocaml/num/META -%dir %{_libdir}/ocaml/ocamldoc -%{_libdir}/ocaml/ocamldoc/META -%dir %{_libdir}/ocaml/stdlib -%{_libdir}/ocaml/stdlib/META -%dir %{_libdir}/ocaml/str -%{_libdir}/ocaml/str/META -%dir %{_libdir}/ocaml/threads -%{_libdir}/ocaml/threads/META -%dir %{_libdir}/ocaml/unix -%{_libdir}/ocaml/unix/META +%dir %{_libdir}/ocaml/* +%{_libdir}/ocaml/*/META # +%exclude %dir %{_libdir}/ocaml/camlp4 +%exclude %dir %{_libdir}/ocaml/findlib +%exclude %dir %{_libdir}/ocaml/num-top +%exclude %{_libdir}/ocaml/camlp4/META +%exclude %{_libdir}/ocaml/findlib/META +%exclude %{_libdir}/ocaml/num-top/META %{_libdir}/ocaml/topfind %dir %{_libdir}/ocaml/findlib %if 0%{?ocaml_native_compiler} From 9a6030490aa9e6b3c4e142cc6c7775dbda7a9396b60dfa802a9a7866492fd31e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 25 Jul 2017 08:40:50 +0000 Subject: [PATCH 6/8] simpler variant of ocaml_preserve_bytecode usage (SR#511780) OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=67 --- ocaml-findlib.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 04900e2..0ee8d92 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -20,9 +20,7 @@ Name: ocaml-findlib Version: 1.7.3 Release: 0 -%if %{defined ocaml_preserve_bytecode} -%{ocaml_preserve_bytecode} -%endif +%{?ocaml_preserve_bytecode} Summary: Objective CAML package manager and build helper License: MIT Group: Development/Libraries/Other From d974221beb274d4d841b89e4dd24de9c9a37612020f5584bb8eb7e55b2059134 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 25 Jul 2017 13:22:18 +0000 Subject: [PATCH 7/8] Use Group: Development/Languages/OCaml OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=68 --- ocaml-findlib.changes | 5 +++++ ocaml-findlib.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index b94fcf8..1d11ce3 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de + +- Use Group: Development/Languages/OCaml + ------------------------------------------------------------------- Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 0ee8d92..9e65e4e 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -23,7 +23,7 @@ Release: 0 %{?ocaml_preserve_bytecode} Summary: Objective CAML package manager and build helper License: MIT -Group: Development/Libraries/Other +Group: Development/Languages/OCaml Url: http://projects.camlcity.org/projects/findlib.html Source0: findlib-%{version}.tar.xz @@ -56,7 +56,7 @@ libraries in programs and scripts. %package devel Summary: Development files for ocaml-findlib -Group: Development/Libraries/Other +Group: Development/Languages/OCaml Requires: %{name} = %{version} %description devel @@ -67,7 +67,7 @@ for developing applications that use ocaml-findlib. %package camlp4 Summary: Development files for ocaml-findlib -Group: Development/Libraries/Other +Group: Development/Languages/OCaml Requires: ocaml-camlp4-devel %description camlp4 From 53c010464af4f3e8fb9b6d5a325a77a8b6f35fc22623d73711f6c442ad6c7f6e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 15 Aug 2017 14:05:46 +0000 Subject: [PATCH 8/8] - drop findlib-1.3.3.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=69 --- findlib-1.3.3.patch | 127 ------------------------------------------ ocaml-findlib.changes | 3 +- ocaml-findlib.spec | 4 +- 3 files changed, 3 insertions(+), 131 deletions(-) delete mode 100644 findlib-1.3.3.patch diff --git a/findlib-1.3.3.patch b/findlib-1.3.3.patch deleted file mode 100644 index 451ed74..0000000 --- a/findlib-1.3.3.patch +++ /dev/null @@ -1,127 +0,0 @@ ---- - Makefile | 32 ++++++++++++++++---------------- - src/findlib-toolbox/Makefile | 2 +- - src/findlib/Makefile | 22 +++++++++++----------- - 3 files changed, 28 insertions(+), 28 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -17,14 +17,14 @@ opt: - for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ) || exit; done - - install: -- mkdir -p "$(prefix)$(OCAMLFIND_BIN)" -- mkdir -p "$(prefix)$(OCAMLFIND_MAN)" -+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" -+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)" - $(MAKE) install-config - for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done - $(MAKE) install-meta - 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)"; \ - fi - $(MAKE) install-doc - -@@ -71,32 +71,32 @@ findlib.conf: findlib.conf.in - - .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" - - .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" - - - .PHONY: install-meta - install-meta: -- 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 [ -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: -- mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`" -- @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi -- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)" -+ mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`" -+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) !!!"; fi -+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" - - .PHONY: uninstall-config - uninstall-config: ---- 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 - - install: -- cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib -+ cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib - - # uninstall: Nothing to do, because the removal of the findlib core also - # deinstalls the make_wizard ---- a/src/findlib/Makefile -+++ b/src/findlib/Makefile -@@ -121,30 +121,30 @@ clean: - ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX) - - install: all -- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" -- mkdir -p "$(prefix)$(OCAMLFIND_BIN)" -- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" -+ 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=`$(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)"; }; \ -- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" -+ cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)" - # the following "if" block is only needed for 4.00beta2 - if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \ - cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \ -- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ -+ cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \ - fi - - install-num-top: -- mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top" -+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top" - cp num_top.cma num_top.cmi num_top_printers.cmi \ -- "$(prefix)$(OCAML_SITELIB)/num-top" -+ "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top" - - # Note: uninstall-num-top is part of the removal of the META files. - - uninstall: -- rm -f $(prefix)$(OCAML_CORE_STDLIB)/findlib -- rm -rf $(prefix)$(OCAML_SITELIB)/$(NAME) -- rm -f $(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX) -+ rm -f $(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)/findlib -+ rm -rf $(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME) -+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX) - - - depend: *.ml *.mli fl_meta.ml fl_metascanner.ml diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index 1d11ce3..ef94ee6 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -6,7 +6,7 @@ Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de ------------------------------------------------------------------- Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de -- Update to upstream version 1.7.3 +- 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 @@ -18,6 +18,7 @@ Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de Build with -opaque Preliminary support for native toplevel New options: ocamlfind query -qe -qo +- drop findlib-1.3.3.patch ------------------------------------------------------------------- Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 9e65e4e..dd68223 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -27,7 +27,6 @@ Group: Development/Languages/OCaml Url: http://projects.camlcity.org/projects/findlib.html Source0: findlib-%{version}.tar.xz -Patch0: findlib-1.3.3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Recommends: ocaml-findlib-camlp4 @@ -75,7 +74,6 @@ The ocaml-findlib-camlp4 contains signature files for developing applications th %prep %setup -q -n findlib-%{version} -%patch0 -p1 %build (cd tools/extract_args && make) @@ -92,7 +90,7 @@ make opt rm doc/guide-html/TIMESTAMP %install -make install DESTDIR=$RPM_BUILD_ROOT +make install prefix=$RPM_BUILD_ROOT rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild %files