From dc71edb6fd5ed30475235fdcc0fefb1fe0e21b428397376ed7ea2b3bce73906e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 13 Apr 2021 13:37:21 +0000 Subject: [PATCH 1/5] Accepting request 884968 from Archiving:unison:buildrequires OBS-URL: https://build.opensuse.org/request/show/884968 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=90 --- ocaml-findlib.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 4ef04f2..6e353ea 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -24,7 +24,7 @@ Release: 0 Summary: Objective CAML package manager and build helper License: MIT Group: Development/Languages/OCaml - +BuildRoot: %_tmppath/%name-%version-build Url: https://github.com/ocaml/ocamlfind Source0: findlib-%{version}.tar.xz # @@ -32,12 +32,11 @@ Requires: ocaml-compiler-libs Requires: ocaml-runtime # Provides: ocamlfind = %{version} - BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: ocaml BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 20200220 +BuildRequires: ocaml-rpm-macros >= 20210409 %description Findlib is a library manager for Objective Caml. It provides a @@ -58,7 +57,7 @@ The ocaml-findlib-devel package contains libraries and signature files for developing applications that use ocaml-findlib. %prep -%autosetup -p1 -n findlib-%{version} +%setup -q -n findlib-%{version} %build rm -rfv site-lib-src @@ -70,7 +69,7 @@ tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocam -mandir %{_mandir} \ -with-toolbox make all -%if 0%{?ocaml_native_compiler} +%if 0%{?suse_ocaml_native_compiler} make opt %endif rm -fv doc/guide-html/TIMESTAMP @@ -81,6 +80,7 @@ rm -rfv %{buildroot}%{ocaml_standard_library}/ocamlbuild %ocaml_create_file_list %files -f %{name}.files +%defattr(-,root,root,-) %{ocaml_standard_library}/ocamlfind.conf %{ocaml_standard_library}/topfind %{_bindir}/* @@ -88,6 +88,7 @@ rm -rfv %{buildroot}%{ocaml_standard_library}/ocamlbuild # %files devel -f %{name}.files.devel +%defattr(-,root,root,-) %{ocaml_standard_library}/*/Makefile.config %changelog From 051b22e836416f7bfcc55b56d088f2854cb03c0bab176e119d95e741499b477a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 13 Apr 2021 13:44:38 +0000 Subject: [PATCH 2/5] ocaml-findlib.changes OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=91 --- ocaml-findlib.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index d94f831..d85277b 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Feb 20 20:20:20 UTC 2020 - ohering@suse.de +Fri Apr 9 09:09:09 UTC 2021 - ohering@suse.de - Require current ocaml-rpm-macros - Remove unused dependency to ocamlbuild in preparation of ocamlbuild removal From 8c4b052eb3e1ae4f7c0adf8c8a4b950884c1be4fbe09872f6a288e3365fd806e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 13 Apr 2021 13:45:27 +0000 Subject: [PATCH 3/5] ocaml-findlib.changes OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=92 --- ocaml-findlib.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index d85277b..206b1a6 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -1,6 +1,11 @@ ------------------------------------------------------------------- Fri Apr 9 09:09:09 UTC 2021 - ohering@suse.de +- Require current ocaml-rpm-macros + +------------------------------------------------------------------- +Thu Feb 20 20:20:20 UTC 2020 - ohering@suse.de + - Require current ocaml-rpm-macros - Remove unused dependency to ocamlbuild in preparation of ocamlbuild removal From 1a9ed08825d59a35439686cb2b33cdcfcdb2746d9e5e643fd67828e5583fc658 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 13 Apr 2021 14:14:39 +0000 Subject: [PATCH 4/5] - Update to upstream version 1.9.1 Fix an incomaptibility with ocaml-4.13 Switch from m4 to sed OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=93 --- _service | 4 ++-- findlib-1.8.1.tar.xz | 3 --- findlib-1.9.1.tar.xz | 3 +++ ocaml-findlib.changes | 3 +++ ocaml-findlib.spec | 6 ++---- 5 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 findlib-1.8.1.tar.xz create mode 100644 findlib-1.9.1.tar.xz diff --git a/_service b/_service index e41914a..c664817 100644 --- a/_service +++ b/_service @@ -2,8 +2,8 @@ https://github.com/ocaml/ocamlfind.git git - 1.8.1 - findlib-1.8.1 + 1.9.1 + findlib-1.9.1 ocaml-findlib diff --git a/findlib-1.8.1.tar.xz b/findlib-1.8.1.tar.xz deleted file mode 100644 index 72e79e0..0000000 --- a/findlib-1.8.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a34d0412b8bf34e08155fa4cdb635066d91de569fd644d2e26c00ee4768d81e6 -size 161420 diff --git a/findlib-1.9.1.tar.xz b/findlib-1.9.1.tar.xz new file mode 100644 index 0000000..7147c8d --- /dev/null +++ b/findlib-1.9.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:116311a9a2aee7ff09e399f468bc9b1cecb5bc939f5c001529c035aba0b48a83 +size 169048 diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index 206b1a6..2cc6ef5 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -2,6 +2,9 @@ Fri Apr 9 09:09:09 UTC 2021 - ohering@suse.de - Require current ocaml-rpm-macros +- Update to upstream version 1.9.1 + Fix an incomaptibility with ocaml-4.13 + Switch from m4 to sed ------------------------------------------------------------------- Thu Feb 20 20:20:20 UTC 2020 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 6e353ea..24b76cd 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -18,7 +18,7 @@ Name: ocaml-findlib -Version: 1.8.1 +Version: 1.9.1 Release: 0 %{?ocaml_preserve_bytecode} Summary: Objective CAML package manager and build helper @@ -32,8 +32,6 @@ Requires: ocaml-compiler-libs Requires: ocaml-runtime # Provides: ocamlfind = %{version} -BuildRequires: m4 -BuildRequires: ncurses-devel BuildRequires: ocaml BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-rpm-macros >= 20210409 @@ -72,11 +70,11 @@ make all %if 0%{?suse_ocaml_native_compiler} make opt %endif -rm -fv doc/guide-html/TIMESTAMP %install make install prefix=%{buildroot} rm -rfv %{buildroot}%{ocaml_standard_library}/ocamlbuild +rm -rfv %{buildroot}%{ocaml_standard_library}/findlib/Makefile.packages %ocaml_create_file_list %files -f %{name}.files From 4e9061a251f469c26914807476723de26a5ed459596019d1595ab534ff430d9a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 21 Apr 2021 13:02:46 +0000 Subject: [PATCH 5/5] - Remove ocaml_native_compiler conditional build native target unconditionally OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=94 --- ocaml-findlib.changes | 2 ++ ocaml-findlib.spec | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index 2cc6ef5..aa5d23a 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -5,6 +5,8 @@ Fri Apr 9 09:09:09 UTC 2021 - ohering@suse.de - Update to upstream version 1.9.1 Fix an incomaptibility with ocaml-4.13 Switch from m4 to sed +- Remove ocaml_native_compiler conditional + build native target unconditionally ------------------------------------------------------------------- Thu Feb 20 20:20:20 UTC 2020 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 24b76cd..d0d5bf8 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -67,9 +67,7 @@ tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocam -mandir %{_mandir} \ -with-toolbox make all -%if 0%{?suse_ocaml_native_compiler} make opt -%endif %install make install prefix=%{buildroot}