commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2023-11-09 21:34:27
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.17445 (New)
Package is "ocaml-rpm-macros"
Thu Nov 9 21:34:27 2023 rev:21 rq:1124189 version:20231101
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2023-02-02 18:29:13.087771649 +0100
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.17445/ocaml-rpm-macros.changes
2023-11-09 21:34:46.059490918 +0100
@@ -1,0 +2,5 @@
+Tue Oct 31 21:44:55 UTC 2023 - Aaron Puchert
+
+- Increase stack size limit for riscv64 like for ppc64(le).
+
+---
Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.7iBHNO/_old 2023-11-09 21:34:46.615511408 +0100
+++ /var/tmp/diff_new_pack.7iBHNO/_new 2023-11-09 21:34:46.615511408 +0100
@@ -17,7 +17,7 @@
Name: ocaml-rpm-macros
-Version:20230101
+Version:20231101
Release:0
Summary:RPM macros for building OCaml source packages
License:GPL-2.0-only
@@ -421,7 +421,7 @@
ocaml setup.ml -test
#
%%ocaml_dune_setup \
-%ifarch ppc64 ppc64le
+%ifarch ppc64 ppc64le riscv64
ulimit -s $((1024 * 64)) ; \
%endif
%if 0
@@ -475,7 +475,7 @@
'@install' \\\
$OCAML_DUNE_BUILD_INSTALL_ARGS
%%ocaml_dune_install \
-%ifarch ppc64 ppc64le
+%ifarch ppc64 ppc64le riscv64
ulimit -s $((1024 * 64)) ; \
%endif
if test -z "${_smp_mflags}" ;\
commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2023-02-02 18:07:26
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.32243 (New)
Package is "ocaml-rpm-macros"
Thu Feb 2 18:07:26 2023 rev:20 rq:1062399 version:20230101
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2023-01-04 17:51:17.817719836 +0100
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.32243/ocaml-rpm-macros.changes
2023-02-02 18:29:13.087771649 +0100
@@ -1,0 +2,6 @@
+Sun Jan 29 08:34:55 UTC 2023 - Bernhard Wiedemann
+
+- Allow variables in smp_mflags to be interpolated
+ for https://github.com/rpm-software-management/rpm/issues/2343
+
+---
Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.ysj05q/_old 2023-02-02 18:29:13.423773708 +0100
+++ /var/tmp/diff_new_pack.ysj05q/_new 2023-02-02 18:29:13.427773733 +0100
@@ -461,7 +461,7 @@
dune installed-libraries $OCAML_DUNE_INSTALLED_LIBRARIES_ARGS ; \
if test -z "${_smp_mflags}" ;\
then \
- _smp_mflags='%%{?_smp_mflags}' ;\
+ _smp_mflags="%%{?_smp_mflags}" ;\
case "$(ocamlc --version)" in \\\
4.08*) _smp_mflags='-j1' ;;\\\
4.09*) _smp_mflags='-j1' ;;\\\
@@ -480,7 +480,7 @@
%endif
if test -z "${_smp_mflags}" ;\
then \
- _smp_mflags='%%{?_smp_mflags}' ;\
+ _smp_mflags="%%{?_smp_mflags}" ;\
case "$(ocamlc --version)" in \\\
4.08*) _smp_mflags='-j1' ;;\\\
4.09*) _smp_mflags='-j1' ;;\\\
commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ocaml-rpm-macros for openSUSE:Factory checked in at 2023-01-04 17:50:58 Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old) and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1563 (New) Package is "ocaml-rpm-macros" Wed Jan 4 17:50:58 2023 rev:19 rq:1046306 version:20230101 Changes: --- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes 2022-07-21 11:33:05.514932496 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1563/ocaml-rpm-macros.changes 2023-01-04 17:51:17.817719836 +0100 @@ -1,0 +2,5 @@ +Sun Jan 1 01:01:01 UTC 2023 - oher...@suse.de + +- Remove stale references to ocaml_make_testsuite + +--- Other differences: -- ++ ocaml-rpm-macros.spec ++ --- /var/tmp/diff_new_pack.RxLoyw/_old 2023-01-04 17:51:18.261722453 +0100 +++ /var/tmp/diff_new_pack.RxLoyw/_new 2023-01-04 17:51:18.261722453 +0100 @@ -1,7 +1,7 @@ # # spec file for package ocaml-rpm-macros # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: ocaml-rpm-macros -Version:20220707 +Version:20230101 Release:0 Summary:RPM macros for building OCaml source packages License:GPL-2.0-only @@ -36,13 +36,6 @@ %define debug_package %nil %define ocaml_standard_library %_libdir/ocaml -# macros to be set in prjconf: -#Macros: -#_with_ocaml_make_testsuite 1 -#:Macros -%bcond_with ocaml_make_testsuite -# -# %description OCaml is a high-level, strongly-typed, functional and object-oriented
commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2022-07-21 11:32:45
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1523 (New)
Package is "ocaml-rpm-macros"
Thu Jul 21 11:32:45 2022 rev:18 rq:989365 version:20220707
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2022-04-12 00:13:54.269318995 +0200
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1523/ocaml-rpm-macros.changes
2022-07-21 11:33:05.514932496 +0200
@@ -1,0 +2,6 @@
+Thu Jul 7 07:07:07 UTC 2022 - oher...@suse.de
+
+- Handle plain ^ and + as values for directory= in findlib META files
+ They stand for the OCaml standard library directory.
+
+---
Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.n9seMy/_old 2022-07-21 11:33:05.922932847 +0200
+++ /var/tmp/diff_new_pack.n9seMy/_new 2022-07-21 11:33:05.926932851 +0200
@@ -17,7 +17,7 @@
Name: ocaml-rpm-macros
-Version:20220409
+Version:20220707
Release:0
Summary:RPM macros for building OCaml source packages
License:GPL-2.0-only
++ ocaml-findlib.rpm.prov_req.attr.sh ++
--- /var/tmp/diff_new_pack.n9seMy/_old 2022-07-21 11:33:05.946932868 +0200
+++ /var/tmp/diff_new_pack.n9seMy/_new 2022-07-21 11:33:05.950932871 +0200
@@ -56,6 +56,12 @@
if ( a[2] ) {
candidate = a[2];
if(dbg) printf "dir: %s %s\n", x, candidate > "/dev/stderr" ;
+if (candidate == "^") {
+ next
+}
+if (candidate == "+") {
+ next
+}
if (candidate ~ /^\^/) {
next
}
commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2022-04-12 00:13:53
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1900 (New)
Package is "ocaml-rpm-macros"
Tue Apr 12 00:13:53 2022 rev:17 rq:968054 version:20220409
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2022-03-28 16:59:16.932865125 +0200
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1900/ocaml-rpm-macros.changes
2022-04-12 00:13:54.269318995 +0200
@@ -1,0 +2,7 @@
+Sat Apr 9 12:34:56 UTC 2022 - oher...@suse.de
+
+- remove unused ocaml_dune_bootstrap_directory
+- move all invocations of dune from ocaml_dune_setup to ocaml_dune_build
+- process content of ocaml_standard_library only if it exists in buildroot
+
+---
Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.S21xIt/_old 2022-04-12 00:13:54.833312319 +0200
+++ /var/tmp/diff_new_pack.S21xIt/_new 2022-04-12 00:13:54.837312272 +0200
@@ -17,7 +17,7 @@
Name: ocaml-rpm-macros
-Version:20220222
+Version:20220409
Release:0
Summary:RPM macros for building OCaml source packages
License:GPL-2.0-only
@@ -173,6 +173,8 @@
%endif
test -f "${license}" && echo "${license_macro} ${license}" >>
'%%name.files.license' ;\
done ;\
+ if test -d %%buildroot%%ocaml_standard_library ;\
+ then\
find %%buildroot%%ocaml_standard_library -name '*.cmxs' -exec chmod -v
a-x '{}' + ;\
find %%buildroot%%ocaml_standard_library ! -type d | awk\\\
-v "buildroot=%%buildroot"\\\
@@ -341,6 +343,7 @@
END {\
;\
}' ;\
+ fi ;\
cat '%%name.files.changes' >> '%%name.files' ;\
cat '%%name.files.license' >> '%%name.files' ;\
if test -s %%name.files.ldsoconf ;\
@@ -424,7 +427,6 @@
%%ocaml_oasis_test \
ocaml setup.ml -test
#
-%%ocaml_dune_bootstrap_directory %%_libexecdir/dune-bootstrap
%%ocaml_dune_setup \
%ifarch ppc64 ppc64le
ulimit -s $((1024 * 64)) ; \
@@ -460,9 +462,10 @@
echo "${dune_release_pkgs}" >
dune_release_pkgs-%%name-%%version-%%release ; \
dune_for_release="--for-release-of-packages=${dune_release_pkgs}" ; \
fi ; \
- dune installed-libraries $OCAML_DUNE_INSTALLED_LIBRARIES_ARGS ; \
%%nil
%%ocaml_dune_build \
+ dune --version ; \
+ dune installed-libraries $OCAML_DUNE_INSTALLED_LIBRARIES_ARGS ; \
if test -z "${_smp_mflags}" ;\
then \
_smp_mflags='%%{?_smp_mflags}' ;\
commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2022-03-28 16:58:47
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1900 (New)
Package is "ocaml-rpm-macros"
Mon Mar 28 16:58:47 2022 rev:16 rq:964736 version:20220222
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2021-11-06 18:13:28.852742515 +0100
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1900/ocaml-rpm-macros.changes
2022-03-28 16:59:16.932865125 +0200
@@ -1,0 +2,7 @@
+Tue Feb 22 22:22:22 UTC 2022 - oher...@suse.de
+
+- remove usage of external-lib-deps for dune3
+- define ocaml_dune_bootstrap_directory for dune3
+- remove braces from rpm macros
+
+---
Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.QKdLmr/_old 2022-03-28 16:59:17.304865631 +0200
+++ /var/tmp/diff_new_pack.QKdLmr/_new 2022-03-28 16:59:17.308865636 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-rpm-macros
#
-# 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
@@ -17,7 +17,7 @@
Name: ocaml-rpm-macros
-Version:20211027
+Version:20220222
Release:0
Summary:RPM macros for building OCaml source packages
License:GPL-2.0-only
@@ -33,9 +33,9 @@
# Some rpm variants are unable to create proper debuginfo and/or debugsource
packages
%bcond_without suse_ocaml_opt_debug_package
# Some rpm variants fail to build even this innocent package...
-%define debug_package %{nil}
+%define debug_package %nil
-%define ocaml_standard_library %{_libdir}/ocaml
+%define ocaml_standard_library %_libdir/ocaml
# macros to be set in prjconf:
#Macros:
#_with_ocaml_make_testsuite 1
@@ -57,20 +57,20 @@
%install
> files.fileattrs
-if test -d '%{_rpmconfigdir}/fileattrs'
+if test -d '%_rpmconfigdir/fileattrs'
then
# Generating dependencies can currently only be done by rpm versions
# which support "fileattrs", because it is easy to add new hooks.
- mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
+ mkdir -vp %buildroot%_rpmconfigdir/fileattrs
# Map ocamlobjinfo output to rpm Provides/Requires
# This tag name MUST match what ocaml.spec uses internally
tag="suseocaml"
- file_attr="%{_rpmconfigdir}/fileattrs/${tag}.attr"
- file_sh="%{_rpmconfigdir}/${tag}.sh"
- attr_sh="%%{_rpmconfigdir}/${tag}.sh"
- tee %{buildroot}${file_sh} < %{SOURCE0}
- tee %{buildroot}${file_attr} <<_EOF_
+ file_attr="%_rpmconfigdir/fileattrs/${tag}.attr"
+ file_sh="%_rpmconfigdir/${tag}.sh"
+ attr_sh="%%_rpmconfigdir/${tag}.sh"
+ tee %buildroot${file_sh} < %{SOURCE0}
+ tee %buildroot${file_attr} <<_EOF_
%%__${tag}_provides ${attr_sh} --provides
%%__${tag}_requires ${attr_sh} --requires
%%__${tag}_magic^(Objective caml|OCaml) .*$
@@ -82,14 +82,14 @@
# Map findlib names to rpm Provides/Requires
tag="suseocamlfind"
- file_attr="%{_rpmconfigdir}/fileattrs/${tag}.attr"
- file_sh="%{_rpmconfigdir}/${tag}.sh"
- attr_sh="%%{_rpmconfigdir}/${tag}.sh"
- tee %{buildroot}${file_sh} < %{SOURCE1}
- tee %{buildroot}${file_attr} <<_EOF_
+ file_attr="%_rpmconfigdir/fileattrs/${tag}.attr"
+ file_sh="%_rpmconfigdir/${tag}.sh"
+ attr_sh="%%_rpmconfigdir/${tag}.sh"
+ tee %buildroot${file_sh} < %{SOURCE1}
+ tee %buildroot${file_attr} <<_EOF_
%%__${tag}_provides ${attr_sh} -prov
%%__${tag}_requires ${attr_sh} -req
-%%__${tag}_path
^%{ocaml_standard_library}/.*/META$|^%{ocaml_standard_library}/META$
+%%__${tag}_path
^%ocaml_standard_library/.*/META$|^%ocaml_standard_library/META$
_EOF_
echo "${file_attr}" >> files.fileattrs
echo "%%attr(755,root,root) ${file_sh}" >> files.fileattrs
@@ -97,36 +97,36 @@
#
# install OCaml macros
-mkdir -vp %{buildroot}%{_rpmmacrodir}
-tee %{buildroot}%{_rpmmacrodir}/macros.%{name} <<'_EOF_'
+mkdir -vp %buildroot%_rpmmacrodir
+tee %buildroot%_rpmmacrodir/macros.%name <<'_EOF_'
# Guidelines:
# - Providing applications written in OCaml is the main goal of our packaging.
# - Applications written in OCaml are static binaries.
# - A concept of shared libraries does not exist, beside the Dynlink module
# - All binaries go into the main package, in case they are produced.
# - All modules go into the -devel subpackage
-# - Helper applications below %{ocaml_standard_library} go into the -devel
subpackage
+# - Helper applications below %ocaml_standard_library go i
commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2021-11-06 18:13:15
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1890 (New)
Package is "ocaml-rpm-macros"
Sat Nov 6 18:13:15 2021 rev:15 rq:928950 version:20211027
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2021-09-28 19:16:20.048172153 +0200
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1890/ocaml-rpm-macros.changes
2021-11-06 18:13:28.852742515 +0100
@@ -1,0 +2,9 @@
+Wed Oct 27 07:31:27 UTC 2021 - oher...@suse.de
+
+- Move cmxs files into the main package
+ Applications like Coq may load them at runtime.
+- Ignore dependencies for cmxs files
+- Restore dummy ocaml_native_compiler to allow quilt setup with
+ old packages
+
+---
Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.NTrlYW/_old 2021-11-06 18:13:29.604742909 +0100
+++ /var/tmp/diff_new_pack.NTrlYW/_new 2021-11-06 18:13:29.608742910 +0100
@@ -17,7 +17,7 @@
Name: ocaml-rpm-macros
-Version:20210911
+Version:20211027
Release:0
Summary:RPM macros for building OCaml source packages
License:GPL-2.0-only
@@ -73,8 +73,8 @@
tee %{buildroot}${file_attr} <<_EOF_
%%__${tag}_provides ${attr_sh} --provides
%%__${tag}_requires ${attr_sh} --requires
-%%__${tag}_magic^(ELF|Objective caml|OCaml) .*$
-%%__${tag}_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$
+%%__${tag}_magic^(Objective caml|OCaml) .*$
+%%__${tag}_path .(cma|cmi|cmo|cmx|cmxa)$
%%__${tag}_flagsmagic_and_path
_EOF_
echo "${file_attr}" >> files.fileattrs
@@ -128,6 +128,10 @@
%%{nil}
%%_find_debuginfo_dwz_opts %%{nil}
+# Compatibility for quilt setup and old packages
+%%ocaml_native_compiler 1
+%%suse_ocaml_native_compiler 1
+
# Create file list for base pkg and base-devel pkg
# Files with known extensions or names are written to 'files' or 'files.devel'
# Other unknown files are shown on stdout
@@ -173,6 +177,7 @@
find %%{buildroot}%%{ocaml_standard_library} ! -type d | awk\\\
-v "buildroot=%%{buildroot}"\\\
-v "ocaml_standard_library=%%{ocaml_standard_library}"\\\
+ -v "out_files_main=%%{name}.files"\\\
-v "out_files_devel=%%{name}.files.devel"\\\
-v "out_files_ldconf=%%{name}.files.ldsoconf"\\\
-v "out_files_unhandled=%%{name}.files.unhandled"\\\
@@ -224,6 +229,15 @@
}\
next\
}\
+ function files_main(line) {\
+ _split(line)\
+ print file_path >> out_files_main\
+ print "%%dir " dirname >> out_files_main\
+ if (parent_dir != "") {\
+ print "%%dir " parent_dir >> out_files_main\
+ }\
+ next\
+ }\
function files_unhandled(line) {\
_split(line)\
print file_path >> out_files_unhandled\
@@ -279,7 +293,7 @@
}\
# ELF shared library with native code\
/\\/[^/]+\\.cmxs$/{\
- files_devel($0)\
+ files_main($0)\
}\
# Some helper binary\
/\\/[^/]+\\.exe$/{\
++ ocaml-ocaml.rpm.prov_req.attr.sh ++
--- /var/tmp/diff_new_pack.NTrlYW/_old 2021-11-06 18:13:29.636742925 +0100
+++ /var/tmp/diff_new_pack.NTrlYW/_new 2021-11-06 18:13:29.636742925 +0100
@@ -32,6 +32,10 @@
# Implementations imported:
# HASH NAME_FROM_OTHER_MODULE
#
+# cmxs files are recoqnized, but need to be ignored.
+# They contain references of the interfaces and implementations
+# compiled into them.
+#
# The hash may contain just '-', in which case it is ignored.
#
# Output:
@@ -236,7 +240,7 @@
*.cmo) parse "${filename}" ;;
*.cmx) parse "${filename}" ;;
*.cmxa) parse "${filename}" ;;
- *.cmxs) parse "${filename}" ;;
+ *.cmxs) ;;
*) continue ;;
esac
done
commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2021-09-28 19:16:18
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1899 (New)
Package is "ocaml-rpm-macros"
Tue Sep 28 19:16:18 2021 rev:14 rq:921281 version:20210911
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2021-04-22 18:03:45.806487933 +0200
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.1899/ocaml-rpm-macros.changes
2021-09-28 19:16:20.048172153 +0200
@@ -1,0 +2,5 @@
+Sat Sep 11 12:34:56 UTC 2021 - oher...@suse.de
+
+- Rename a single opam file to $dune_release_pkgs.opam
+
+---
Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.dxhT2R/_old 2021-09-28 19:16:20.668172868 +0200
+++ /var/tmp/diff_new_pack.dxhT2R/_new 2021-09-28 19:16:20.676172876 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-rpm-macros
#
-# Copyright (c) 2020 SUSE LLC
+# 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
@@ -17,7 +17,7 @@
Name: ocaml-rpm-macros
-Version:20210421
+Version:20210911
Release:0
Summary:RPM macros for building OCaml source packages
License:GPL-2.0-only
@@ -414,6 +414,13 @@
%ifarch ppc64 ppc64le
ulimit -s $((1024 * 64)) ; \
%endif
+%if 0
+ # obviously this works just with a single entry in dune_release_pkgs=
+%endif
+ if test -n "${dune_release_pkgs}" ; \
+ then \
+ test -f 'opam' && mv -v 'opam' "${dune_release_pkgs}.opam" ; \
+ fi ; \
echo '%%{version}' | tee VERSION ; \
for opam in *.opam \
do\
commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2021-04-22 18:03:29
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.12324 (New)
Package is "ocaml-rpm-macros"
Thu Apr 22 18:03:29 2021 rev:13 rq:887313 version:20210421
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2021-02-15 23:10:25.510869311 +0100
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.12324/ocaml-rpm-macros.changes
2021-04-22 18:03:45.806487933 +0200
@@ -1,0 +2,16 @@
+Wed Apr 21 12:34:56 UTC 2021 - oher...@suse.de
+
+- Remove ocaml_native_compiler flag, assume native target
+ This flag puts too much burden on pkgs that use ocaml, but build
+ with their buildsystem instead of using dune
+
+---
+Fri Apr 9 09:09:09 UTC 2021 - oher...@suse.de
+
+- Use bcond suse_ocaml_use_rpm_license_macro for license in filelist
+- Add suse prefix to ocaml_native_compiler to avoid conflict
+- Create Provides/Requires only for rpm variants which understand fileattrs
+- Fix syntax for chmod of .cmxs
+- Add conditional to disable debug_package macro when building with broken rpm
variants
+
+---
Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.bbLdvQ/_old 2021-04-22 18:03:46.222488576 +0200
+++ /var/tmp/diff_new_pack.bbLdvQ/_new 2021-04-22 18:03:46.226488582 +0200
@@ -17,38 +17,31 @@
Name: ocaml-rpm-macros
-Version:20210209
+Version:20210421
Release:0
Summary:RPM macros for building OCaml source packages
License:GPL-2.0-only
Group: Development/Languages/OCaml
+BuildRoot: %_tmppath/%name-%version-build
+ExclusiveArch: %arm aarch64 %ix86 ppc ppc64 ppc64le riscv64 s390x x86_64
URL:https://build.opensuse.org/project/show/devel:languages:ocaml
Source0:ocaml-ocaml.rpm.prov_req.attr.sh
Source1:ocaml-findlib.rpm.prov_req.attr.sh
+# Some rpm variants know about license, but can only use them in plain file
context
+%bcond_without suse_ocaml_use_rpm_license_macro
+# Some rpm variants are unable to create proper debuginfo and/or debugsource
packages
+%bcond_without suse_ocaml_opt_debug_package
+# Some rpm variants fail to build even this innocent package...
+%define debug_package %{nil}
+
%define ocaml_standard_library %{_libdir}/ocaml
-%define do_opt 0
# macros to be set in prjconf:
#Macros:
-#_with_ocaml_force_enable_ocaml_opt 1
-#_with_ocaml_force_disable_ocaml_opt 1
#_with_ocaml_make_testsuite 1
#:Macros
-%bcond_with ocaml_force_enable_ocaml_opt
-%bcond_with ocaml_force_disable_ocaml_opt
%bcond_with ocaml_make_testsuite
-%if %{with ocaml_force_enable_ocaml_opt}
-%define do_opt 1
-%endif
-%if %{without ocaml_force_enable_ocaml_opt}
-%ifarch %{arm} aarch64 %{ix86} ppc ppc64 ppc64le riscv64 s390x x86_64
-%define do_opt 1
-%endif
-%endif
#
-%if %{with ocaml_force_disable_ocaml_opt}
-%define do_opt 0
-%endif
#
%description
@@ -63,30 +56,45 @@
%build
%install
-# map ocamlobjinfo output to rpm Provides/Requires
-# this tag name MUST match what ocaml.spec uses internally
-tag="suseocaml"
-mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
-tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_
-%%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh --provides
-%%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh --requires
+> files.fileattrs
+if test -d '%{_rpmconfigdir}/fileattrs'
+then
+ # Generating dependencies can currently only be done by rpm versions
+ # which support "fileattrs", because it is easy to add new hooks.
+ mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
+
+ # Map ocamlobjinfo output to rpm Provides/Requires
+ # This tag name MUST match what ocaml.spec uses internally
+ tag="suseocaml"
+ file_attr="%{_rpmconfigdir}/fileattrs/${tag}.attr"
+ file_sh="%{_rpmconfigdir}/${tag}.sh"
+ attr_sh="%%{_rpmconfigdir}/${tag}.sh"
+ tee %{buildroot}${file_sh} < %{SOURCE0}
+ tee %{buildroot}${file_attr} <<_EOF_
+%%__${tag}_provides ${attr_sh} --provides
+%%__${tag}_requires ${attr_sh} --requires
%%__${tag}_magic^(ELF|Objective caml|OCaml) .*$
%%__${tag}_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$
%%__${tag}_flagsmagic_and_path
_EOF_
-#
-tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE0}
+ echo "${file_attr}" >> files.fileattrs
+ echo "%%attr(755,root,root) ${file_sh}" >> files.fileattrs
-# map findlib names to rpm Provides/Requires
-tag="suseocamlfind"
-mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2021-02-15 23:10:24
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.28504 (New)
Package is "ocaml-rpm-macros"
Mon Feb 15 23:10:24 2021 rev:12 rq:870497 version:20210209
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2021-02-01 14:41:46.980674613 +0100
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.28504/ocaml-rpm-macros.changes
2021-02-15 23:10:25.510869311 +0100
@@ -1,0 +2,5 @@
+Tue Feb 9 09:09:09 UTC 2021 - oher...@suse.de
+
+- Fix regex in file list generator to really match dot and extension
+
+---
Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.9XMx08/_old 2021-02-15 23:10:26.102870196 +0100
+++ /var/tmp/diff_new_pack.9XMx08/_new 2021-02-15 23:10:26.106870201 +0100
@@ -17,7 +17,7 @@
Name: ocaml-rpm-macros
-Version:20210121
+Version:20210209
Release:0
Summary:RPM macros for building OCaml source packages
License:GPL-2.0-only
@@ -229,79 +229,79 @@
files_devel($0)\
}\
# stub ELF library\
- /\\/[^/]+\.so$/{\
+ /\\/[^/]+\\.so$/{\
files_ldconf($0)\
}\
# stub ELF library\
- /\\/[^/]+\.so.owner$/{\
+ /\\/[^/]+\\.so.owner$/{\
files_ldconf($0)\
}\
# ELF archive with object files\
- /\\/[^/]+\.a$/{\
+ /\\/[^/]+\\.a$/{\
files_devel($0)\
}\
# OCaml legacy source code annotations, produced via -annot\
- /\\/[^/]+\.annot$/{\
+ /\\/[^/]+\\.annot$/{\
files_devel($0)\
}\
# OCaml library file with bytecode\
- /\\/[^/]+\.cma$/{\
+ /\\/[^/]+\\.cma$/{\
files_devel($0)\
}\
# OCaml compiled header file\
- /\\/[^/]+\.cmi$/{\
+ /\\/[^/]+\\.cmi$/{\
files_devel($0)\
}\
# OCaml object file with bytecode\
- /\\/[^/]+\.cmo$/{\
+ /\\/[^/]+\\.cmo$/{\
files_devel($0)\
}\
# OCaml source code annotations, produced via -bin-annot from source
files\
- /\\/[^/]+\.cmt$/{\
+ /\\/[^/]+\\.cmt$/{\
files_devel($0)\
}\
# OCaml source code annotations, produced via -bin-annot from header
files\
- /\\/[^/]+\.cmti$/{\
+ /\\/[^/]+\\.cmti$/{\
files_devel($0)\
}\
# OCaml object file with native code\
- /\\/[^/]+\.cmx$/{\
+ /\\/[^/]+\\.cmx$/{\
files_devel($0)\
}\
# OCaml library file with native code\
- /\\/[^/]+\.cmxa$/{\
+ /\\/[^/]+\\.cmxa$/{\
files_devel($0)\
}\
# ELF shared library with native code\
- /\\/[^/]+\.cmxs$/{\
+ /\\/[^/]+\\.cmxs$/{\
files_devel($0)\
}\
# Some helper binary\
- /\\/[^/]+\.exe$/{\
+ /\\/[^/]+\\.exe$/{\
files_devel($0)\
}\
# C header\
- /\\/[^/]+\.h$/{\
+ /\\/[^/]+\\.h$/{\
files_devel($0)\
}\
#\
- /\\/[^/]+\.js$/{\
+ /\\/[^/]+\\.js$/{\
files_devel($0)\
}\
# OCaml source code, source file\
- /\\/[^/]+\.ml$/{\
+ /\\/[^/]+\\.ml$/{\
files_devel($0)\
}\
# OCaml source code, header file\
- /\\/[^/]+\.mli$/{\
+ /\\/[^/]+\\.mli$/{\
files_devel($0)\
}\
# ELF object file\
- /\\/[^/]+\.o$/{\
+ /\\/[^/]+\\.o$/{\
files_devel($0)\
}\
#\
- /\\/[^/]+\.sml$/{\
+ /\\/[^/]+\\.sml$/{\
files_devel($0)\
}\
# generated by dune\
@@ -313,7 +313,7 @@
files_devel($0)\
}\
# Some Coq files\
- /\\/[^/]+\.v$/{\
+ /\\/[^/]+\\.v$/{\
files_devel($0)\
}\
#\
commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2021-02-01 14:41:45
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.28504 (New)
Package is "ocaml-rpm-macros"
Mon Feb 1 14:41:45 2021 rev:11 rq:867714 version:20210121
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2021-01-19 16:01:08.311284209 +0100
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.28504/ocaml-rpm-macros.changes
2021-02-01 14:41:46.980674613 +0100
@@ -1,0 +2,8 @@
+Thu Jan 21 21:21:21 UTC 2021 - oher...@suse.de
+
+- Adjust parser of ocamfind() requires
+ Take negative predicates in requires() into account, and ignore them.
+ This is supposed to avoid dependency cycles due to excessive
+ list of dependencies.
+
+---
Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.sNRZ3b/_old 2021-02-01 14:41:47.588675484 +0100
+++ /var/tmp/diff_new_pack.sNRZ3b/_new 2021-02-01 14:41:47.588675484 +0100
@@ -17,7 +17,7 @@
Name: ocaml-rpm-macros
-Version:20210114
+Version:20210121
Release:0
Summary:RPM macros for building OCaml source packages
License:GPL-2.0-only
++ ocaml-findlib.rpm.prov_req.attr.sh ++
--- /var/tmp/diff_new_pack.sNRZ3b/_old 2021-02-01 14:41:47.608675513 +0100
+++ /var/tmp/diff_new_pack.sNRZ3b/_new 2021-02-01 14:41:47.612675519 +0100
@@ -87,7 +87,7 @@
next
}
- /^[[:blank:]]*requires(|\([^)]+\))[[:blank:]]*(+=|=)/ {
+ /^[[:blank:]]*requires(|\([^-][^)]+\))[[:blank:]]*(+=|=)/ {
if(dbg) printf "GOT: %s\n", $0 > "/dev/stderr" ;
done=0
requires_line = ""
commit ocaml-rpm-macros for openSUSE:Factory
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-rpm-macros for
openSUSE:Factory checked in at 2021-01-19 16:00:49
Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
and /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.28504 (New)
Package is "ocaml-rpm-macros"
Tue Jan 19 16:00:49 2021 rev:10 rq:864001 version:20210114
Changes:
--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2020-08-28 23:45:07.243496310 +0200
+++
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.28504/ocaml-rpm-macros.changes
2021-01-19 16:01:08.311284209 +0100
@@ -1,0 +2,7 @@
+Thu Jan 14 14:14:14 UTC 2021 - oher...@suse.de
+
+- Adjust injection of version into findlib META files
+ A file VERSION is not handled anymore by dune since 1.11.
+ Remove version: from *.opam files, inject version into dune-project
+
+---
Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.Wk1uru/_old 2021-01-19 16:01:09.047285321 +0100
+++ /var/tmp/diff_new_pack.Wk1uru/_new 2021-01-19 16:01:09.047285321 +0100
@@ -17,7 +17,7 @@
Name: ocaml-rpm-macros
-Version:20200820
+Version:20210114
Release:0
Summary:RPM macros for building OCaml source packages
License:GPL-2.0-only
@@ -410,6 +410,22 @@
ulimit -s $((1024 * 64)) ; \
%endif
echo '%%{version}' | tee VERSION ; \
+ for opam in *.opam \
+ do\
+ test -f "${opam}" || continue ; \
+ sed -i~ '\
+ /^version:/d\
+ ' "${opam}" ; \
+ diff -u "$_"~ "$_" || : got version ; \
+ done ; \
+ if test -f 'dune-project' ; \
+ then \
+ sed -i~ '\
+ /^([[:blank:]]*version[[:blank:]]\\+/d\
+ /^([[:blank:]]*lang[[:blank:]]\\+dune[[:blank:]]/a (version
%%{version})\
+ ' 'dune-project'; \
+ diff -u "$_"~ "$_" || : got version ; \
+ fi ; \
dune_for_release= ; \
: dune_release_pkgs \
if test -n "${dune_release_pkgs}" ; \
