From 1b807b999cc0c2873ead38a7c4567f7e3f5fb2f3f0f2fa9e679e6014cdade853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 15:40:45 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main ocaml-gettext revision 722cac44a6cc3e8fe2784ae00ac14b5d --- ocaml-gettext-0.4.2.tar.xz | 4 ++-- ocaml-gettext.changes | 14 ++++++++++++++ ocaml-gettext.spec | 6 +++--- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ocaml-gettext-0.4.2.tar.xz b/ocaml-gettext-0.4.2.tar.xz index 79093ae..8633b1f 100644 --- a/ocaml-gettext-0.4.2.tar.xz +++ b/ocaml-gettext-0.4.2.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20b2955d1de659da91b99f4cae75db78f81829999a78fe013a3c7aef41ae37e5 -size 80356 +oid sha256:bb20d97ef1fd1addbe9ef7304781e269e2dae654a7968e9798e4925e62fac899 +size 80404 diff --git a/ocaml-gettext.changes b/ocaml-gettext.changes index 11c4de4..23f166e 100644 --- a/ocaml-gettext.changes +++ b/ocaml-gettext.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 16 16:16:16 UTC 2024 - ohering@suse.de + +- Remove usage of dune.configurator because ocamlfind names which + contain a dot are not considered valid anymore with dune 3.13 + ------------------------------------------------------------------- Tue Aug 8 08:08:08 UTC 2023 - ohering@suse.de @@ -20,6 +26,14 @@ Thu Aug 20 20:20:20 UTC 2020 - ohering@suse.de - Update to version 0.4.2 Compatibility with OCaml 4.11 +------------------------------------------------------------------- +Thu May 14 14:14:14 UTC 2020 - ohering@suse.de + +- The filename for rpm *.attr files and the tag used within these + files must match. Otherwise rpm will not execute the helper scripts. + Use helper 'suseocaml' in addition to 'ocaml' to avoid + filename conflicts with rpm-build.rpm (bsc#1154874) + ------------------------------------------------------------------- Fri Nov 1 12:34:56 UTC 2019 - ohering@suse.de diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec index ea2ec12..36e6b9b 100644 --- a/ocaml-gettext.spec +++ b/ocaml-gettext.spec @@ -1,7 +1,7 @@ # # spec file for package ocaml-gettext # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,11 +39,11 @@ URL: https://opam.ocaml.org/packages/gettext Source0: %pkg-%version.tar.xz BuildRequires: ocaml BuildRequires: ocaml-dune -BuildRequires: ocaml-rpm-macros >= 20230101 +BuildRequires: ocaml-rpm-macros >= 20231101 %if 1 BuildRequires: ocamlfind(compiler-libs.common) BuildRequires: ocamlfind(cppo) -BuildRequires: ocamlfind(dune.configurator) +BuildRequires: ocamlfind(dune-configurator) BuildRequires: ocamlfind(fileutils) %endif