commit ocaml-rpm-macros for openSUSE:Factory

2020-08-28 Thread root 
Hello community,

here is the log from the commit of package ocaml-rpm-macros for 
openSUSE:Factory checked in at 2020-08-28 23:45:04

Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.3399 (New)


Package is "ocaml-rpm-macros"

Fri Aug 28 23:45:04 2020 rev:9 rq:828815 version:20200820

Changes:

--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2020-05-20 18:35:37.47640 +0200
+++ 
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.3399/ocaml-rpm-macros.changes  
2020-08-28 23:45:07.243496310 +0200
@@ -1,0 +2,7 @@
+Thu Aug 20 20:20:20 UTC 2020 - oher...@suse.de
+
+- Package also *.v, for Coq
+- Package changelog files
+- Enable native riscv64
+
+---



Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.2nGCQQ/_old  2020-08-28 23:45:07.819495941 +0200
+++ /var/tmp/diff_new_pack.2nGCQQ/_new  2020-08-28 23:45:07.823495938 +0200
@@ -15,13 +15,14 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 Name:   ocaml-rpm-macros
-Version:20200514
+Version:20200820
 Release:0
 Summary:RPM macros for building OCaml source packages
 License:GPL-2.0-only
 Group:  Development/Languages/OCaml
-Url:https://build.opensuse.org/project/show/devel:languages:ocaml
+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
 
@@ -40,7 +41,7 @@
 %define do_opt 1
 %endif
 %if %{without ocaml_force_enable_ocaml_opt}
-%ifarch %{arm} aarch64 %{ix86} ppc ppc64 ppc64le s390x x86_64
+%ifarch %{arm} aarch64 %{ix86} ppc ppc64 ppc64le riscv64 s390x x86_64
 %define do_opt 1
 %endif
 %endif
@@ -127,10 +128,22 @@
 # Other unknown files are shown on stdout
 %%ocaml_create_file_list \
> %%{name}.files ;\
+   > %%{name}.files.changes ;\
> %%{name}.files.devel ;\
> %%{name}.files.ldsoconf ;\
> %%{name}.files.license ;\
> %%{name}.files.unhandled ;\
+   for changes in \\\
+   CHANGELOG.md \\\
+   CHANGES \\\
+   CHANGES.md \\\
+   CHANGES.txt \\\
+   ChangeLog \\\
+   Changelog \\\
+   ;\
+   do\
+ test -f "${changes}" && echo "doc ${changes}" >> 
'%%{name}.files.changes' ;\
+   done ;\
for license in \\\
COPYING \\\
COPYING.txt \\\
@@ -299,12 +312,17 @@
/\\/opam$/{\
files_devel($0)\
}\
+   # Some Coq files\
+   /\\/[^/]+\.v$/{\
+   files_devel($0)\
+   }\
#\
# record unknown paths\
files_unhandled($0)\
END {\
;\
}' ;\
+   cat '%%{name}.files.changes' >> '%%{name}.files' ;\
cat '%%{name}.files.license' >> '%%{name}.files' ;\
if test -s %%{name}.files.ldsoconf ;\
then\

commit ocaml-rpm-macros for openSUSE:Factory

2020-05-20 Thread root 
Hello community,

here is the log from the commit of package ocaml-rpm-macros for 
openSUSE:Factory checked in at 2020-05-20 18:35:35

Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2738 (New)


Package is "ocaml-rpm-macros"

Wed May 20 18:35:35 2020 rev:8 rq:805574 version:20200514

Changes:

--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2020-04-15 19:52:49.509553821 +0200
+++ 
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2738/ocaml-rpm-macros.changes  
2020-05-20 18:35:37.47640 +0200
@@ -1,0 +2,10 @@
+Thu May 14 14:14:14 UTC 2020 - oher...@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 tag 'suseocaml', rename zocaml.attr to suseocaml.attr to
+  avoid filename conflicts with rpm-build.rpm (bsc#1154874)
+- Rename also ocamlfind to suseocamlfind
+- Escape plain % chars
+
+---



Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.N5yJwG/_old  2020-05-20 18:35:38.512001803 +0200
+++ /var/tmp/diff_new_pack.N5yJwG/_new  2020-05-20 18:35:38.512001803 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ocaml-rpm-macros
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 Name:   ocaml-rpm-macros
-Version:20200412
+Version:20200514
 Release:0
 Summary:RPM macros for building OCaml source packages
 License:GPL-2.0-only
@@ -63,25 +63,26 @@
 
 %install
 # map ocamlobjinfo output to rpm Provides/Requires
-tag="ocaml"
+# this tag name MUST match what ocaml.spec uses internally
+tag="suseocaml"
 mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
-tee %{buildroot}%{_rpmconfigdir}/fileattrs/z${tag}.attr <<_EOF_
-%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh --provides
-%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh --requires
-%__${tag}_magic^(ELF|Objective caml|OCaml) .*$
-%__${tag}_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$
-%__${tag}_flagsmagic_and_path
+tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_
+%%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh --provides
+%%__${tag}_requires %%{_rpmconfigdir}/${tag}.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}
 
 # map findlib names to rpm Provides/Requires
-tag="ocamlfind"
+tag="suseocamlfind"
 mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
 tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_
-%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh -prov
-%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh -req
-%__${tag}_path 
^%{ocaml_standard_library}/.*/META$|^%{ocaml_standard_library}/META$
+%%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh -prov
+%%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh -req
+%%__${tag}_path 
^%{ocaml_standard_library}/.*/META$|^%{ocaml_standard_library}/META$
 _EOF_
 #
 tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE1}

commit ocaml-rpm-macros for openSUSE:Factory

2020-04-15 Thread root 
Hello community,

here is the log from the commit of package ocaml-rpm-macros for 
openSUSE:Factory checked in at 2020-04-15 19:52:47

Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2738 (New)


Package is "ocaml-rpm-macros"

Wed Apr 15 19:52:47 2020 rev:7 rq:793517 version:20200412

Changes:

--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2020-03-24 22:31:42.721070293 +0100
+++ 
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2738/ocaml-rpm-macros.changes  
2020-04-15 19:52:49.509553821 +0200
@@ -1,0 +2,5 @@
+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)
+
+---



Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.UL4MrE/_old  2020-04-15 19:52:49.973554030 +0200
+++ /var/tmp/diff_new_pack.UL4MrE/_new  2020-04-15 19:52:49.977554032 +0200
@@ -16,7 +16,7 @@
 #
 
 Name:   ocaml-rpm-macros
-Version:20200321
+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}_flagsmagic_and_path
 _EOF_
 #
 tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE0}

commit ocaml-rpm-macros for openSUSE:Factory

2020-03-24 Thread root 
Hello community,

here is the log from the commit of package ocaml-rpm-macros for 
openSUSE:Factory checked in at 2020-03-24 22:31:33

Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.3160 (New)


Package is "ocaml-rpm-macros"

Tue Mar 24 22:31:33 2020 rev:6 rq:787222 version:20200321

Changes:

--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2020-02-26 15:01:44.784796126 +0100
+++ 
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.3160/ocaml-rpm-macros.changes  
2020-03-24 22:31:42.721070293 +0100
@@ -1,0 +2,6 @@
+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.hrpZgq/_old  2020-03-24 22:31:44.557071215 +0100
+++ /var/tmp/diff_new_pack.hrpZgq/_new  2020-03-24 22:31:44.565071220 +0100
@@ -16,7 +16,7 @@
 #
 
 Name:   ocaml-rpm-macros
-Version:20200220
+Version:20200321
 Release:0
 Summary:RPM macros for building OCaml source packages
 License:GPL-2.0-only
@@ -413,16 +413,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 +450,7 @@
dune install \\\
--verbose \\\
${dune_for_release} \\\
-   %%{?_smp_mflags} \\\
+   ${_smp_mflags} \\\
--prefix=%%{_prefix} \\\
--libdir=%%{ocaml_standard_library} \\\
--destdir=%%{buildroot} \\\

commit ocaml-rpm-macros for openSUSE:Factory

2020-02-26 Thread root 
Hello community,

here is the log from the commit of package ocaml-rpm-macros for 
openSUSE:Factory checked in at 2020-02-26 15:01:43

Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.26092 (New)


Package is "ocaml-rpm-macros"

Wed Feb 26 15:01:43 2020 rev:5 rq:778683 version:20200220

Changes:

--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2019-11-30 10:35:44.916183957 +0100
+++ 
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.26092/ocaml-rpm-macros.changes 
2020-02-26 15:01:44.784796126 +0100
@@ -1,0 +2,17 @@
+Thu Feb 20 20:20:20 UTC 2020 - oher...@suse.de
+
+- Add ocaml-ocaml.rpm.prov_req.attr.sh
+  New script for rpm Provides/Requires, replacement for rpm
+  built-in ocaml(NAME)=hash, which covers bytecode and interfaces
+  Now it covers also native code via ocamlx(NAME)=HASH (bsc#1154874)
+- Update the filelist generator
+  Use awk to match directories in ocamls built-in ld.conf
+  C stublibs in default locations do not need a ld.so.conf entry
+  Remaining ld.so.conf files for stublibs go to the devel package
+- Disable debug in ocamlfind() Provides/Requires generator
+  Update META parser to handle multiline statements and ppx
+- Provide a ocaml_standard_library macro
+- Explicitly preserve debuginfo in .cmxs, already enforced by dune
+- Install also COPYRIGHT.txt as license, needed for some JaneStreet pkgs
+
+---

New:

  ocaml-ocaml.rpm.prov_req.attr.sh



Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.MhIsiE/_old  2020-02-26 15:01:45.300797156 +0100
+++ /var/tmp/diff_new_pack.MhIsiE/_new  2020-02-26 15:01:45.300797156 +0100
@@ -16,14 +16,16 @@
 #
 
 Name:   ocaml-rpm-macros
-Version:20191101
+Version:20200220
 Release:0
 Summary:RPM macros for building OCaml source packages
 License:GPL-2.0-only
 Group:  Development/Languages/OCaml
 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
 
+%define ocaml_standard_library %{_libdir}/ocaml
 %define do_opt 0
 # macros to be set in prjconf:
 #Macros:
@@ -60,13 +62,25 @@
 %build
 
 %install
+# map ocamlobjinfo output to rpm Provides/Requires
+tag="ocaml"
+mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
+tee %{buildroot}%{_rpmconfigdir}/fileattrs/z${tag}.attr <<_EOF_
+%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh --provides
+%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh --requires
+%__${tag}_magic^(ELF|Objective caml|OCaml) .*$
+%__${tag}_path .(cma|cmi|cmo|cmx|cmxa|cmxs)$
+_EOF_
+#
+tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE0}
+
 # map findlib names to rpm Provides/Requires
 tag="ocamlfind"
 mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
 tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_
 %__${tag}_provides %%{_rpmconfigdir}/${tag}.sh -prov
 %__${tag}_requires %%{_rpmconfigdir}/${tag}.sh -req
-%__${tag}_path ^%%{_libdir}/ocaml/.*/META$|^%%{_libdir}/ocaml/META$
+%__${tag}_path 
^%{ocaml_standard_library}/.*/META$|^%{ocaml_standard_library}/META$
 _EOF_
 #
 tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE1}
@@ -74,12 +88,23 @@
 # install OCaml macros
 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
+# - License files go into the main package.
+# - To aid debugging of cmxs files, their debuginfo is preserved by removing 
the executable bit.
+# 
 # get rid of %{_rpmconfigdir}/find-debuginfo.sh
 # strip kills the bytecode part of ELF binaries
 #
 # provide empty _find_debuginfo_dwz_opts
 # the .dwz files contains identical contents, which leads to identical
 # checksums, which leads to file conflicts due to identical symlinks
+%%ocaml_standard_library %{ocaml_standard_library}
 %if %{do_opt}
 %%ocaml_preserve_bytecode \
%%define _lto_cflags %%{nil} \
@@ -108,12 +133,13 @@
COPYING \\\
COPYING.txt \\\
COPYRIGHT \\\
+   COPYRIGHT.txt \\\
Copyright \\\
+   LGPL \\\
LICENCE \\\
LICENSE \\\
LICENSE.md \\\
LICENSE.txt \\\
-   LGPL \\\

commit ocaml-rpm-macros for openSUSE:Factory

2019-11-30 Thread root 
Hello community,

here is the log from the commit of package ocaml-rpm-macros for 
openSUSE:Factory checked in at 2019-11-30 10:35:30

Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.26869 (New)


Package is "ocaml-rpm-macros"

Sat Nov 30 10:35:30 2019 rev:4 rq:750767 version:20191101

Changes:

--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2019-11-07 23:14:11.900381774 +0100
+++ 
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.26869/ocaml-rpm-macros.changes 
2019-11-30 10:35:44.916183957 +0100
@@ -1,0 +2,5 @@
+Mon Nov 25 12:34:56 UTC 2019 - oher...@suse.de
+
+- Install also LGPL as license, needed by ocaml-lablgtk2
+
+---



Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.QrSiLO/_old  2019-11-30 10:35:45.928183835 +0100
+++ /var/tmp/diff_new_pack.QrSiLO/_new  2019-11-30 10:35:45.928183835 +0100
@@ -113,6 +113,7 @@
LICENSE \\\
LICENSE.md \\\
LICENSE.txt \\\
+   LGPL \\\
;\
do\
 %if 0%{?suse_version} > 1315

commit ocaml-rpm-macros for openSUSE:Factory

2019-11-07 Thread root 
Hello community,

here is the log from the commit of package ocaml-rpm-macros for 
openSUSE:Factory checked in at 2019-11-07 23:14:11

Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2990 (New)


Package is "ocaml-rpm-macros"

Thu Nov  7 23:14:11 2019 rev:3 rq:745385 version:20191101

Changes:

--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2019-10-14 14:52:36.710276019 +0200
+++ 
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2990/ocaml-rpm-macros.changes  
2019-11-07 23:14:11.900381774 +0100
@@ -1,0 +2,17 @@
+Fri Nov  1 12:34:56 UTC 2019 - oher...@suse.de
+
+- Moved ocaml-findlib.rpm.prov_req.attr.sh from ocaml to provide
+  ocamlfind() in ocaml itself
+- Handle license separately because sed w truncates output
+- Document individual file extensions
+- Move cmxs and so files to devel packages because they are not
+  used at runtime. Also, cmxs dependencies in main pkg are
+  not covered by ocaml-find-requires.sh (bsc#1154874)
+- Set VERSION unconditionally for each patch, sometimes dune picks it up
+- Pass --for-release-of-packages to dune via dune_release_pkgs=
+- Print potential BuildRequires during build
+- Package sml for camlp5
+- SLE_12 has still no license macro, package as doc instead
+- Use _smp_mflags instead of nproc for parallel build
+
+---

New:

  ocaml-findlib.rpm.prov_req.attr.sh



Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.Q03Kgj/_old  2019-11-07 23:14:12.372382290 +0100
+++ /var/tmp/diff_new_pack.Q03Kgj/_new  2019-11-07 23:14:12.376382295 +0100
@@ -12,18 +12,18 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 Name:   ocaml-rpm-macros
-Version:20191009
+Version:20191101
 Release:0
 Summary:RPM macros for building OCaml source packages
 License:GPL-2.0-only
 Group:  Development/Languages/OCaml
 Url:https://build.opensuse.org/project/show/devel:languages:ocaml
-#
-# keep the following macros in sync with ocaml.spec:
+Source1:ocaml-findlib.rpm.prov_req.attr.sh
+
 %define do_opt 0
 # macros to be set in prjconf:
 #Macros:
@@ -60,6 +60,17 @@
 %build
 
 %install
+# map findlib names to rpm Provides/Requires
+tag="ocamlfind"
+mkdir -vp %{buildroot}%{_rpmconfigdir}/fileattrs
+tee %{buildroot}%{_rpmconfigdir}/fileattrs/${tag}.attr <<_EOF_
+%__${tag}_provides %%{_rpmconfigdir}/${tag}.sh -prov
+%__${tag}_requires %%{_rpmconfigdir}/${tag}.sh -req
+%__${tag}_path ^%%{_libdir}/ocaml/.*/META$|^%%{_libdir}/ocaml/META$
+_EOF_
+#
+tee %{buildroot}%{_rpmconfigdir}/${tag}.sh < %{SOURCE1}
+
 # install OCaml macros
 mkdir -vp %{buildroot}%{_rpmmacrodir}
 tee %{buildroot}%{_rpmmacrodir}/macros.%{name} <<'_EOF_'
@@ -91,8 +102,9 @@
> %%{name}.files ;\
> %%{name}.files.devel ;\
> %%{name}.files.ldsoconf ;\
+   > %%{name}.files.license ;\
> %%{name}.files.unhandled ;\
-   for i in \\\
+   for license in \\\
COPYING \\\
COPYING.txt \\\
COPYRIGHT \\\
@@ -103,50 +115,87 @@
LICENSE.txt \\\
;\
do\
- test -f "$i" && echo "license $i" >> %%{name}.files ;\
+%if 0%{?suse_version} > 1315
+   license_macro='license' ;\
+%else
+   license_macro='doc' ;\
+%endif
+ test -f "${license}" && echo "${license_macro} ${license}" >> 
'%%{name}.files.license' ;\
done ;\
find %%{buildroot}$(ocamlc -where) | sed -ne '\
s@^%%{buildroot}@@\
-   /\\/\\(META\\|dune-package\\|opam\\)$/{\
-   w %%{name}.files.devel\
-   s@\\/[^/]\\+$@@\
-   s@^@%%dir @\
-   w %%{name}.files.devel\
-   s@\\/[^/]\\+$@@\
-   w %%{name}.files.devel\
+   #\
+   # for findlib, describing a package\
+   /\\/META$/{ b files_devel }\
+   # stub ELF library\
+   /\\/[^/]\\+\\.so$/{   b files_ldsoconf }\
+   # stub ELF library\
+   /\\/[^/]\\+\\.so.owner$/{ b files_ldsoconf }\
+   # ELF archive with object files\
+   /\\/[^/]\\+\\.a$/{ b files_devel }\
+   # OCaml legacy source code annotations, produced via -annot\
+   /\\/[^/]\\+\\.annot$/{ b files_devel }\
+   # OCaml library file with bytecode\
+   /\\/[^/]\\+\\.cma$/{   b files_devel }\
+   # OCaml compiled header file\
+   /\\/[^/]\\+\\.cmi$/{   b files_devel }\
+   # OCaml object file with bytecode\
+   /\\/[^/]\\+\\.cmo$/{

commit ocaml-rpm-macros for openSUSE:Factory

2019-10-14 Thread root 
Hello community,

here is the log from the commit of package ocaml-rpm-macros for 
openSUSE:Factory checked in at 2019-10-14 14:52:35

Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2352 (New)


Package is "ocaml-rpm-macros"

Mon Oct 14 14:52:35 2019 rev:2 rq:737404 version:20191009

Changes:

--- /work/SRC/openSUSE:Factory/ocaml-rpm-macros/ocaml-rpm-macros.changes
2019-10-07 13:41:08.252324198 +0200
+++ 
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2352/ocaml-rpm-macros.changes  
2019-10-14 14:52:36.710276019 +0200
@@ -1,0 +2,11 @@
+Wed Oct  9 05:48:16 UTC 2019 - oher...@suse.de
+
+- Package also COPYRIGHT, for labltk
+- Package also Copyright, for dose3
+- Package also *.cmo
+- Package also *.so.owner
+- Package also *.o
+- Package also /etc/ld.so.conf.d
+- Package also *.js
+
+---



Other differences:
--
++ ocaml-rpm-macros.spec ++
--- /var/tmp/diff_new_pack.U6B454/_old  2019-10-14 14:52:37.358274329 +0200
+++ /var/tmp/diff_new_pack.U6B454/_new  2019-10-14 14:52:37.362274318 +0200
@@ -16,7 +16,7 @@
 #
 
 Name:   ocaml-rpm-macros
-Version:20191004
+Version:20191009
 Release:0
 Summary:RPM macros for building OCaml source packages
 License:GPL-2.0-only
@@ -90,10 +90,13 @@
 %%ocaml_create_file_list \
> %%{name}.files ;\
> %%{name}.files.devel ;\
+   > %%{name}.files.ldsoconf ;\
> %%{name}.files.unhandled ;\
for i in \\\
COPYING \\\
COPYING.txt \\\
+   COPYRIGHT \\\
+   Copyright \\\
LICENCE \\\
LICENSE \\\
LICENSE.md \\\
@@ -113,7 +116,7 @@
w %%{name}.files.devel\
d\
}\
-   
/\\/[^/]\\+\\.\\(a\\|annot\\|cmx\\|cmxa\\|cma\\|cmi\\|cmt\\|cmti\\|exe\\|h\\|ml\\|mli\\)$/{\
+   
/\\/[^/]\\+\\.\\(a\\|annot\\|cmx\\|cmxa\\|cma\\|cmi\\|cmo\\|cmt\\|cmti\\|exe\\|h\\|js\\|ml\\|mli\\|o\\)$/{\
w %%{name}.files.devel\
s@\\/[^/]\\+$@@\
s@^@%%dir @\
@@ -122,7 +125,17 @@
w %%{name}.files.devel\
d\
}\
-   /\\/[^/]\\+\\.\\(cmxs\\|so\\)$/{\
+   /\\/[^/]\\+\\.\\(so\\|so.owner\\)$/{\
+   w %%{name}.files\
+   s@\\/[^/]\\+$@@\
+   w %%{name}.files.ldsoconf\
+   s@^@%%dir @\
+   w %%{name}.files\
+   s@\\/[^/]\\+$@@\
+   w %%{name}.files\
+   d\
+   }\
+   /\\/[^/]\\+\\.\\(cmxs\\)$/{\
w %%{name}.files\
s@\\/[^/]\\+$@@\
s@^@%%dir @\
@@ -134,12 +147,29 @@
w %%{name}.files.unhandled\
d\
' ;\
-   for i in %%{name}.files %%{name}.files.devel ;\
+   for i in \\\
+   %%{name}.files \\\
+   %%{name}.files.devel \\\
+   %%{name}.files.ldsoconf \\\
+   %%{name}.files.unhandled \\\
+   ;\
do\
  sort -u $i > $$ ;\
  mv $$ $i ;\
done ;\
-   head -n 1234 %%{name}.files %%{name}.files.devel 
%%{name}.files.unhandled ;\
+   if test -s %%{name}.files.ldsoconf ;\
+   then \
+   ldsoconfd='/etc/ld.so.conf.d' ;\
+   mkdir -vp "%%{buildroot}${ldsoconfd}" ;\
+   tee "%%{buildroot}${ldsoconfd}/%%{name}.conf" < 
%%{name}.files.ldsoconf ;\
+   echo "%config ${ldsoconfd}/%%{name}.conf" >> %%{name}.files ;\
+   fi ;\
+   head -n 1234 \\\
+   %%{name}.files \\\
+   %%{name}.files.devel \\\
+   %%{name}.files.ldsoconf \\\
+   %%{name}.files.unhandled \\\
+   ;\
%%{nil}
 
 # setup.ml comes from oasis, but this is here for libs oasis depends on

commit ocaml-rpm-macros for openSUSE:Factory

2019-10-07 Thread root 
Hello community,

here is the log from the commit of package ocaml-rpm-macros for 
openSUSE:Factory checked in at 2019-10-07 13:41:04

Comparing /work/SRC/openSUSE:Factory/ocaml-rpm-macros (Old)
 and  /work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2352 (New)


Package is "ocaml-rpm-macros"

Mon Oct  7 13:41:04 2019 rev:1 rq:735307 version:20191004

Changes:

New Changes file:

--- /dev/null   2019-09-25 09:10:10.894331610 +0200
+++ 
/work/SRC/openSUSE:Factory/.ocaml-rpm-macros.new.2352/ocaml-rpm-macros.changes  
2019-10-07 13:41:08.252324198 +0200
@@ -0,0 +1,24 @@
+---
+Fri Oct  4 07:56:44 UTC 2019 - oher...@suse.de
+
+- Use _rpmmacrodir
+- Automatically package known license files in main pkg
+- List unhandled files in ocaml_create_file_list macro
+- Do not mark files as %config
+
+---
+Mon Sep 30 14:15:16 UTC 2019 - oher...@suse.de
+
+- Increase ulimit -s on ppc64 in dune macros
+  Required for at least ocaml-camomile
+- Show external-lib-deps also for dune runtest
+- Provide a ocaml_create_file_list macro
+- Optional extra args for dune commands
+- Pass --verbose to dune commands
+- Move prefix/man to datadir/man to workaround bug in dune (#2670)
+
+---
+Mon Sep 30 12:34:56 UTC 2019 - oher...@suse.de
+
+- moved ocaml-rpm-macros from ocaml.spec to separate pkg
+

New:

  ocaml-rpm-macros.changes
  ocaml-rpm-macros.spec



Other differences:
--
++ ocaml-rpm-macros.spec ++
#
# spec file for package ocaml-rpm-macros
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

Name:   ocaml-rpm-macros
Version:20191004
Release:0
Summary:RPM macros for building OCaml source packages
License:GPL-2.0-only
Group:  Development/Languages/OCaml
Url:https://build.opensuse.org/project/show/devel:languages:ocaml
#
# keep the following macros in sync with ocaml.spec:
%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 s390x x86_64
%define do_opt 1
%endif
%endif
#
%if %{with ocaml_force_disable_ocaml_opt}
%define do_opt 0
%endif
#

%description
OCaml is a high-level, strongly-typed, functional and object-oriented
programming language from the ML family of languages.

This package contains a set of helper macros to unify common code used
in ocaml spec files.

%prep

%build

%install
# install OCaml macros
mkdir -vp %{buildroot}%{_rpmmacrodir}
tee %{buildroot}%{_rpmmacrodir}/macros.%{name} <<'_EOF_'
# get rid of %{_rpmconfigdir}/find-debuginfo.sh
# strip kills the bytecode part of ELF binaries
#
# provide empty _find_debuginfo_dwz_opts
# the .dwz files contains identical contents, which leads to identical
# checksums, which leads to file conflicts due to identical symlinks
%if %{do_opt}
%%ocaml_preserve_bytecode \
%%define _lto_cflags %%{nil} \
%%{nil}
%%ocaml_native_compiler 1
%%_find_debuginfo_dwz_opts %%{nil}
%else
%%ocaml_preserve_bytecode \
%%undefine _build_create_debug \
%%define __arch_install_post export NO_BRP_STRIP_DEBUG=true \
%%define _lto_cflags %%{nil} \
%%{nil}
%%ocaml_native_compiler 0
%endif

# 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
%%ocaml_create_file_list \
> %%{name}.files ;\
> %%{name}.files.devel ;\
> %%{name}.files.unhandled ;\
for i in \\\
COPYING \\\
COPYING.txt \\\
LICENCE \\\
LICENSE \\\
LICENSE.md \\\
LICENSE.txt \\\
;\