From ed6004cabd767d75c54bfc28ac3cc10802f2707ebad2b2858744ba470ff34791 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 24 Sep 2019 17:53:28 +0000 Subject: [PATCH 1/4] - Update to 1.6.6 Fix build OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=45 --- _service | 6 +++--- ocaml-cppo-1.6.5.tar.xz | 3 --- ocaml-cppo-1.6.6.tar.xz | 3 +++ ocaml-cppo.changes | 6 ++++++ ocaml-cppo.spec | 36 ++++++++++-------------------------- 5 files changed, 22 insertions(+), 32 deletions(-) delete mode 100644 ocaml-cppo-1.6.5.tar.xz create mode 100644 ocaml-cppo-1.6.6.tar.xz diff --git a/_service b/_service index 4125f8f..33a6b72 100644 --- a/_service +++ b/_service @@ -1,9 +1,9 @@ - git://github.com/ocaml-community/cppo.git + https://github.com/ocaml-community/cppo.git git - 1.6.5 - v1.6.5 + 1.6.6 + v1.6.6 ocaml-cppo diff --git a/ocaml-cppo-1.6.5.tar.xz b/ocaml-cppo-1.6.5.tar.xz deleted file mode 100644 index 594804f..0000000 --- a/ocaml-cppo-1.6.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:880b31a6439423010297ab7e5f020c286633466d20602583ce38064496f03cce -size 24400 diff --git a/ocaml-cppo-1.6.6.tar.xz b/ocaml-cppo-1.6.6.tar.xz new file mode 100644 index 0000000..1864e85 --- /dev/null +++ b/ocaml-cppo-1.6.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:121a5f0922cb465e0d802c42cc143768d63c37c921fc7b4c1699b3e3619725fb +size 24848 diff --git a/ocaml-cppo.changes b/ocaml-cppo.changes index bf9a65d..6a8557a 100644 --- a/ocaml-cppo.changes +++ b/ocaml-cppo.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 23 16:35:39 UTC 2019 - ohering@suse.de + +- Update to 1.6.6 + Fix build + ------------------------------------------------------------------- Tue Feb 19 03:21:22 UTC 2019 - andy@onthewings.net diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 2a7d657..63ff068 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -18,12 +18,8 @@ # -# cppo may use opam-installer but opam requires cppo for its build. -# So here we don't use opam-installer by default. -# Build with "--with-opam" to use opam despite the circular dependency. -%bcond_with opam Name: ocaml-cppo -Version: 1.6.5 +Version: 1.6.6 Release: 0 %{?ocaml_preserve_bytecode} Summary: The C preprocessor written in OCaml @@ -39,9 +35,6 @@ BuildRequires: ocamlfind(easy-format) BuildRequires: ocamlfind(ocamlbuild) BuildRequires: ocamlfind(str) BuildRequires: ocamlfind(unix) -%if %{with opam} -BuildRequires: opam -%endif %description Cppo is an equivalent of the C preprocessor targeted at the OCaml language and @@ -66,30 +59,22 @@ The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep -%setup -q +%autosetup -p1 %build -dune build @install --profile release +%ocaml_dune_setup +%ocaml_dune_build %install -%if %{with opam} - install -d %{buildroot}%{_libdir}/ocaml - dune install --prefix=%{buildroot}%{_prefix} --libdir=%{buildroot}%{_libdir}/ocaml - rm -r %{buildroot}%{_prefix}/doc -%else - # By hand, not funny - cd _build/install/default - install -d %{buildroot}%{_libdir}/ocaml/cppo{,_ocamlbuild} - install -m0644 lib/cppo/* %{buildroot}%{_libdir}/ocaml/cppo/ - install -m0644 lib/cppo_ocamlbuild/* %{buildroot}%{_libdir}/ocaml/cppo_ocamlbuild/ - install -d %{buildroot}%{_bindir} - install -m0755 bin/cppo %{buildroot}%{_bindir} -%endif +%ocaml_dune_install + +%check +%ocaml_dune_test %files -%defattr(-,root,root) %{_bindir}/cppo -%doc LICENSE.md README.md +%license LICENSE.md +%doc README.md %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* %if 0%{?ocaml_native_compiler} @@ -97,7 +82,6 @@ dune build @install --profile release %endif %files devel -%defattr(-,root,root,-) %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/* %if 0%{?ocaml_native_compiler} From b081c2a485f576a52e4c7f07b3946ebea809c67998880f4694148e8948f843fa Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 24 Sep 2019 19:51:26 +0000 Subject: [PATCH 2/4] -BuildRequires: ocaml-ocamldoc OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=46 --- ocaml-cppo.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 63ff068..4beffe5 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -29,7 +29,6 @@ Url: https://github.com/ocaml-community/cppo Source: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-rpm-macros >= 4.03 BuildRequires: ocamlfind(easy-format) BuildRequires: ocamlfind(ocamlbuild) From 64fec624094aa3583723b9196cc6e18dba3f8a15995d0cf5591cfed0f11aac67 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 30 Sep 2019 16:16:44 +0000 Subject: [PATCH 3/4] - use dune macros from ocaml-rpm-macros OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=47 --- ocaml-cppo.changes | 5 +++++ ocaml-cppo.spec | 32 ++++++-------------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/ocaml-cppo.changes b/ocaml-cppo.changes index 6a8557a..147df2b 100644 --- a/ocaml-cppo.changes +++ b/ocaml-cppo.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 30 12:34:56 UTC 2019 - ohering@suse.de + +- use dune macros from ocaml-rpm-macros + ------------------------------------------------------------------- Mon Sep 23 16:35:39 UTC 2019 - ohering@suse.de diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index 4beffe5..e821650 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -29,7 +29,7 @@ Url: https://github.com/ocaml-community/cppo Source: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 4.03 +BuildRequires: ocaml-rpm-macros >= 20190930 BuildRequires: ocamlfind(easy-format) BuildRequires: ocamlfind(ocamlbuild) BuildRequires: ocamlfind(str) @@ -66,36 +66,16 @@ developing applications that use %{name}. %install %ocaml_dune_install +%ocaml_create_file_list %check -%ocaml_dune_test +%ocaml_dune_test || : make check failed -%files -%{_bindir}/cppo +%files -f %{name}.files %license LICENSE.md %doc README.md -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.cmxs -%endif +%{_bindir}/cppo -%files devel -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.a -%{_libdir}/ocaml/*/*.cmx -%{_libdir}/ocaml/*/*.cmxa -%endif -%{_libdir}/ocaml/*/*.cma -%{_libdir}/ocaml/*/*.cmi -%{_libdir}/ocaml/*/*.cmt -%{_libdir}/ocaml/*/*.cmti -%{_libdir}/ocaml/*/*.ml -%{_libdir}/ocaml/*/*.mli -%{_libdir}/ocaml/*/dune-package -%{_libdir}/ocaml/*/META -%{_libdir}/ocaml/*/opam +%files devel -f %{name}.files.devel %changelog From b1266f2383f94584abb695e775ee4c28a2ba60d004a0b31678a7a1b56805298e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 15 Oct 2019 08:48:39 +0000 Subject: [PATCH 4/4] newer macros OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-cppo?expand=0&rev=48 --- ocaml-cppo.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ocaml-cppo.spec b/ocaml-cppo.spec index e821650..2c8fd95 100644 --- a/ocaml-cppo.spec +++ b/ocaml-cppo.spec @@ -29,7 +29,7 @@ Url: https://github.com/ocaml-community/cppo Source: %{name}-%{version}.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20190930 +BuildRequires: ocaml-rpm-macros >= 20191009 BuildRequires: ocamlfind(easy-format) BuildRequires: ocamlfind(ocamlbuild) BuildRequires: ocamlfind(str) @@ -69,10 +69,9 @@ developing applications that use %{name}. %ocaml_create_file_list %check -%ocaml_dune_test || : make check failed +%ocaml_dune_test %files -f %{name}.files -%license LICENSE.md %doc README.md %{_bindir}/cppo