Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package ocaml-sha for openSUSE:Factory 
checked in at 2021-02-04 20:24:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-sha (Old)
 and      /work/SRC/openSUSE:Factory/.ocaml-sha.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ocaml-sha"

Thu Feb  4 20:24:42 2021 rev:5 rq:869494 version:1.13

Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-sha/ocaml-sha.changes      2020-04-05 
20:56:58.785406304 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-sha.new.28504/ocaml-sha.changes   
2021-02-04 20:25:12.970930583 +0100
@@ -1,0 +2,6 @@
+Thu Jan 21 21:21:21 UTC 2021 - oher...@suse.de
+
+- remove dependency to ounit via _multibuild
+- fix discarded-qualifiers errors via ocaml-sha.patch
+
+-------------------------------------------------------------------

New:
----
  _multibuild
  ocaml-sha.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ocaml-sha.spec ++++++
--- /var/tmp/diff_new_pack.2NEbeu/_old  2021-02-04 20:25:13.678931662 +0100
+++ /var/tmp/diff_new_pack.2NEbeu/_new  2021-02-04 20:25:13.686931674 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ocaml-sha
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,7 +15,16 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-Name:           ocaml-sha
+
+%define build_flavor @BUILD_FLAVOR@%{nil}
+%if "%{build_flavor}" == "testsuite"
+%define nsuffix -testsuite
+%else
+%define nsuffix %{nil}
+%endif
+
+%define     pkg ocaml-sha
+Name:           %{pkg}%{nsuffix}
 Version:        1.13
 Release:        0
 %{?ocaml_preserve_bytecode}
@@ -23,11 +32,16 @@
 License:        ISC
 Group:          Development/Languages/OCaml
 URL:            https://opam.ocaml.org/packages/sha
-Source0:        %{name}-%{version}.tar.xz
+Source0:        %{pkg}-%{version}.tar.xz
+Patch0:         ocaml-sha.patch
 BuildRequires:  ocaml
-BuildRequires:  ocaml-dune
-BuildRequires:  ocaml-rpm-macros >= 20200220
+BuildRequires:  ocaml-dune >= 2.0
+BuildRequires:  ocaml-rpm-macros >= 20210121
+
+%if "%{build_flavor}" == "testsuite"
 BuildRequires:  ocamlfind(oUnit)
+BuildRequires:  ocamlfind(sha)
+%endif
 
 %description
 A binding for SHA interface code in OCaml. Offering the same interface than
@@ -44,22 +58,31 @@
 developing applications that use %{name}.
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{pkg}-%{version}
 
 %build
 dune_release_pkgs='sha'
 %ocaml_dune_setup
+%if "%{build_flavor}" == ""
 %ocaml_dune_build
+%endif
 
 %install
+%if "%{build_flavor}" == ""
 %ocaml_dune_install
 %ocaml_create_file_list
+%endif
 
+%if "%{build_flavor}" == "testsuite"
 %check
 %ocaml_dune_test
+%endif
 
+%if "%{build_flavor}" == ""
 %files -f %{name}.files
 
 %files devel -f %{name}.files.devel
 
+%endif
+
 %changelog

++++++ _multibuild ++++++
<multibuild>
  <package>testsuite</package>
</multibuild>
++++++ ocaml-sha.patch ++++++
--- a/sha1_stubs.c
+++ b/sha1_stubs.c
@@ -154,7 +154,7 @@ CAMLprim value stub_sha1_to_bin(value di
        CAMLlocal1(result);
 
        result = caml_alloc_string(20);
-       sha1_to_bin((sha1_digest *) digest, String_val(result));
+       sha1_to_bin((sha1_digest *) digest, &Byte(result, 0));
 
        CAMLreturn(result);
 }
@@ -165,7 +165,7 @@ CAMLprim value stub_sha1_to_hex(value di
        CAMLlocal1(result);
 
        result = caml_alloc_string(40);
-       sha1_to_hex((sha1_digest *) digest, String_val(result));
+       sha1_to_hex((sha1_digest *) digest, &Byte(result, 0));
 
        CAMLreturn(result);
 }
--- a/sha256_stubs.c
+++ b/sha256_stubs.c
@@ -152,7 +152,7 @@ CAMLprim value stub_sha256_to_bin(value
        CAMLlocal1(result);
 
        result = caml_alloc_string(32);
-       sha256_to_bin((sha256_digest *) digest, String_val(result));
+       sha256_to_bin((sha256_digest *) digest, &Byte(result, 0));
 
        CAMLreturn(result);
 }
@@ -163,7 +163,7 @@ CAMLprim value stub_sha256_to_hex(value
        CAMLlocal1(result);
 
        result = caml_alloc_string(64);
-       sha256_to_hex((sha256_digest *) digest, String_val(result));
+       sha256_to_hex((sha256_digest *) digest, &Byte(result, 0));
 
        CAMLreturn(result);
 }
--- a/sha512_stubs.c
+++ b/sha512_stubs.c
@@ -152,7 +152,7 @@ CAMLprim value stub_sha512_to_bin(value
        CAMLlocal1(result);
 
        result = caml_alloc_string(64);
-       sha512_to_bin((sha512_digest *) digest, String_val(result));
+       sha512_to_bin((sha512_digest *) digest, &Byte(result, 0));
 
        CAMLreturn(result);
 }
@@ -163,7 +163,7 @@ CAMLprim value stub_sha512_to_hex(value
        CAMLlocal1(result);
 
        result = caml_alloc_string(128);
-       sha512_to_hex((sha512_digest *) digest, String_val(result));
+       sha512_to_hex((sha512_digest *) digest, &Byte(result, 0));
 
        CAMLreturn(result);
 }

Reply via email to