Skip to content

Commit ee8abe0

Browse files
ocaml-zarith: update to 1.14 (#11680)
1 parent 122c783 commit ee8abe0

File tree

3 files changed

+143
-42
lines changed

3 files changed

+143
-42
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"release-1.9.1.tar.gz": "49be0214f34ae05e7a83b53351f134ba73eddaf87d1abb6f61b19943c211ca5d"
3+
"release-1.14.tar.gz": "5db9dcbd939153942a08581fabd846d0f3f2b8c67fe68b855127e0472d4d1859"
44
}
55
}

SPECS-EXTENDED/ocaml-zarith/ocaml-zarith.spec

+140-39
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,34 @@ Vendor: Microsoft Corporation
22
Distribution: Azure Linux
33
%global pkgname zarith
44

5+
56
Name: ocaml-%{pkgname}
6-
Version: 1.9.1
7-
Release: 9%{?dist}
7+
Version: 1.14
8+
Release: 3%{?dist}
89
Summary: OCaml interface to GMP
910

10-
# The license has a static linking exception
11-
License: LGPLv2 with exceptions
12-
URL: https://github.com/ocaml/Zarith/
13-
Source0: https://github.com/ocaml/Zarith/archive/release-%{version}.tar.gz
11+
License: LGPL-2.1-only WITH OCaml-LGPL-linking-exception
12+
URL: https://github.com/ocaml/Zarith
13+
Source: https://github.com/ocaml/Zarith/archive/release-%{version}.tar.gz
1414

1515
BuildRequires: gcc
1616
BuildRequires: gmp-devel
17-
BuildRequires: ocaml
17+
BuildRequires: make
18+
BuildRequires: ocaml >= 4.04.0
1819
BuildRequires: ocaml-findlib
1920
BuildRequires: ocaml-ocamldoc
21+
BuildRequires: ocaml-rpm-macros
2022
BuildRequires: perl-interpreter
2123

24+
# Replace config.guess with a more up to date version which knows about POWER.
25+
BuildRequires: redhat-rpm-config
26+
27+
# Do not require ocaml-compiler-libs at runtime
28+
%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
29+
2230
%description
2331
This library implements arithmetic and logical operations over
24-
arbitrary-precision integers.
32+
arbitrary-precision integers.
2533

2634
The module is simply named "Z". Its interface is similar to that of the
2735
Int32, Int64 and Nativeint modules from the OCaml standard library, with
@@ -58,9 +66,8 @@ developing applications that use %{name}.
5866
%autosetup -n Zarith-release-%{version}
5967

6068
# Fix compilation flags
61-
sed -i "s|^ccdef=''|ccdef='%{optflags}'|" configure
62-
sed -ri "s/(-ccopt|-shared|-failsafe)/-g &/" project.mak
63-
sed -i "s/+compiler-libs/& -g/;s/\(\$(OCAMLC)\) -o/\1 -g -o/" project.mak
69+
sed -i "s|^ccdef=''|ccdef='%{build_cflags}'|" configure
70+
sed -i "s/-shared/-g &/" project.mak
6471

6572
%build
6673
export CC="gcc"
@@ -71,47 +78,141 @@ make
7178
make doc
7279

7380
%install
74-
mkdir -p %{buildroot}%{_libdir}/ocaml/stublibs
75-
make install INSTALLDIR=%{buildroot}%{_libdir}/ocaml
81+
mkdir -p %{buildroot}%{ocamldir}/stublibs
82+
make install INSTALLDIR=%{buildroot}%{ocamldir}
7683

84+
# Install missing files
85+
cp -p {big_int_Z,q,z}.cmt zarith_version.cm{i,t} zarith_top.{cm{i,t},ml} \
86+
z_mlgmpidl.mli %{buildroot}%{ocamldir}/zarith
87+
cp -p zarith.opam %{buildroot}%{ocamldir}/zarith/opam
88+
89+
%ocaml_files
90+
91+
%ifarch %{ocaml_native_compiler}
92+
# The tests assume the availability of ocamlopt
7793
%check
7894
export LD_LIBRARY_PATH=$PWD
7995
make tests
96+
%endif
8097

81-
%files
98+
%files -f .ofiles
8299
%doc README.md
83100
%license LICENSE
84-
%{_libdir}/ocaml/%{pkgname}/
85-
%ifarch %{ocaml_native_compiler}
86-
%exclude %{_libdir}/ocaml/%{pkgname}/*.a
87-
%exclude %{_libdir}/ocaml/%{pkgname}/*.cmx
88-
%exclude %{_libdir}/ocaml/%{pkgname}/*.cmxa
89-
%endif
90-
%exclude %{_libdir}/ocaml/%{pkgname}/*.mli
91-
%exclude %{_libdir}/ocaml/%{pkgname}/*.h
92-
%{_libdir}/ocaml/stublibs/*.so
93-
%{_libdir}/ocaml/stublibs/*.so.owner
94101

95-
%files devel
102+
%files devel -f .ofiles-devel
96103
%doc Changes html
97-
%ifarch %{ocaml_native_compiler}
98-
%{_libdir}/ocaml/%{pkgname}/*.a
99-
%{_libdir}/ocaml/%{pkgname}/*.cmx
100-
%{_libdir}/ocaml/%{pkgname}/*.cmxa
101-
%endif
102-
%{_libdir}/ocaml/%{pkgname}/*.mli
103-
%{_libdir}/ocaml/%{pkgname}/*.h
104104

105105
%changelog
106-
* Thu Oct 14 2021 Pawel Winogrodzki <[email protected]> - 1.9.1-9
107-
- Switching to using full number for the 'Release' tag.
106+
* Fri Jan 03 2025 Durga Jagadeesh Palli <[email protected]> - 1.14-3
107+
- Initial Azure Linux import from Fedora 41 (license: MIT)
108+
- License verified
109+
110+
* Thu Jul 18 2024 Fedora Release Engineering <[email protected]> - 1.14-2
111+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
112+
113+
* Tue Jul 16 2024 Jerry James <[email protected]> - 1.14-1
114+
- Version 1.14
115+
116+
* Wed Jun 19 2024 Richard W.M. Jones <[email protected]> - 1.13-8
117+
- OCaml 5.2.0 ppc64le fix
118+
119+
* Wed May 29 2024 Richard W.M. Jones <[email protected]> - 1.13-7
120+
- OCaml 5.2.0 for Fedora 41
121+
122+
* Thu Jan 25 2024 Fedora Release Engineering <[email protected]> - 1.13-6
123+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
124+
125+
* Sun Jan 21 2024 Fedora Release Engineering <[email protected]> - 1.13-5
126+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
127+
128+
* Mon Dec 18 2023 Richard W.M. Jones <[email protected]> - 1.13-4
129+
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
130+
131+
* Tue Dec 12 2023 Richard W.M. Jones <[email protected]> - 1.13-3
132+
- OCaml 5.1.1 rebuild for Fedora 40
133+
134+
* Thu Oct 05 2023 Richard W.M. Jones <[email protected]> - 1.13-2
135+
- OCaml 5.1 rebuild for Fedora 40
136+
137+
* Thu Jul 27 2023 Jerry James <[email protected]> - 1.13-1
138+
- Version 1.13
139+
140+
* Thu Jul 20 2023 Fedora Release Engineering <[email protected]> - 1.12-12
141+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
142+
143+
* Tue Jul 11 2023 Richard W.M. Jones <[email protected]> - 1.12-11
144+
- OCaml 5.0 rebuild for Fedora 39
145+
146+
* Mon Jul 10 2023 Jerry James <[email protected]> - 1.12-10
147+
- OCaml 5.0.0 rebuild
148+
- Install missing files
149+
- Do not require ocaml-compiler-libs at runtime
150+
151+
* Tue Jan 24 2023 Richard W.M. Jones <[email protected]> - 1.12-9
152+
- Rebuild OCaml packages for F38
153+
154+
* Thu Jan 19 2023 Fedora Release Engineering <[email protected]> - 1.12-8
155+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
156+
157+
* Mon Dec 12 2022 Jerry James <[email protected]> - 1.12-7
158+
- Convert License tag to SPDX
159+
160+
* Fri Jul 22 2022 Fedora Release Engineering <[email protected]> - 1.12-7
161+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
162+
163+
* Wed Jul 20 2022 Jerry James <[email protected]> - 1.12-6
164+
- Use new OCaml macros
165+
166+
* Sat Jun 18 2022 Richard W.M. Jones <[email protected]> - 1.12-6
167+
- OCaml 4.14.0 rebuild
168+
169+
* Fri Feb 04 2022 Richard W.M. Jones <[email protected]> - 1.12-5
170+
- OCaml 4.13.1 rebuild to remove package notes
171+
172+
* Thu Jan 20 2022 Fedora Release Engineering <[email protected]> - 1.12-4
173+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
174+
175+
* Mon Oct 04 2021 Richard W.M. Jones <[email protected]> - 1.12-3
176+
- OCaml 4.13.1 build
177+
178+
* Thu Jul 22 2021 Fedora Release Engineering <[email protected]> - 1.12-2
179+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
180+
181+
* Wed Mar 3 2021 Jerry James <[email protected]> - 1.12-1
182+
- Version 1.12
183+
184+
* Mon Mar 1 13:12:07 GMT 2021 Richard W.M. Jones <[email protected]> - 1.11-3
185+
- OCaml 4.12.0 build
186+
187+
* Tue Jan 26 2021 Fedora Release Engineering <[email protected]> - 1.11-2
188+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
189+
190+
* Mon Nov 16 2020 Jerry James <[email protected]> - 1.11-1
191+
- Version 1.11
192+
193+
* Sun Sep 13 2020 Dan Čermák <[email protected]> - 1.10-1
194+
- New upstream release 1.10
195+
196+
* Tue Sep 01 2020 Richard W.M. Jones <[email protected]> - 1.9.1-14
197+
- OCaml 4.11.1 rebuild
198+
199+
* Fri Aug 21 2020 Richard W.M. Jones <[email protected]> - 1.9.1-13
200+
- OCaml 4.11.0 rebuild
201+
202+
* Tue Jul 28 2020 Fedora Release Engineering <[email protected]> - 1.9.1-12
203+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
204+
205+
* Mon May 04 2020 Richard W.M. Jones <[email protected]> - 1.9.1-11
206+
- OCaml 4.11.0+dev2-2020-04-22 rebuild
207+
208+
* Tue Apr 21 2020 Richard W.M. Jones <[email protected]> - 1.9.1-10
209+
- OCaml 4.11.0 pre-release attempt 2
108210

109-
* Mon Jan 04 2021 Joe Schmitt <[email protected]> - 1.9.1-8.1
110-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
111-
- Remove Red Hat guess file
211+
* Fri Apr 17 2020 Richard W.M. Jones <[email protected]> - 1.9.1-9
212+
- OCaml 4.11.0 pre-release
112213

113-
* Thu Feb 27 2020 Richard W.M. Jones <[email protected]> - 1.9.1-7.1
114-
- OCaml 4.10.0 final (Fedora 32).
214+
* Thu Apr 02 2020 Richard W.M. Jones <[email protected]> - 1.9.1-8
215+
- Update all OCaml dependencies for RPM 4.16.
115216

116217
* Wed Feb 26 2020 Richard W.M. Jones <[email protected]> - 1.9.1-7
117218
- OCaml 4.10.0 final.

cgmanifest.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15072,8 +15072,8 @@
1507215072
"type": "other",
1507315073
"other": {
1507415074
"name": "ocaml-zarith",
15075-
"version": "1.9.1",
15076-
"downloadUrl": "https://github.com/ocaml/Zarith/archive/release-1.9.1.tar.gz"
15075+
"version": "1.14",
15076+
"downloadUrl": "https://github.com/ocaml/Zarith/archive/release-1.14.tar.gz"
1507715077
}
1507815078
}
1507915079
},

0 commit comments

Comments
 (0)