Compare commits
10 Commits
03b60fb0d3
...
82503be5b6
Author | SHA1 | Date | |
---|---|---|---|
|
82503be5b6 | ||
|
3ab8c86605 | ||
|
9090b3d6bd | ||
|
90824c17cb | ||
|
c1c7052349 | ||
|
3dac2eccaa | ||
|
cd788feb5b | ||
|
48d8469dad | ||
|
c95600ebb2 | ||
|
99c808b007 |
13
ocaml-gettext-ocaml5.2.patch
Normal file
13
ocaml-gettext-ocaml5.2.patch
Normal 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
|
||||||
|
[
|
@ -4,13 +4,15 @@ ExcludeArch: %{ix86}
|
|||||||
# Optionally disable camomile dep on RHEL.
|
# Optionally disable camomile dep on RHEL.
|
||||||
%if !0%{?rhel}
|
%if !0%{?rhel}
|
||||||
%bcond_without camomile
|
%bcond_without camomile
|
||||||
|
%bcond_without tests
|
||||||
%else
|
%else
|
||||||
%bcond_with camomile
|
%bcond_with camomile
|
||||||
|
%bcond_with tests
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: ocaml-gettext
|
Name: ocaml-gettext
|
||||||
Version: 0.4.2
|
Version: 0.4.2
|
||||||
Release: 13%{?dist}
|
Release: 20%{?dist}
|
||||||
Summary: OCaml library for i18n
|
Summary: OCaml library for i18n
|
||||||
|
|
||||||
License: LGPL-2.1-or-later with OCaml-LGPL-linking-exception
|
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
|
# https://github.com/gildor478/ocaml-gettext/pull/24
|
||||||
Patch0: %{name}-ocaml5.patch
|
Patch0: %{name}-ocaml5.patch
|
||||||
# Adapt to changes in camomile 2.0
|
# Adapt to changes in camomile 2.0
|
||||||
|
# https://github.com/gildor478/ocaml-gettext/pull/27
|
||||||
Patch1: %{name}-camomile2.patch
|
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 >= 4.03.0
|
||||||
BuildRequires: ocaml-fileutils-devel >= 0.4.4-4
|
BuildRequires: ocaml-fileutils-devel >= 0.4.4-4
|
||||||
@ -32,7 +37,7 @@ BuildRequires: ocaml-cppo
|
|||||||
BuildRequires: docbook-style-xsl
|
BuildRequires: docbook-style-xsl
|
||||||
BuildRequires: libxslt
|
BuildRequires: libxslt
|
||||||
BuildRequires: libxml2
|
BuildRequires: libxml2
|
||||||
%if !0%{?rhel}
|
%if %{with tests}
|
||||||
BuildRequires: ocaml-ounit-devel
|
BuildRequires: ocaml-ounit-devel
|
||||||
%endif
|
%endif
|
||||||
%if %{with camomile}
|
%if %{with camomile}
|
||||||
@ -101,6 +106,7 @@ signature files for developing applications that use
|
|||||||
|
|
||||||
%if %{without camomile}
|
%if %{without camomile}
|
||||||
# Remove dependency on camomile.
|
# Remove dependency on camomile.
|
||||||
|
rm -f gettext-camomile.opam
|
||||||
rm -r src/lib/gettext-camomile
|
rm -r src/lib/gettext-camomile
|
||||||
rm -r test/test-camomile
|
rm -r test/test-camomile
|
||||||
sed -i -e 's/camomile//' `find -name dune`
|
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
|
cat .ofiles-gettext-stub-devel >> .ofiles-gettext-devel
|
||||||
|
|
||||||
|
|
||||||
|
%if %{with tests}
|
||||||
%check
|
%check
|
||||||
%dune_check
|
%dune_check
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%files -f .ofiles-gettext
|
%files -f .ofiles-gettext
|
||||||
@ -146,6 +154,30 @@ cat .ofiles-gettext-stub-devel >> .ofiles-gettext-devel
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 0.4.2-13
|
||||||
- OCaml 5.0 rebuild for Fedora 39
|
- OCaml 5.0 rebuild for Fedora 39
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user