Compare commits

...

10 Commits

Author SHA1 Message Date
Richard W.M. Jones
82503be5b6 OCaml 5.2.0 for Fedora 41 2024-05-29 22:20:26 +01:00
Jerry James
3ab8c86605 Add patch to fix tests with OCaml 5.2.0 2024-05-23 12:05:28 -06:00
Fedora Release Engineering
9090b3d6bd Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 10:00:32 +00:00
Fedora Release Engineering
90824c17cb Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 10:16:52 +00:00
Richard W.M. Jones
c1c7052349 OCaml 5.1.1 + s390x code gen fix for Fedora 40 2023-12-18 15:20:07 +00:00
Richard W.M. Jones
3dac2eccaa OCaml 5.1.1 rebuild for Fedora 40 2023-12-12 15:00:38 +00:00
Richard W.M. Jones
cd788feb5b OCaml 5.1 rebuild for Fedora 40 2023-10-05 16:13:04 +01:00
Jerry James
48d8469dad Add PR URL for Patch1 2023-10-04 23:09:07 -06:00
Fedora Release Engineering
c95600ebb2 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 17:18:13 +00:00
Yaakov Selkowitz
99c808b007 Fix ELN build
* When ounit2 is not present, %check must be skipped.  Use a bcond to
keep these in sync.
* Remove the camomile OPAM file to prevent findlib from creating
gettext-camomile META files (even though the package is not built).
2023-07-13 23:26:11 -04:00
2 changed files with 47 additions and 2 deletions

View File

@ -0,0 +1,13 @@
--- ocaml-gettext-0.4.2/test/test.ml.orig 2020-06-11 14:40:42.000000000 -0600
+++ ocaml-gettext-0.4.2/test/test.ml 2024-05-07 19:56:55.742155830 -0600
@@ -278,8 +278,8 @@ let install_test =
( "test7.mo",
MoInvalidHeaderTableTranslationOutOfBound
((28l, 2626l), (-49l, 111l)) );
- ("test8.mo", MoInvalidStringOutOfBound (2626, 36));
- ("test9.mo", MoInvalidTranslationOutOfBound (2626, 196));
+ ("test8.mo", MoCannotOpenFile ("testdata/test8.mo"));
+ ("test9.mo", MoCannotOpenFile ("testdata/test9.mo"));
]
@ List.map install_warning_test_one
[

View File

@ -4,13 +4,15 @@ ExcludeArch: %{ix86}
# Optionally disable camomile dep on RHEL.
%if !0%{?rhel}
%bcond_without camomile
%bcond_without tests
%else
%bcond_with camomile
%bcond_with tests
%endif
Name: ocaml-gettext
Version: 0.4.2
Release: 13%{?dist}
Release: 20%{?dist}
Summary: OCaml library for i18n
License: LGPL-2.1-or-later with OCaml-LGPL-linking-exception
@ -22,7 +24,10 @@ Source0: https://github.com/gildor478/%{name}/archive/v%{version}.tar.gz
# https://github.com/gildor478/ocaml-gettext/pull/24
Patch0: %{name}-ocaml5.patch
# Adapt to changes in camomile 2.0
# https://github.com/gildor478/ocaml-gettext/pull/27
Patch1: %{name}-camomile2.patch
# Two tests that are supposed to fail raise different errors under OCaml 5.2.0
Patch2: %{name}-ocaml5.2.patch
BuildRequires: ocaml >= 4.03.0
BuildRequires: ocaml-fileutils-devel >= 0.4.4-4
@ -32,7 +37,7 @@ BuildRequires: ocaml-cppo
BuildRequires: docbook-style-xsl
BuildRequires: libxslt
BuildRequires: libxml2
%if !0%{?rhel}
%if %{with tests}
BuildRequires: ocaml-ounit-devel
%endif
%if %{with camomile}
@ -101,6 +106,7 @@ signature files for developing applications that use
%if %{without camomile}
# Remove dependency on camomile.
rm -f gettext-camomile.opam
rm -r src/lib/gettext-camomile
rm -r test/test-camomile
sed -i -e 's/camomile//' `find -name dune`
@ -118,8 +124,10 @@ cat .ofiles-gettext-stub >> .ofiles-gettext
cat .ofiles-gettext-stub-devel >> .ofiles-gettext-devel
%if %{with tests}
%check
%dune_check
%endif
%files -f .ofiles-gettext
@ -146,6 +154,30 @@ cat .ofiles-gettext-stub-devel >> .ofiles-gettext-devel
%changelog
* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 0.4.2-20
- OCaml 5.2.0 for Fedora 41
* Wed May 8 2024 Jerry James <loganjerry@gmail.com> - 0.4.2-19
- Add patch to fix tests with OCaml 5.2.0
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 0.4.2-17
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 0.4.2-16
- OCaml 5.1.1 rebuild for Fedora 40
* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 0.4.2-15
- OCaml 5.1 rebuild for Fedora 40
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 0.4.2-13
- OCaml 5.0 rebuild for Fedora 39