From bec8c1ca7859f791ee1d20a6c7e7def6c80b3ffcebe0bf6760e6a39fc600912d Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 4 Apr 2022 16:31:31 +0000 Subject: [PATCH 1/2] remove braces from rpmspec macros OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-stdcompat?expand=0&rev=21 --- ocaml-stdcompat.spec | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ocaml-stdcompat.spec b/ocaml-stdcompat.spec index 3091b8c..cbc96ec 100644 --- a/ocaml-stdcompat.spec +++ b/ocaml-stdcompat.spec @@ -16,7 +16,7 @@ # -%define _lto_cflags %{nil} +%define _lto_cflags %nil Name: ocaml-stdcompat Version: 17 Release: 0 @@ -25,8 +25,8 @@ Summary: Stdcompat: compatibility module for OCaml standard library License: BSD-2-Clause Group: Development/Languages/OCaml URL: https://opam.ocaml.org/packages/stdcompat -Source0: %{name}-%{version}.tar.xz -Source1: %{name}-rpmlintrc +Source0: %name-%version.tar.xz +Source1: %name-rpmlintrc BuildRequires: autoconf BuildRequires: automake BuildRequires: bash @@ -38,13 +38,13 @@ BuildRequires: ocaml(ocaml.opt) Stdcompat is a compatibility layer allowing programs to use some recent additions to the OCaml standard library while preserving the ability to be compiled on former versions of OCaml. %package devel -Summary: Development files for %{name} +Summary: Development files for %name Group: Development/Languages/OCaml -Requires: %{name} = %{version} +Requires: %name = %version %description devel -The %{name}-devel package contains libraries and signature files for -developing applications that use %{name}. +The %name-devel package contains libraries and signature files for +developing applications that use %name. %prep %autosetup -p1 @@ -52,16 +52,16 @@ developing applications that use %{name}. %build %make_build -f Makefile.bootstrap %configure \ - --libdir=%{ocaml_standard_library} + --libdir=%ocaml_standard_library %make_build -j1 %install %make_install -find %{buildroot} -type f -exec chmod -v 644 '{}' + +find %buildroot -type f -exec chmod -v 644 '{}' + %ocaml_create_file_list -%files -f %{name}.files +%files -f %name.files -%files devel -f %{name}.files.devel +%files devel -f %name.files.devel %changelog From d61823e8fe552c0fb888347660a74c3a323f6ba47439e6630aab8754f0c24665 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 4 Apr 2022 16:32:05 +0000 Subject: [PATCH 2/2] - Update to version 18 Support for OCaml 4.14.0 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-stdcompat?expand=0&rev=22 --- _service | 2 +- ocaml-stdcompat-17.tar.xz | 3 --- ocaml-stdcompat-18.tar.xz | 3 +++ ocaml-stdcompat.changes | 6 ++++++ ocaml-stdcompat.spec | 6 +++--- 5 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 ocaml-stdcompat-17.tar.xz create mode 100644 ocaml-stdcompat-18.tar.xz diff --git a/_service b/_service index 4ed097e..260d725 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ ocaml-stdcompat - 3a58c6ab12577d6f76c1a3c21a738d9d11cbddbc + 014ff59eee0e6014dd5e832b9c7ae645ef4a6397 git disable https://github.com/thierry-martinez/stdcompat.git diff --git a/ocaml-stdcompat-17.tar.xz b/ocaml-stdcompat-17.tar.xz deleted file mode 100644 index 761302b..0000000 --- a/ocaml-stdcompat-17.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:869569de851f572ce4e71dba2d2183d14608b28108aafcdf71541c47aee3e265 -size 118388 diff --git a/ocaml-stdcompat-18.tar.xz b/ocaml-stdcompat-18.tar.xz new file mode 100644 index 0000000..54195da --- /dev/null +++ b/ocaml-stdcompat-18.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:023c94ce25895359116540b03b54fa49619a5e0833f85a0bd9a76c3e709ead2d +size 128808 diff --git a/ocaml-stdcompat.changes b/ocaml-stdcompat.changes index bc64dc5..bcdcdc0 100644 --- a/ocaml-stdcompat.changes +++ b/ocaml-stdcompat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 4 04:04:04 UTC 2022 - ohering@suse.de + +- Update to version 18 + Support for OCaml 4.14.0 + ------------------------------------------------------------------- Sun Oct 10 10:10:10 UTC 2021 - ohering@suse.de diff --git a/ocaml-stdcompat.spec b/ocaml-stdcompat.spec index cbc96ec..5c1c690 100644 --- a/ocaml-stdcompat.spec +++ b/ocaml-stdcompat.spec @@ -1,7 +1,7 @@ # # spec file for package ocaml-stdcompat # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define _lto_cflags %nil Name: ocaml-stdcompat -Version: 17 +Version: 18 Release: 0 %{?ocaml_preserve_bytecode} Summary: Stdcompat: compatibility module for OCaml standard library @@ -31,7 +31,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: bash BuildRequires: ocamlfind(findlib) -BuildRequires: ocaml-rpm-macros >= 20210911 +BuildRequires: ocaml-rpm-macros >= 20220222 BuildRequires: ocaml(ocaml.opt) %description