Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ocaml-findlib for openSUSE:Factory
checked in at 2022-04-06 21:51:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ocaml-findlib (Old)
and /work/SRC/openSUSE:Factory/.ocaml-findlib.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-findlib"
Wed Apr 6 21:51:13 2022 rev:12 rq:967051 version:1.9.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/ocaml-findlib/ocaml-findlib.changes
2021-04-29 01:38:24.770579496 +0200
+++ /work/SRC/openSUSE:Factory/.ocaml-findlib.new.1900/ocaml-findlib.changes
2022-04-06 21:51:31.447544767 +0200
@@ -1,0 +2,6 @@
+Mon Apr 4 04:04:04 UTC 2022 - oher...@suse.de
+
+- Update to version 1.9.2
+ Fix an incomaptibility with ocaml-5.0
+
+-------------------------------------------------------------------
Old:
----
findlib-1.9.1.tar.xz
New:
----
findlib-1.9.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ocaml-findlib.spec ++++++
--- /var/tmp/diff_new_pack.K3YgAi/_old 2022-04-06 21:51:31.867539974 +0200
+++ /var/tmp/diff_new_pack.K3YgAi/_new 2022-04-06 21:51:31.871539928 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ocaml-findlib
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2010-2011 Andrew Psaltis <ampsaltis at gmail dot com>
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: ocaml-findlib
-Version: 1.9.1
+Version: 1.9.2
Release: 0
%{?ocaml_preserve_bytecode}
Summary: Objective CAML package manager and build helper
@@ -26,15 +26,15 @@
Group: Development/Languages/OCaml
BuildRoot: %_tmppath/%name-%version-build
Url: https://github.com/ocaml/ocamlfind
-Source0: findlib-%{version}.tar.xz
+Source0: findlib-%version.tar.xz
#
Requires: ocaml-compiler-libs
Requires: ocaml-runtime
#
-Provides: ocamlfind = %{version}
+Provides: ocamlfind = %version
BuildRequires: ocaml
BuildRequires: ocaml-ocamldoc
-BuildRequires: ocaml-rpm-macros >= 20210409
+BuildRequires: ocaml-rpm-macros >= 20220222
%description
Findlib is a library manager for Objective Caml. It provides a
@@ -46,45 +46,45 @@
%package devel
Summary: Development files for ocaml-findlib
Group: Development/Languages/OCaml
-Requires: %{name} = %{version}
-Provides: %{name}-camlp4 = %{version}-%{release}
-Obsoletes: %{name}-camlp4 < %{version}-%{release}
+Requires: %name = %version
+Provides: %name-camlp4 = %version-%release
+Obsoletes: %name-camlp4 < %version-%release
%description devel
The ocaml-findlib-devel package contains libraries and signature files
for developing applications that use ocaml-findlib.
%prep
-%setup -q -n findlib-%{version}
+%setup -q -n findlib-%version
%build
rm -rfv site-lib-src
(cd tools/extract_args && make)
tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp
ocamlmktop ocamlopt ocamldep ocamldoc ||:
-./configure -config %{ocaml_standard_library}/ocamlfind.conf \
- -bindir %{_bindir} \
- -sitelib '%{ocaml_standard_library}' \
- -mandir %{_mandir} \
+./configure -config %ocaml_standard_library/ocamlfind.conf \
+ -bindir %_bindir \
+ -sitelib '%ocaml_standard_library' \
+ -mandir %_mandir \
-with-toolbox
make all
make opt
%install
-make install prefix=%{buildroot}
-rm -rfv %{buildroot}%{ocaml_standard_library}/ocamlbuild
-rm -rfv %{buildroot}%{ocaml_standard_library}/findlib/Makefile.packages
+make install prefix=%buildroot
+rm -rfv %buildroot%ocaml_standard_library/ocamlbuild
+rm -rfv %buildroot%ocaml_standard_library/findlib/Makefile.packages
%ocaml_create_file_list
-%files -f %{name}.files
+%files -f %name.files
%defattr(-,root,root,-)
-%{ocaml_standard_library}/ocamlfind.conf
-%{ocaml_standard_library}/topfind
-%{_bindir}/*
-%{_mandir}/man?/*
+%ocaml_standard_library/ocamlfind.conf
+%ocaml_standard_library/topfind
+%_bindir/*
+%_mandir/man?/*
#
-%files devel -f %{name}.files.devel
+%files devel -f %name.files.devel
%defattr(-,root,root,-)
-%{ocaml_standard_library}/*/Makefile.config
+%ocaml_standard_library/*/Makefile.config
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.K3YgAi/_old 2022-04-06 21:51:31.915539426 +0200
+++ /var/tmp/diff_new_pack.K3YgAi/_new 2022-04-06 21:51:31.919539380 +0200
@@ -2,8 +2,8 @@
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/ocaml/ocamlfind.git</param>
<param name="scm">git</param>
- <param name="versionformat">1.9.1</param>
- <param name="revision">findlib-1.9.1</param>
+ <param name="versionformat">1.9.2</param>
+ <param name="revision">9f29bb975a91b17e115127ec38d857673b33e0e4</param>
<param name="filename">ocaml-findlib</param>
</service>
<service name="recompress" mode="disabled">
++++++ findlib-1.9.1.tar.xz -> findlib-1.9.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/findlib-1.9.1/Makefile new/findlib-1.9.2/Makefile
--- old/findlib-1.9.1/Makefile 2021-03-16 12:43:00.000000000 +0100
+++ new/findlib-1.9.2/Makefile 2022-01-19 23:39:27.000000000 +0100
@@ -90,8 +90,8 @@
if [ -f "$(prefix)$(OCAML_SITELIB)/$$x/META" ]; then \
if ! grep -Fq '[distributed with Ocaml]'
"$(prefix)/$(OCAML_SITELIB)/$$x/META"; then \
rm -f site-lib-src/$$x/META; \
- fi \
- fi \
+ fi; \
+ fi; \
done; \
test -f "site-lib-src/num/META" || rm -f "site-lib-src/num-top/META"; \
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/findlib-1.9.1/configure new/findlib-1.9.2/configure
--- old/findlib-1.9.1/configure 2021-03-16 12:43:00.000000000 +0100
+++ new/findlib-1.9.2/configure 2022-01-19 23:39:27.000000000 +0100
@@ -526,7 +526,7 @@
have_str=0
fi
-if check_library labltk 'normal since 4.02' labltk/labtk.cma; then
+if check_library labltk 'normal since 4.02' labltk/labltk.cma; then
have_labltk=1
else
have_labltk=0
@@ -589,6 +589,7 @@
# bytes?
# (NB. This is always ours, and it doesn't go into generated_META)
+req_bytes=""
if [ -f "${ocaml_core_stdlib}/bytes.cmi" -o \
-f "${ocaml_core_stdlib}/stdlib__bytes.cmi" -o \
-f "${ocaml_core_stdlib}/stdlib__Bytes.cmi" ]; then
@@ -598,6 +599,7 @@
else
echo "bytes: not found, installing compat library"
lbytes=""
+ req_bytes="bytes"
cbytes=1
fi
@@ -637,7 +639,9 @@
for part in `cd src; echo *`; do
if [ -f "src/$part/META.in" ]; then
- sed -e "s/@VERSION@/$version/g" src/$part/META.in >src/$part/META
+ sed -e "s/@VERSION@/$version/g" \
+ -e "s/@REQUIRES@/${req_bytes}/g" \
+ src/$part/META.in >src/$part/META
fi
done
@@ -665,11 +669,16 @@
# Write Makefile.config
parts="findlib"
+ocamlfind_ocamlflags=""
+ocamlfind_archives="findlib.cma unix.cma"
if [ $with_toolbox -gt 0 ]; then
parts="$parts findlib-toolbox"
fi
if [ $cbytes -gt 0 ]; then
- parts="$parts bytes"
+ # bytes first, because findlib needs it
+ parts="bytes $parts"
+ ocamlfind_ocamlflags="-I ../bytes"
+ ocamlfind_archives="bytes.cma ${ocamlfind_archives}"
fi
echo "# Makefile.config written by configure" >Makefile.config
@@ -681,6 +690,8 @@
echo "OCAMLFIND_BIN=${ocamlfind_bin}" >>Makefile.config
echo "OCAMLFIND_MAN=${ocamlfind_man}" >>Makefile.config
echo "OCAMLFIND_CONF=${ocamlfind_config}" >>Makefile.config
+echo "OCAMLFIND_OCAMLFLAGS=${ocamlfind_ocamlflags}" >>Makefile.config
+echo "OCAMLFIND_ARCHIVES=${ocamlfind_archives}" >>Makefile.config
echo "OCAML_AUTOLINK=${ocaml_autolink}" >>Makefile.config
echo "OCAML_REMOVE_DIRECTORY=${have_remdir}" >>Makefile.config
echo "EXEC_SUFFIX=${exec_suffix}" >>Makefile.config
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/findlib-1.9.1/doc/README new/findlib-1.9.2/doc/README
--- old/findlib-1.9.1/doc/README 2021-03-16 12:43:01.000000000 +0100
+++ new/findlib-1.9.2/doc/README 2022-01-19 23:39:27.000000000 +0100
@@ -85,6 +85,8 @@
List of Changes
==============================================================================
+- 1.9.2: Fixes a build problem regarding OCaml-5.00
+
- 1.9.1: Fixes a few install-related issues, like missing files.
- 1.9: Overhaul how separately installed packages (e.g. num) are handled (by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/findlib-1.9.1/doc/README.xml
new/findlib-1.9.2/doc/README.xml
--- old/findlib-1.9.1/doc/README.xml 2021-03-16 12:43:01.000000000 +0100
+++ new/findlib-1.9.2/doc/README.xml 2022-01-19 23:39:27.000000000 +0100
@@ -109,6 +109,8 @@
<title>List of Changes</title>
<ul>
+ <li><p><em>1.9.2:</em> Fixes a build problem regarding
OCaml-5.00</p></li>
+
<li><p><em>1.9.1:</em> Fixes a few install-related issues, like missing
files.</p></li>
<li>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/findlib-1.9.1/mini/ocamlfind-mini
new/findlib-1.9.2/mini/ocamlfind-mini
--- old/findlib-1.9.1/mini/ocamlfind-mini 2021-03-16 12:43:00.000000000
+0100
+++ new/findlib-1.9.2/mini/ocamlfind-mini 2022-01-19 23:39:27.000000000
+0100
@@ -575,7 +575,7 @@
let ch_out = open_out_bin outpath in
try
let buflen = 4096 in
- let buf = String.create buflen in
+ let buf = Bytes.create buflen in
let pos = ref 0 in
let len = ref (input ch_in buf 0 buflen) in
while !len > 0 do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/findlib-1.9.1/opam new/findlib-1.9.2/opam
--- old/findlib-1.9.1/opam 2021-03-16 12:43:00.000000000 +0100
+++ new/findlib-1.9.2/opam 2022-01-19 23:39:27.000000000 +0100
@@ -1,11 +1,11 @@
opam-version: "2.0"
-version: "1.9.1.git"
+version: "1.9.2.git"
synopsis: "A library manager for OCaml"
maintainer: "Thomas Gazagnaire <tho...@gazagnaire.org>"
authors: "Gerd Stolpmann <g...@gerd-stolpmann.de>"
homepage: "http://projects.camlcity.org/projects/findlib.html";
-bug-reports: "https://gitlab.camlcity.org/gerd/lib-findlib/issues";
-dev-repo: "git+https://gitlab.camlcity.org/gerd/lib-findlib.git";
+bug-reports: "https://github.com/ocaml/ocamlfind/issues";
+dev-repo: "git+https://github.com/ocaml/ocamlfind.git";
description: """
Findlib is a library manager for OCaml. It provides a convention how
to store libraries, and a file format ("META") to describe the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/findlib-1.9.1/src/bytes/Makefile
new/findlib-1.9.2/src/bytes/Makefile
--- old/findlib-1.9.1/src/bytes/Makefile 2021-03-16 12:43:01.000000000
+0100
+++ new/findlib-1.9.2/src/bytes/Makefile 2022-01-19 23:39:27.000000000
+0100
@@ -1,27 +1,28 @@
BYTE_FILES=bytes.cmi bytes.cma
NATIVE_FILES=bytes.cmx bytes$(LIB_SUFFIX) bytes.cmxa
NATIVE_FILES_DYNLINK=bytes.cmxs
-OCAMLBUILD=ocamlbuild -classic-display -no-links
TOP=../..
include $(TOP)/Makefile.config
+OCAMLC = ocamlc
+OCAMLOPT = ocamlopt -g
+
build: all opt
all:
- $(OCAMLBUILD) $(BYTE_FILES)
+ $(OCAMLC) -a -o bytes.cma bytes.ml
opt:
- files="$(NATIVE_FILES)"; \
- if [ $(HAVE_NATDYNLINK) = 1 ]; then \
- files="$$files $(NATIVE_FILES_DYNLINK)"; \
- fi; \
- $(OCAMLBUILD) $$files
+ $(OCAMLOPT) -a -o bytes.cmxa bytes.ml
+ if [ $(HAVE_NATDYNLINK) -gt 0 ]; then \
+ $(OCAMLOPT) -shared -o bytes.cmxs bytes.cmxa; \
+ fi
install: all
mkdir -p "$(prefix)$(OCAML_SITELIB)/bytes"
- cd _build/ && cp ../META $(BYTE_FILES) "$(prefix)$(OCAML_SITELIB)/bytes"
- cd _build/ && for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [
-f "$$f" ]; then cp $$f "$(prefix)$(OCAML_SITELIB)/bytes"; fi; done
+ cp META $(BYTE_FILES) "$(prefix)$(OCAML_SITELIB)/bytes"
+ for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [ -f "$$f" ];
then cp $$f "$(prefix)$(OCAML_SITELIB)/bytes"; fi; done
uninstall:
rm -rf "$(prefix)$(OCAML_SITELIB)/bytes"
@@ -30,7 +31,7 @@
# questionable here.
install-self: all
- cd _build/ && ocamlfind install bytes ../META $(BYTE_FILES) -optional
$(NATIVE_FILES) $(NATIVE_FILES_DYNLINK)
+ ocamlfind install bytes META $(BYTE_FILES) -optional $(NATIVE_FILES)
$(NATIVE_FILES_DYNLINK)
uninstall-self:
ocamlfind remove bytes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/findlib-1.9.1/src/findlib/META.in
new/findlib-1.9.2/src/findlib/META.in
--- old/findlib-1.9.1/src/findlib/META.in 2021-03-16 12:43:01.000000000
+0100
+++ new/findlib-1.9.2/src/findlib/META.in 2022-01-19 23:39:27.000000000
+0100
@@ -8,7 +8,7 @@
package "internal" (
version = "@VERSION@"
description = "Package manager"
- requires = ""
+ requires = "@REQUIRES@"
archive(byte) = "findlib.cma"
archive(native) = "findlib.cmxa"
plugin(byte) = "findlib.cma"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/findlib-1.9.1/src/findlib/Makefile
new/findlib-1.9.2/src/findlib/Makefile
--- old/findlib-1.9.1/src/findlib/Makefile 2021-03-16 12:43:01.000000000
+0100
+++ new/findlib-1.9.2/src/findlib/Makefile 2022-01-19 23:39:27.000000000
+0100
@@ -32,6 +32,9 @@
OCAMLFIND_OBJECTS = ocaml_args.cmo frontend.cmo
OCAMLFIND_XOBJECTS = ocaml_args.cmx frontend.cmx
+# OCAMLFIND_ARCHIVES: set in Makefile.config
+OCAMLFIND_XARCHIVES = $(OCAMLFIND_ARCHIVES:.cma=.cmxa)
+
NUMTOP_OBJECTS = num_top_printers.cmo num_top.cmo
DYNLOAD_OBJECTS = fl_dynload.cmo
@@ -47,12 +50,12 @@
num-top: num_top.cma
ocamlfind$(EXEC_SUFFIX): findlib.cma $(OCAMLFIND_OBJECTS)
- $(OCAMLC) $(CUSTOM) -o ocamlfind$(EXEC_SUFFIX) -g findlib.cma unix.cma \
- $(OCAMLC_FLAGS) $(OCAMLFIND_OBJECTS)
+ $(OCAMLC) $(CUSTOM) -o ocamlfind$(EXEC_SUFFIX) -g $(OCAMLFIND_ARCHIVES)
\
+ $(OCAMLC_FLAGS) $(OCAMLFIND_OCAMLFLAGS) $(OCAMLFIND_OBJECTS)
ocamlfind_opt$(EXEC_SUFFIX): findlib.cmxa $(OCAMLFIND_XOBJECTS)
- $(OCAMLOPT) -o ocamlfind_opt$(EXEC_SUFFIX) findlib.cmxa unix.cmxa \
- $(OCAMLOPT_FLAGS) $(OCAMLFIND_XOBJECTS)
+ $(OCAMLOPT) -o ocamlfind_opt$(EXEC_SUFFIX) $(OCAMLFIND_XARCHIVES) \
+ $(OCAMLOPT_FLAGS) $(OCAMLFIND_OCAMLFLAGS)
$(OCAMLFIND_XOBJECTS)
test_parser$(EXEC_SUFFIX): fl_metascanner.cmx test_parser.cmx fl_metatoken.cmx
fl_meta.cmx
$(OCAMLOPT) -o test_parser$(EXEC_SUFFIX) fl_meta.cmx fl_metatoken.cmx
fl_metascanner.cmx test_parser.cmx
@@ -153,19 +156,19 @@
# .src
.mml.cmo:
- $(OCAMLC) $(OPAQUE) -g -vmthread -c -impl $<
+ $(OCAMLC) $(OPAQUE) $(OCAMLC_FLAGS) $(OCAMLFIND_OCAMLFLAGS) -g
-vmthread -c -impl $<
.mml.cmx:
- $(OCAMLOPT) $(OPAQUE) -thread -c -impl $<
+ $(OCAMLOPT) $(OPAQUE) $(OCAMLOPT_FLAGS) $(OCAMLFIND_OCAMLFLAGS) -thread
-c -impl $<
.ml.cmx:
- $(OCAMLOPT) $(OPAQUE) -c $<
+ $(OCAMLOPT) $(OPAQUE) $(OCAMLOPT_FLAGS) $(OCAMLFIND_OCAMLFLAGS) -c $<
.ml.cmo:
- $(OCAMLC) $(OPAQUE) -g -c $<
+ $(OCAMLC) $(OPAQUE) $(OCAMLC_FLAGS) $(OCAMLFIND_OCAMLFLAGS) -g -c $<
.mli.cmi:
- $(OCAMLC) $(OPAQUE) -c $<
+ $(OCAMLC) $(OPAQUE) $(OCAMLC_FLAGS) $(OCAMLFIND_OCAMLFLAGS) -c $<
#.src.ml:
# $(CAMLP4O) -impl $< -o $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/findlib-1.9.1/src/findlib/frontend.ml
new/findlib-1.9.2/src/findlib/frontend.ml
--- old/findlib-1.9.1/src/findlib/frontend.ml 2021-03-16 12:43:01.000000000
+0100
+++ new/findlib-1.9.2/src/findlib/frontend.ml 2022-01-19 23:39:27.000000000
+0100
@@ -1823,7 +1823,7 @@
outpath in
try
let buflen = 4096 in
- let buf = String.create buflen in (* FIXME: Bytes.create *)
+ let buf = Bytes.create buflen in
let pos = ref 0 in
let len = ref (input ch_in buf 0 buflen) in
while !len > 0 do
