microsoft
/
CBL-Mariner
зеркало из https://github.com/microsoft/CBL-Mariner.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix 3.0-dev build breaks from ocaml packages (#9295)

This commit is contained in:
Andrew Phelps 2024-06-05 12:56:14 -07:00 коммит произвёл GitHub
Родитель e9de0641ba
Коммит d5641a25d5
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
27 изменённых файлов: 148 добавлений и 593 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md сгенерированный
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

2
LICENSES-AND-NOTICES/SPECS/data/licenses.json
Просмотреть файл

@ -1013,7 +1013,6 @@
"ocaml-luv",
"ocaml-lwt",
"ocaml-markup",
"ocaml-migrate-parsetree",
"ocaml-mmap",
"ocaml-num",
"ocaml-ocamlbuild",
@ -1036,7 +1035,6 @@
"ocaml-stdlib-random",
"ocaml-topkg",
"ocaml-tyxml",
"ocaml-uuidm",
"ocaml-uutf",
"ocaml-xml-light",
"ocaml-zarith",

39
SPECS/ocaml-alcotest/0001-Drop-the-stdlib-shims-subpackage.patch
Просмотреть файл

@ -16,36 +16,41 @@ diff --git a/alcotest.opam b/alcotest.opam
index 756782f..3996bb0 100644
--- a/alcotest.opam
+++ b/alcotest.opam
@@ -26,7 +26,6 @@ depends: [
"cmdliner"
"uuidm"
@@ -25,9 +25,7 @@ depends: [
"astring"
"cmdliner" {>= "1.0.0"}
"re"
- "stdlib-shims"
"uutf"
- "ocaml-syntax-shims"
"odoc" {with-doc}
]
build: [
conflicts: [
diff --git a/dune-project b/dune-project
index 9bccced..f634a31 100644
--- a/dune-project
+++ b/dune-project
@@ -30,7 +30,6 @@ tests to run.
cmdliner
uuidm
@@ -29,9 +29,7 @@ tests to run.
astring
(cmdliner (>= 1.0.0))
re
- stdlib-shims
uutf))
(package
- uutf
- ocaml-syntax-shims)
+ uutf)
(conflicts
(result (< 1.5)) ;; Ensure `Result.result` = `Stdlib.result` when possible
))
diff --git a/src/alcotest-engine/dune b/src/alcotest-engine/dune
index 9c05d0a..65b33e7 100644
--- a/src/alcotest-engine/dune
+++ b/src/alcotest-engine/dune
@@ -1,4 +1,4 @@
(library
(name alcotest_engine)
(public_name alcotest.engine)
- (libraries fmt astring cmdliner fmt.cli uuidm re stdlib-shims uutf))
+ (libraries fmt astring cmdliner fmt.cli uuidm re uutf))
@@ -8,6 +8,5 @@
cmdliner
fmt.cli
re
- stdlib-shims
uutf)
(preprocess future_syntax))
--
2.26.2

2
SPECS/ocaml-alcotest/ocaml-alcotest.signatures.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"alcotest-1.3.0.tar.gz": "a439b02f37b263cdcfb5a6d07e74f1e232bcda161b8b66150a744e94e33c1647"
"alcotest-1.5.0.tar.gz": "0e39f1b1d4b541ae52c60e687436e0107e83af147bd6db977c7d4a9c316b51c2"
}
}

63
SPECS/ocaml-alcotest/ocaml-alcotest.spec
Просмотреть файл

@ -7,27 +7,27 @@
Summary: Lightweight and colorful test framework for OCaml
Name: ocaml-%{srcname}
Version: 1.3.0
Release: 3%{?dist}
Version: 1.5.0
Release: 1%{?dist}
License: ISC
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://github.com/mirage/alcotest
Source0: %{URL}/archive/%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
# We neither need nor want the stdlib-shims package. It is a forward
# compatibility package for older OCaml installations. Patch it out instead.
# Upstream does not want this patch until stdlib-shims is obsolete.
# We neither need nor want the stdlib-shims or ocaml-syntax-shims packages in
# Azure Linux. They are forward compatibility packages for older OCaml
# installations. Patch them out instead. Upstream does not want this patch
# until stdlib-shims and ocaml-syntax-shims are obsolete.
Patch0: 0001-Drop-the-stdlib-shims-subpackage.patch
BuildRequires: ocaml >= 4.03.0
BuildRequires: ocaml-astring-devel
BuildRequires: ocaml-cmdliner-devel
BuildRequires: ocaml-dune >= 2.0
BuildRequires: ocaml-cmdliner-devel >= 1.0.0
BuildRequires: ocaml-dune >= 2.8
BuildRequires: ocaml-findlib
BuildRequires: ocaml-fmt-devel >= 0.8.7
BuildRequires: ocaml-re-devel
BuildRequires: ocaml-uuidm-devel
BuildRequires: ocaml-uutf-devel
BuildRequires: ocaml-re-devel >= 1.7.2
BuildRequires: ocaml-uutf-devel >= 1.0.1
%description
Alcotest is a lightweight and colorful test framework.
@ -45,10 +45,11 @@ tests to run.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: ocaml-astring-devel%{?_isa}
Requires: ocaml-cmdliner-devel%{?_isa}
Requires: ocaml-fmt-devel%{?_isa}
Requires: ocaml-re-devel%{?_isa}
Requires: ocaml-uuidm-devel%{?_isa}
Requires: ocaml-uutf-devel%{?_isa}
%description devel
The %{name}-devel package contains libraries and signature files for
@ -79,26 +80,21 @@ rm -fr %{buildroot}%{_prefix}/doc
# We do not want the ml files
find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete
%ifarch %{ocaml_native_compiler}
# Add missing executable bits
find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+
%endif
%check
dune runtest -j 1 -p alcotest
%files
%doc CHANGES.md README.md
%doc CHANGES.md README.md alcotest-help.txt
%license LICENSE.md
%dir %{_libdir}/ocaml/%{srcname}/
%dir %{_libdir}/ocaml/%{srcname}/engine/
%dir %{_libdir}/ocaml/%{srcname}/stdlib_ext/
%{_libdir}/ocaml/%{srcname}/META
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cma
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmi
%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cma
%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmi
%{_libdir}/ocaml/%{srcname}/runtime.js
%{_libdir}/ocaml/%{srcname}/{*/,}*.cma
%{_libdir}/ocaml/%{srcname}/{*/,}*.cmi
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxs
%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmxs
%{_libdir}/ocaml/%{srcname}/{*/,}*.cmxs
%endif
%{_libdir}/ocaml/stublibs/dllalcotest_stubs.so
@ -106,21 +102,18 @@ dune runtest -j 1 -p alcotest
%{_libdir}/ocaml/%{srcname}/dune-package
%{_libdir}/ocaml/%{srcname}/opam
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/%{srcname}/*.a
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmx
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxa
%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.a
%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmx
%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmxa
%{_libdir}/ocaml/%{srcname}/{*/,}*.a
%{_libdir}/ocaml/%{srcname}/{*/,}*.cmx
%{_libdir}/ocaml/%{srcname}/{*/,}*.cmxa
%endif
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmt
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmti
%{_libdir}/ocaml/%{srcname}/*.mli
%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmt
%{_libdir}/ocaml/%{srcname}/engine/%{srcname}_engine*.cmti
%{_libdir}/ocaml/%{srcname}/engine/*.mli
%{_libdir}/ocaml/%{srcname}/{*/,}*.cmt
%{_libdir}/ocaml/%{srcname}/{*/,}*.cmti
%{_libdir}/ocaml/%{srcname}/{*/,}*.mli
%changelog
* Tue Jun 04 2024 Andrew Phelps <anphel@microsoft.com> - 1.5.0-1
- Upgrade to version 1.5.0 with changes based on Fedora 36 (license: MIT).
* Thu Mar 31 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.3.0-3
- Cleaning-up spec. License verified.

2
SPECS/ocaml-bisect-ppx/ocaml-bisect-ppx.signatures.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"bisect_ppx-2.6.3.tar.gz": "f9dadd7eddb3537b222993dc2b968a9a5c401064445ab0422216634dd9db655b"
"bisect_ppx-2.8.3.tar.gz": "27ddeb2f60fbae50dc504e63e63cd5f012689084a76d5fdd4d1371d5341ff8db"
}
}

7
SPECS/ocaml-bisect-ppx/ocaml-bisect-ppx.spec
Просмотреть файл

@ -7,8 +7,8 @@
Summary: Code coverage for OCaml and Reason
Name: ocaml-%{srcname}
Version: 2.6.3
Release: 4%{?dist}
Version: 2.8.3
Release: 1%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Azure Linux
@ -112,6 +112,9 @@ find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete
%{_libdir}/ocaml/%{upname}/runtime/*.mli
%changelog
* Tue Jun 04 2024 Andrew Phelps <anphel@microsoft.com> - 2.8.3-1
- Upgrade to version 2.8.3
* Mon May 06 2024 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 2.6.3-4
- Rebuild using ocaml 5.1.1

2
SPECS/ocaml-ctypes/ocaml-ctypes.signatures.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"ocaml-ctypes-0.18.0.tar.gz": "1f30c48f4667f17ea4ab5048b9fd10d090a7fbbf4f1997eb018b656b851340a4"
"ocaml-ctypes-0.21.1.tar.gz": "6f2b3b0f26c202b75ed7df3867fd9580d3e592af4944875b92ec0ee3ca7e14ff"
}
}

103
SPECS/ocaml-ctypes/ocaml-ctypes.spec
Просмотреть файл

@ -1,28 +1,35 @@
Summary: Combinators for binding to C libraries without writing any C
Name: ocaml-ctypes
Version: 0.18.0
Release: 6%{?dist}
Version: 0.21.1
Release: 1%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://github.com/ocamllabs/ocaml-ctypes
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
BuildRequires: libffi-devel
BuildRequires: make
BuildRequires: ocaml >= 4.02.3
BuildRequires: ocaml >= 4.03.0
BuildRequires: ocaml-bigarray-compat-devel
BuildRequires: ocaml-findlib
BuildRequires: ocaml-integers-devel >= 0.3.0
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-dune >= 2.9
BuildRequires: ocaml-dune-configurator-devel
BuildRequires: ocaml-integers-devel >= 0.2.2
BuildRequires: pkgconfig(libffi)
%if 0%{?with_check}
BuildRequires: ocaml-bisect-ppx-devel
BuildRequires: ocaml-lwt-devel >= 3.2.0
BuildRequires: ocaml-lwt-devel >= 2.4.7
BuildRequires: ocaml-ounit-devel
BuildRequires: pkgconfig
BuildRequires: pkgconfig(ncurses)
%endif
# This can be removed when F42 reaches EOL
Obsoletes: %{name}-doc < 0.21.0
Provides: %{name}-doc = %{version}-%{release}
# Do not require ocaml-compiler-libs at runtime
%global __ocaml_requires_opts -i Asttypes -i Build_path_prefix_map -i Cmi_format -i Env -i Ident -i Identifiable -i Load_path -i Location -i Longident -i Misc -i Outcometree -i Parsetree -i Path -i Primitive -i Shape -i Subst -i Toploop -i Type_immediacy -i Types -i Warnings
%description
Ctypes is a library for binding to C libraries using pure OCaml. The
primary aim is to make writing C extensions as straightforward as
@ -44,89 +51,31 @@ Requires: ocaml-integers-devel%{?_isa}
The %{name}-devel package contains libraries and signature
files for developing applications that use %{name}.
%package doc
Summary: Documentation for %{name}
BuildArch: noarch
%description doc
The %{name}-doc package contains developer documentation for
%{name}.
%prep
%autosetup
# Use Mariner flags
sed -e 's|-fPIC -Wall -g|-fPIC %{build_cflags}|' \
-e 's|-link -static-libgcc|%{build_ldflags}|' \
-i Makefile.rules
sed -i 's|=-Wl,--no-as-needed|=%{build_ldflags}|' src/discover/determine_as_needed_flags.sh
# Flags for bigarray-compat are missing
sed -i 's/(OCAMLFIND_BISECT_FLAGS)/& -package bigarray-compat/' Makefile.rules
sed -i 's/^DOCFLAGS=/&-I $(shell ocamlfind query bigarray-compat) /' Makefile
# Don't try to update the system ld.conf
sed -i 's|-add ctypes|& -ldconf %{buildroot}%{_libdir}/ocaml/ld.conf|' Makefile
sed -i 's/ "-cclib"; "-Wl,--no-as-needed";//' src/ctypes-foreign/config/discover.ml
%build
# Fixing test build dependencies.
sed -i -e "s/ounit/ounit2/" ctypes.opam
sed -i -e "s/oUnit/ounit2/" Makefile.tests
# FIXME: Infrequent build failures with parallel build
# It looks like the configuration step isn't done before its results are needed
make all XEN=disable
%make_build doc XEN=disable
%dune_build
%install
export DESTDIR=%{buildroot}%{_libdir}/ocaml
export OCAMLFIND_DESTDIR=$DESTDIR
mkdir -p $DESTDIR/stublibs
touch $DESTDIR/ld.conf
make install XEN=disable
rm $DESTDIR/ld.conf
# We install the documentation elsewhere
rm $DESTDIR/ctypes/*.md
# Install the opam files
mkdir -p $DESTDIR/ctypes-foreign
cp -p ctypes-foreign.opam $DESTDIR/ctypes-foreign/opam
cp -p ctypes.opam $DESTDIR/ctypes/opam
%dune_install
%check
make test
%dune_check
%files
%files -f .ofiles
%license LICENSE
%doc CHANGES.md README.md
%dir %{_libdir}/ocaml/ctypes/
%{_libdir}/ocaml/ctypes/META
%{_libdir}/ocaml/ctypes/*.cma
%{_libdir}/ocaml/ctypes/*.cmi
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/ctypes/*.cmxs
%endif
%{_libdir}/ocaml/stublibs/dllctypes*_stubs.so
%{_libdir}/ocaml/stublibs/dllctypes*_stubs.so.owner
%files devel
%{_libdir}/ocaml/ctypes/opam
%{_libdir}/ocaml/ctypes-foreign/
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/ctypes/*.a
%{_libdir}/ocaml/ctypes/*.cmx
%{_libdir}/ocaml/ctypes/*.cmxa
%endif
%{_libdir}/ocaml/ctypes/*.cmt
%{_libdir}/ocaml/ctypes/*.cmti
%{_libdir}/ocaml/ctypes/*.h
%{_libdir}/ocaml/ctypes/*.mli
%files doc
%doc *.html *.css
%files devel -f .ofiles-devel
%changelog
* Tue Jun 04 2024 Andrew Phelps <anphel@microsoft.com> - 0.21.1-1
- Upgrade to version 0.21.1 based on Fedora 40 package (license: MIT)
- Remove doc subpackage
* Wed Sep 20 2023 Jon Slobodzian <joslobo@microsoft.com> - 0.18.0-6
- Recompile with stack-protection fixed gcc version (CVE-2023-4039)

30
SPECS/ocaml-fmt/ocaml-fmt-stdlib-shims.patch
Просмотреть файл

@ -1,30 +0,0 @@
--- a/opam
+++ b/opam
@@ -12,9 +12,7 @@ depends: [
"ocamlfind" {build}
"ocamlbuild" {build}
"topkg" {build & >= "0.9.0"}
- # Can be removed once ocaml >= 4.07
"seq"
- "stdlib-shims"
]
depopts: [ "base-unix" "cmdliner" ]
conflicts: [ "cmdliner" {< "0.9.8"} ]
--- a/pkg/META
+++ b/pkg/META
@@ -1,6 +1,6 @@
description = "OCaml Format pretty-printer combinators"
version = "%%VERSION_NUM%%"
-requires = "seq stdlib-shims"
+requires = "seq"
archive(byte) = "fmt.cma"
archive(native) = "fmt.cmxa"
plugin(byte) = "fmt.cma"
--- a/_tags
+++ b/_tags
@@ -1,4 +1,4 @@
-true : bin_annot, safe_string, package(seq), package(stdlib-shims)
+true : bin_annot, safe_string, package(seq)
<_b0> : -traverse
<src> : include
<src/fmt_tty*> : package(unix)

2
SPECS/ocaml-fmt/ocaml-fmt.signatures.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"fmt-0.8.9.tar.gz": "24d6035578b0cb3c34cb2bf51e1f140b805e236f274b2c7d756df2f8980b950b"
"fmt-0.9.0.tar.gz": "af0906f0665e76be69992c1a556c5ffc2f79d88d3ba6115d6abf21c0909c378c"
}
}

11
SPECS/ocaml-fmt/ocaml-fmt.spec
Просмотреть файл

@ -6,17 +6,13 @@
Summary: OCaml Format pretty-printer combinators
Name: ocaml-%{srcname}
Version: 0.8.9
Release: 4%{?dist}
Version: 0.9.0
Release: 1%{?dist}
License: ISC
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://erratique.ch/software/fmt
Source0: https://github.com/dbuenzli/fmt/archive/v%{version}/%{srcname}-%{version}.tar.gz
# We neither need nor want the stdlib-shims package. It is a forward
# compatibility package for older OCaml installations. Patch it out instead.
# Upstream does not want this patch until stdlib-shims is obsolete.
Patch0: %{name}-stdlib-shims.patch
BuildRequires: ocaml >= 4.05.0
BuildRequires: ocaml-cmdliner-devel >= 0.9.8
@ -105,6 +101,9 @@ ocaml pkg/pkg.ml test
%{_libdir}/ocaml/%{srcname}/%{srcname}*.mli
%changelog
* Tue Jun 04 2024 Andrew Phelps <anphel@microsoft.com> - 0.9.0-1
- Upgrade to version 0.9.0
* Thu Mar 31 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.8.9-4
- Cleaning-up spec. License verified.

18
SPECS/ocaml-integers/ocaml-integers-stdlib-shims.patch Normal file
Просмотреть файл

@ -0,0 +1,18 @@
--- a/integers.opam 2022-02-05 11:56:40.000000000 -0700
+++ b/integers.opam 2022-02-17 20:30:13.353325774 -0700
@@ -18,7 +18,6 @@ build: [
depends: [
"ocaml" {>= "4.02"}
"dune" {>= "1.0"}
- "stdlib-shims"
]
synopsis: "Various signed and unsigned integer types for OCaml"
--- a/src/dune 2022-02-05 11:56:40.000000000 -0700
+++ b/src/dune 2022-02-17 20:30:25.009327803 -0700
@@ -4,5 +4,4 @@
(wrapped false)
(install_c_headers ocaml_integers)
(c_names unsigned_stubs)
- (libraries stdlib-shims)
(synopsis "Signed and unsigned integers of various sizes"))

2
SPECS/ocaml-integers/ocaml-integers.signatures.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"ocaml-integers-0.4.0.tar.gz": "ba6e087606c622533ecca9dc4c0917a3cc183e73e3e7d8511b68e21183ef913f"
"ocaml-integers-0.7.0.tar.gz": "8bb517fa9a1818246eb8c4ce34ee1489fbebb4b92defa3a25d13cab8d23ec685"
}
}

10
SPECS/ocaml-integers/ocaml-integers.spec
Просмотреть файл

@ -2,13 +2,14 @@
Summary: Various signed and unsigned integer types for OCaml
Name: ocaml-integers
Version: 0.4.0
Release: 3%{?dist}
Version: 0.7.0
Release: 1%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://github.com/ocamllabs/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: ocaml-integers-stdlib-shims.patch
BuildRequires: ocaml >= 4.02
BuildRequires: ocaml-dune
@ -43,7 +44,7 @@ The %{name}-doc package contains developer documentation for
%endif
%prep
%autosetup
%autosetup -p1
%build
dune build %{?_smp_mflags}
@ -116,6 +117,9 @@ dune runtest
%endif
%changelog
* Tue Jun 04 2024 Andrew Phelps <anphel@microsoft.com> - 0.7.0-1
- Add ocaml-integers-stdlib-shims.patch
* Thu Mar 31 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.4.0-3
- Cleaning-up spec. License verified.

2
SPECS/ocaml-luv/ocaml-luv.signatures.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"luv-0.5.10.tar.gz": "174bf051334b5788ecb7bde0a712f59b3e90deb2748e45b4a36f9b16408ecf7f"
"luv-0.5.13.tar.gz": "59a616bce6581bd7ed427dd6a640ff359f2a54eedb5deb5feeb35431756c2252"
}
}

4
SPECS/ocaml-luv/ocaml-luv.spec
Просмотреть файл

@ -6,8 +6,8 @@
Summary: OCaml binding to libuv for cross-platform asynchronous I/O
Name: ocaml-%{srcname}
Version: 0.5.10
Release: 3%{?dist}
Version: 0.5.13
Release: 1%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Azure Linux

5
SPECS/ocaml-migrate-parsetree/ocaml-migrate-parsetree.signatures.json
Просмотреть файл

@ -1,5 +0,0 @@
{
"Signatures": {
"ocaml-migrate-parsetree-2.4.0.tbz": "ec49c452dc337a620556ab682bf0198bf50182550b502d8fb230a591260aa6a4"
}
}

182
SPECS/ocaml-migrate-parsetree/ocaml-migrate-parsetree.spec
Просмотреть файл

@ -1,182 +0,0 @@
Summary: Convert OCaml parsetrees between different major versions
Name: ocaml-migrate-parsetree
Version: 2.4.0
Release: 1%{?dist}
License: LGPLv2+ WITH exceptions
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://github.com/ocaml-ppx/ocaml-migrate-parsetree
Source0: https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/%{version}/%{name}-%{version}.tbz
BuildRequires: ocaml
BuildRequires: ocaml-cinaps-devel
BuildRequires: ocaml-dune
%description
This library converts between parsetrees of different OCaml versions.
For each version, there is a snapshot of the parsetree and conversion
functions to the next and/or previous version.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and signature
files for developing applications that use %{name}.
%prep
%autosetup -n %{name}-%{version}
%build
dune build %{?_smp_mflags}
%install
dune install --destdir=%{buildroot}
# These files will be installed using doc and license directives.
rm -r %{buildroot}%{_prefix}/doc
# Makes *.cmxs executable such that they will be stripped.
find %{buildroot} -name '*.cmxs' -exec chmod 0755 {} \;
%check
dune runtest
%files
%doc README.md CHANGES.md
%license LICENSE.md
%{_libdir}/ocaml/*
%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/*/{,*/}*.a
%exclude %{_libdir}/ocaml/*/{,*/}*.cmxa
%exclude %{_libdir}/ocaml/*/{,*/}*.cmx
%endif
%exclude %{_libdir}/ocaml/*/{,*/}*.ml
%exclude %{_libdir}/ocaml/*/{,*/}*.mli
%exclude %{_libdir}/ocaml/*/dune-package
%exclude %{_libdir}/ocaml/*/opam
%files devel
%doc README.md CHANGES.md
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/*/{,*/}*.a
%{_libdir}/ocaml/*/{,*/}*.cmxa
%{_libdir}/ocaml/*/{,*/}*.cmx
%endif
%{_libdir}/ocaml/*/{,*/}*.ml
%{_libdir}/ocaml/*/{,*/}*.mli
%{_libdir}/ocaml/*/dune-package
%{_libdir}/ocaml/*/opam
%changelog
* Mon Nov 06 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.4.0-1
- Auto-upgrade to 2.4.0 - Azure Linux 3.0 - package upgrades
* Thu Mar 31 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.3.0-2
- Cleaning-up spec. License verified.
* Tue Jan 18 2022 Thomas Crain <thcrain@microsoft.com> - 2.3.0-1
- Upgrade to latest upstream version
- License verified
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.1.0-2
- Initial CBL-Mariner import from Fedora 34 (license: MIT).
* Sat Feb 20 2021 Jerry James <loganjerry@gmail.com> - 2.1.0-1
- Version 2.1.0
* Tue Feb 2 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.0-3
- Bump and rebuild for updated ocaml-camomile dep (RHBZ#1923853).
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Dec 7 2020 Jerry James <loganjerry@gmail.com> - 1.8.0-1
- Version 1.8.0
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-2
- OCaml 4.11.1 rebuild
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.3-1
- Upgrade to 1.7.3 (but not 2.0.0) because of:
https://github.com/ocaml-ppx/ocaml-migrate-parsetree/pull/96
- OCaml 4.11.0 rebuild
* Mon Aug 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-7
- Bump and rebuild to fix dependencies.
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-6
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Jul 23 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-4
- Rebuild to resolve build order symbol problems.
* Tue May 05 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-3
- OCaml 4.11.0+dev2-2020-04-22 rebuild
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.7.1-2
- OCaml 4.11.0 pre-release attempt 2
* Thu Apr 16 2020 Jerry James <loganjerry@gmail.com> - 1.7.1-1
- Version 1.7.1
* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-6
- Update all OCaml dependencies for RPM 4.16.
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-5
- OCaml 4.10.0 final.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-3
- Bump release and rebuild.
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.5.0-2
- OCaml 4.10.0+beta1 rebuild.
* Mon Dec 23 2019 Andy Li <andy@onthewings.net> - 1.5.0-1
- New upstream release (RHBZ#1772588).
- Remove unneeded BuildRequires on opam-installer.
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-3
- OCaml 4.08.1 (final) rebuild.
* Thu Aug 01 2019 Richard W.M. Jones <rjones@redhat.com> - 1.4.0-2
- OCaml 4.08.1 (rc2) rebuild.
* Mon Jul 29 2019 Andy Li <andy@onthewings.net> - 1.4.0-1
- New upstream release.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Jun 16 2019 Andy Li <andy@onthewings.net> - 1.3.1-1
- New upstream release (RHBZ#1707889).
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Dec 14 2018 Andy Li <andy@onthewings.net> - 1.1.0-1
- New upstream release.
* Wed Aug 01 2018 Andy Li <andy@onthewings.net> - 1.0.11-1
- New upstream release (RHBZ#1588241).
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon May 14 2018 Andy Li <andy@onthewings.net> - 1.0.10-1
- New upstream release (RHBZ#1564343).
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Tue Jan 02 2018 Andy Li <andy@onthewings.net> - 1.0.7-1
- Initial RPM release.

2
SPECS/ocaml-stdio/ocaml-stdio.signatures.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"stdio-0.15.0.tar.gz": "7fa9b91d9045cb2c8d6588f8bd01d9893456ab2bfeb9a99499ab887d9947f5b4"
"stdio-0.17.0.tar.gz": "e7cb473d4bffcf419f307c658cf2599fab03a2b4fe655bfd0be699f8f7af176e"
}
}

7
SPECS/ocaml-stdio/ocaml-stdio.spec
Просмотреть файл

@ -8,8 +8,8 @@
Summary: Jane Street Standard I/O library for OCaml
Name: ocaml-%{srcname}
Version: 0.15.0
Release: 2%{?dist}
Version: 0.17.0
Release: 1%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Azure Linux
@ -107,6 +107,9 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+
%endif
%changelog
* Tue Jun 04 2024 Andrew Phelps <anphel@microsoft.com> - 0.17.0-1
- Upgrade to version 0.17.0
* Thu Mar 31 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.15.0-2
- Cleaning-up spec. License verified.

5
SPECS/ocaml-uuidm/ocaml-uuidm.signatures.json
Просмотреть файл

@ -1,5 +0,0 @@
{
"Signatures": {
"uuidm-0.9.7.tar.gz": "b344db0cd89cebb1f346397c18d51efb01ec72dea99a42454cbe7b760956dbcb"
}
}

146
SPECS/ocaml-uuidm/ocaml-uuidm.spec
Просмотреть файл

@ -1,146 +0,0 @@
%global srcname uuidm
%ifnarch %{ocaml_native_compiler}
%global debug_package %{nil}
%endif
Summary: Universally unique identifiers (UUIDs) for OCaml
Name: ocaml-%{srcname}
Version: 0.9.7
Release: 15%{?dist}
License: ISC
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://erratique.ch/software/uuidm
Source0: https://github.com/dbuenzli/uuidm/archive/v%{version}/%{srcname}-%{version}.tar.gz
BuildRequires: ocaml >= 4.03.0
BuildRequires: ocaml-cmdliner-devel
BuildRequires: ocaml-findlib
BuildRequires: ocaml-ocamlbuild
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-topkg-devel
%description
Uuidm is an OCaml module implementing 128 bit universally unique
identifiers, versions 3, 5 (named based with MD5, SHA-1 hashing) and 4
(random based); see RFC 4122: http://tools.ietf.org/html/rfc4122.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.
%prep
%autosetup -n %{srcname}-%{version}
# The META file mistakenly uses the wrong version tag
sed -i 's/VERSION/VERSION_NUM/' pkg/META
# Topkg does watermark replacements only if run inside a git checkout. Github
# tarballs do not come with a .git directory. Therefore, we do the watermark
# replacement manually.
for fil in $(find . -type f); do
sed -e 's,%%%%NAME%%%%,%{srcname},' \
-e 's,%%%%PKG_HOMEPAGE%%%%,%{url},' \
-e 's,%%%%VERSION%%%%,v%{version},' \
-e 's,%%%%VERSION_NUM%%%%,%{version},' \
-i.orig $fil
touch -r $fil.orig $fil
rm $fil.orig
done
%build
# Build the library and the tests
ocaml pkg/pkg.ml build --tests true --with-cmdliner true
# Build the documentation
mkdir html
ocamldoc -html -d html -I _build/src _build/src/uuidm.mli
%install
# Install the library
mkdir -p %{buildroot}%{_libdir}/ocaml/uuidm
cp -p _build/{opam,pkg/META} %{buildroot}%{_libdir}/ocaml/uuidm
%ifarch %{ocaml_native_compiler}
cp -a _build/src/*.{a,cma,cmi,cmt,cmti,cmx,cmxa,cmxs,mli} \
%{buildroot}%{_libdir}/ocaml/uuidm
%else
cp -a _build/src/*.{cma,cmi,cmt,cmti,mli} %{buildroot}%{_libdir}/ocaml/uuidm
%endif
%check
ocaml pkg/pkg.ml test
%files
%doc CHANGES.md README.md
%license LICENSE.md
%dir %{_libdir}/ocaml/%{srcname}/
%{_libdir}/ocaml/%{srcname}/META
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cma
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmi
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxs
%endif
%files devel
%doc html/*
%{_libdir}/ocaml/%{srcname}/opam
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/%{srcname}/%{srcname}*.a
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmx
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxa
%endif
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmt
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmti
%{_libdir}/ocaml/%{srcname}/%{srcname}*.mli
%changelog
* Thu Mar 31 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.9.7-15
- Cleaning-up spec. License verified.
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.9.7-14
- Initial CBL-Mariner import from Fedora 34 (license: MIT).
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 0.9.7-12
- OCaml 4.11.1 rebuild
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 0.9.7-11
- OCaml 4.11.0 rebuild
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-10
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 05 2020 Richard W.M. Jones <rjones@redhat.com> - 0.9.7-8
- OCaml 4.11.0+dev2-2020-04-22 rebuild
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 0.9.7-7
- OCaml 4.11.0 pre-release attempt 2
* Sat Apr 18 2020 Richard W.M. Jones <rjones@redhat.com> - 0.9.7-6
- OCaml 4.11.0 pre-release
* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 0.9.7-5
- Update all OCaml dependencies for RPM 4.16.
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 0.9.7-4
- OCaml 4.10.0 final.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 0.9.7-2
- OCaml 4.10.0+beta1 rebuild.
* Thu Jan 9 2020 Jerry James <loganjerry@gmail.com> - 0.9.7-1
- Initial RPM

28
SPECS/ocaml-uutf/ocaml-uutf-uchar.patch
Просмотреть файл

@ -1,28 +0,0 @@
--- a/opam
+++ b/opam
@@ -12,7 +12,6 @@ depends: [
"ocamlfind" {build}
"ocamlbuild" {build}
"topkg" {build}
- "uchar"
]
depopts: ["cmdliner"]
conflicts: ["cmdliner" { < "0.9.6"} ]
--- a/pkg/META
+++ b/pkg/META
@@ -1,6 +1,6 @@
version = "%%VERSION_NUM%%"
description = "Non-blocking streaming Unicode codec for OCaml"
-requires = "bytes uchar"
+requires = "bytes"
archive(byte) = "uutf.cma"
archive(native) = "uutf.cmxa"
plugin(byte) = "uutf.cma"
--- a/_tags
+++ b/_tags
@@ -1,4 +1,4 @@
-true : bin_annot, safe_string, package(bytes), package(uchar)
+true : bin_annot, safe_string, package(bytes)
<src> : include

2
SPECS/ocaml-uutf/ocaml-uutf.signatures.json
Просмотреть файл

@ -1,5 +1,5 @@
{
"Signatures": {
"uutf-1.0.2.tar.gz": "16981ddb98589ac6a3407c9ac1d0b98eb99bee39c6954d021ab39df33ff23dd5"
"uutf-1.0.3.tar.gz": "bfa4cbfef0e585e4113f32c0ccc70df9d8da3ae45ca91ea4a50e2b9ca0b44094"
}
}

11
SPECS/ocaml-uutf/ocaml-uutf.spec
Просмотреть файл

@ -6,17 +6,13 @@
Summary: Non-blocking streaming Unicode codec for OCaml
Name: ocaml-%{srcname}
Version: 1.0.2
Release: 15%{?dist}
Version: 1.0.3
Release: 1%{?dist}
License: ISC
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://erratique.ch/software/uutf
Source0: https://github.com/dbuenzli/uutf/archive/v%{version}/%{srcname}-%{version}.tar.gz
# The uchar package is a forward compatibility package for OCaml versions prior
# to 4.03. We have a later OCaml in Mariner; uchar is in the standard library.
# Therefore, remove references to the compatibility package.
Patch0: %{name}-uchar.patch
BuildRequires: ocaml >= 4.01.0
BuildRequires: ocaml-cmdliner-devel >= 0.9.6
@ -106,6 +102,9 @@ ocaml pkg/pkg.ml test
%{_libdir}/ocaml/%{srcname}/%{srcname}*.mli
%changelog
* Tue Jun 04 2024 Andrew Phelps <anphel@microsoft.com> - 1.0.3-1
- Upgrade to version 1.0.3
* Thu Mar 31 2022 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.0.2-15
- Cleaning-up spec. License verified.

52
cgmanifest.json
Просмотреть файл

@ -14372,8 +14372,8 @@
"type": "other",
"other": {
"name": "ocaml-alcotest",
"version": "1.3.0",
"downloadUrl": "https://github.com/mirage/alcotest/archive/1.3.0.tar.gz"
"version": "1.5.0",
"downloadUrl": "https://github.com/mirage/alcotest/archive/1.5.0.tar.gz"
}
}
},
@ -14422,8 +14422,8 @@
"type": "other",
"other": {
"name": "ocaml-bisect-ppx",
"version": "2.6.3",
"downloadUrl": "https://github.com/aantron/bisect_ppx/archive/2.6.3/bisect_ppx-2.6.3.tar.gz"
"version": "2.8.3",
"downloadUrl": "https://github.com/aantron/bisect_ppx/archive/2.8.3/bisect_ppx-2.8.3.tar.gz"
}
}
},
@ -14532,8 +14532,8 @@
"type": "other",
"other": {
"name": "ocaml-ctypes",
"version": "0.18.0",
"downloadUrl": "https://github.com/ocamllabs/ocaml-ctypes/archive/0.18.0/ocaml-ctypes-0.18.0.tar.gz"
"version": "0.21.1",
"downloadUrl": "https://github.com/ocamllabs/ocaml-ctypes/archive/0.21.1/ocaml-ctypes-0.21.1.tar.gz"
}
}
},
@ -14592,8 +14592,8 @@
"type": "other",
"other": {
"name": "ocaml-fmt",
"version": "0.8.9",
"downloadUrl": "https://github.com/dbuenzli/fmt/archive/v0.8.9/fmt-0.8.9.tar.gz"
"version": "0.9.0",
"downloadUrl": "https://github.com/dbuenzli/fmt/archive/v0.9.0/fmt-0.9.0.tar.gz"
}
}
},
@ -14622,8 +14622,8 @@
"type": "other",
"other": {
"name": "ocaml-integers",
"version": "0.4.0",
"downloadUrl": "https://github.com/ocamllabs/ocaml-integers/archive/0.4.0/ocaml-integers-0.4.0.tar.gz"
"version": "0.7.0",
"downloadUrl": "https://github.com/ocamllabs/ocaml-integers/archive/0.7.0/ocaml-integers-0.7.0.tar.gz"
}
}
},
@ -14642,8 +14642,8 @@
"type": "other",
"other": {
"name": "ocaml-luv",
"version": "0.5.10",
"downloadUrl": "https://github.com/aantron/luv/releases/download/0.5.10/luv-0.5.10.tar.gz"
"version": "0.5.13",
"downloadUrl": "https://github.com/aantron/luv/releases/download/0.5.13/luv-0.5.13.tar.gz"
}
}
},
@ -14667,16 +14667,6 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "ocaml-migrate-parsetree",
"version": "2.4.0",
"downloadUrl": "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/2.4.0/ocaml-migrate-parsetree-2.4.0.tbz"
}
}
},
{
"component": {
"type": "other",
@ -14852,8 +14842,8 @@
"type": "other",
"other": {
"name": "ocaml-stdio",
"version": "0.15.0",
"downloadUrl": "https://github.com/janestreet/stdio/archive/v0.15.0/stdio-0.15.0.tar.gz"
"version": "0.17.0",
"downloadUrl": "https://github.com/janestreet/stdio/archive/v0.17.0/stdio-0.17.0.tar.gz"
}
}
},
@ -14887,23 +14877,13 @@
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "ocaml-uuidm",
"version": "0.9.7",
"downloadUrl": "https://github.com/dbuenzli/uuidm/archive/v0.9.7/uuidm-0.9.7.tar.gz"
}
}
},
{
"component": {
"type": "other",
"other": {
"name": "ocaml-uutf",
"version": "1.0.2",
"downloadUrl": "https://github.com/dbuenzli/uutf/archive/v1.0.2/uutf-1.0.2.tar.gz"
"version": "1.0.3",
"downloadUrl": "https://github.com/dbuenzli/uutf/archive/v1.0.3/uutf-1.0.3.tar.gz"
}
}
},