Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Leap:15.2 checked in at 2020-04-17 13:36:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Leap:15.2/.ocaml-rpm-macros.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-rpm-macros"
Fri Apr 17 13:36:32 2020 rev:2 rq:793936 version:20200412
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/ocaml-rpm-macros/ocaml-rpm-macros.changes
2020-03-13 10:55:52.856370756 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.ocaml-rpm-macros.new.2738/ocaml-rpm-macros.changes
2020-04-17 13:36:32.932174991 +0200
@@ -1,0 +2,11 @@
+Sun Apr 12 12:12:12 UTC 2020 - oher...@suse.de
+
+- run OCaml rpm dependency generator only if both path and magic matches
(rpm#1173)
+
+-------------------------------------------------------------------
+Sat Mar 21 12:34:56 UTC 2020 - oher...@suse.de
+
+- Disable parallel build for OCaml 4.08, 4.09 and 4.10
+ to get reproducible cma archives (issue#9307)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-rpm-macros.spec ++++++
--- /var/tmp/diff_new_pack.U886oa/_old 2020-04-17 13:36:33.256175235 +0200
+++ /var/tmp/diff_new_pack.U886oa/_new 2020-04-17 13:36:33.260175238 +0200
@@ -16,7 +16,7 @@
#
Name: ocaml-rpm-macros
-Version: 20200220
+Version: 20200412
Release: 0
Summary: RPM macros for building OCaml source packages
License: GPL-2.0-only
@@ -70,6 +70,7 @@
%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh --requires
%__${tag}_magic ^(ELF|Objective caml|OCaml) .*$
%__${tag}_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$
+%__${tag}_flags magic_and_path
_EOF_
#
tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE0}
@@ -413,16 +414,34 @@
| awk '/^-[[:blank:]]/{ printf "BuildRequires:
ocamlfind(%%s)\\n", $2}' | sort -u ; \
%%{nil}
%%ocaml_dune_build \
+ if test -z "${_smp_mflags}" ;\
+ then \
+ _smp_mflags='%%{?_smp_mflags}' ;\
+ case "$(ocamlc --version)" in \\\
+ 4.08*) _smp_mflags='-j1' ;;\\\
+ 4.09*) _smp_mflags='-j1' ;;\\\
+ 4.10*) _smp_mflags='-j1' ;;\\\
+ esac ;\
+ fi ;\
dune build \\\
--verbose \\\
${dune_for_release} \\\
- %%{?_smp_mflags} \\\
+ ${_smp_mflags} \\\
'@install' \\\
$OCAML_DUNE_BUILD_INSTALL_ARGS
%%ocaml_dune_install \
%ifarch ppc64 ppc64le
ulimit -s $((1024 * 64)) ; \
%endif
+ if test -z "${_smp_mflags}" ;\
+ then \
+ _smp_mflags='%%{?_smp_mflags}' ;\
+ case "$(ocamlc --version)" in \\\
+ 4.08*) _smp_mflags='-j1' ;;\\\
+ 4.09*) _smp_mflags='-j1' ;;\\\
+ 4.10*) _smp_mflags='-j1' ;;\\\
+ esac ;\
+ fi ;\
dune_for_release= ;\
if test -f dune_release_pkgs-%%{name}-%%{version}-%%{release} ; \
then \
@@ -432,7 +451,7 @@
dune install \\\
--verbose \\\
${dune_for_release} \\\
- %%{?_smp_mflags} \\\
+ ${_smp_mflags} \\\
--prefix=%%{_prefix} \\\
--libdir=%%{ocaml_standard_library} \\\
--destdir=%%{buildroot} \\\
