diff --git a/.gitignore b/.gitignore index 8fe92f1..0c74f98 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ ocaml-gettext-0.3.3.tar.gz /0.3.7.tar.gz /ocaml-gettext-0.3.8-3aecf8e5350f.tar.gz /v0.4.1.tar.gz -/v0.4.2.tar.gz -/v0.5.0.tar.gz diff --git a/0001-xgettext-Fix-type-for-OCaml-5.4.patch b/0001-xgettext-Fix-type-for-OCaml-5.4.patch deleted file mode 100644 index dd3f5ee..0000000 --- a/0001-xgettext-Fix-type-for-OCaml-5.4.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5d521981e39dcaeada6bbe7b15c5432d6de5d33c Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 15 Oct 2025 09:24:18 +0100 -Subject: [PATCH] xgettext: Fix type for OCaml 5.4 - -Fixes: https://github.com/gildor478/ocaml-gettext/issues/40 -Signed-off-by: Richard W.M. Jones ---- - src/bin/ocaml-xgettext/xgettext.ml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bin/ocaml-xgettext/xgettext.ml b/src/bin/ocaml-xgettext/xgettext.ml -index 8f54efc..aa12aed 100644 ---- a/src/bin/ocaml-xgettext/xgettext.ml -+++ b/src/bin/ocaml-xgettext/xgettext.ml -@@ -112,7 +112,7 @@ let rec is_like lid = function - | [] -> false - | func :: functions -> ( - match lid with -- | (Lident f | Ldot (_, f)) when f = func -> true -+ | (Lident f | Ldot (_, {txt = f; _})) when f = func -> true - | _ -> is_like lid functions ) - - let visit_expr (iterator : Ast_iterator.iterator) expr = --- -2.50.1 - diff --git a/0001-xgettext-Ignore-extra-Loc.t-parameter-of-Pconst_stri.patch b/0001-xgettext-Ignore-extra-Loc.t-parameter-of-Pconst_stri.patch new file mode 100644 index 0000000..54e7579 --- /dev/null +++ b/0001-xgettext-Ignore-extra-Loc.t-parameter-of-Pconst_stri.patch @@ -0,0 +1,86 @@ +From 4bd5f21dd6b033bf8c0f1f9549255629325b86eb Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 22 Apr 2020 10:17:03 +0100 +Subject: [PATCH] xgettext: Ignore extra Loc.t parameter of Pconst_string. + +--- + src/bin/ocaml-xgettext/xgettext.ml | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/bin/ocaml-xgettext/xgettext.ml b/src/bin/ocaml-xgettext/xgettext.ml +index 3b42ac1..92ab016 100644 +--- a/src/bin/ocaml-xgettext/xgettext.ml ++++ b/src/bin/ocaml-xgettext/xgettext.ml +@@ -121,7 +121,7 @@ let visit_expr (iterator : Ast_iterator.iterator) expr = + | Pexp_apply + ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, + ( Asttypes.Nolabel, +- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } ) ++ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } ) + :: _ ) + when is_like lid [ "s_"; "f_" ] -> + (* Add a singular / default domain string *) +@@ -129,9 +129,9 @@ let visit_expr (iterator : Ast_iterator.iterator) expr = + | Pexp_apply + ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, + ( Asttypes.Nolabel, +- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } ) ++ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } ) + :: ( Asttypes.Nolabel, +- { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ } ) ++ { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ } ) + :: _ ) + when is_like lid [ "sn_"; "fn_" ] -> + (* Add a plural / default domain string *) +@@ -140,7 +140,7 @@ let visit_expr (iterator : Ast_iterator.iterator) expr = + ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, + _ + :: ( Asttypes.Nolabel, +- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } ) ++ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } ) + :: _ ) + when is_like lid [ "gettext"; "fgettext" ] -> + (* Add a singular / default domain string *) +@@ -149,9 +149,9 @@ let visit_expr (iterator : Ast_iterator.iterator) expr = + ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, + _ + :: ( Asttypes.Nolabel, +- { pexp_desc = Pexp_constant (Pconst_string (domain, _)); _ } ) ++ { pexp_desc = Pexp_constant (Pconst_string (domain, _, _)); _ } ) + :: ( Asttypes.Nolabel, +- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } ++ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } + ) + :: _ ) + when is_like lid [ "dgettext"; "fdgettext"; "dcgettext"; "fdcgettext" ] -> +@@ -161,9 +161,9 @@ let visit_expr (iterator : Ast_iterator.iterator) expr = + ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, + _ + :: ( Asttypes.Nolabel, +- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } ) ++ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } ) + :: ( Asttypes.Nolabel, +- { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ } ) ++ { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ } ) + :: _ ) + when is_like lid [ "ngettext"; "fngettext" ] -> + (* Add a plural / default domain string *) +@@ -172,12 +172,12 @@ let visit_expr (iterator : Ast_iterator.iterator) expr = + ( { pexp_desc = Pexp_ident { Asttypes.txt = lid; _ }; _ }, + _ + :: ( Asttypes.Nolabel, +- { pexp_desc = Pexp_constant (Pconst_string (domain, _)); _ } ) ++ { pexp_desc = Pexp_constant (Pconst_string (domain, _, _)); _ } ) + :: ( Asttypes.Nolabel, +- { pexp_desc = Pexp_constant (Pconst_string (singular, _)); _ } ++ { pexp_desc = Pexp_constant (Pconst_string (singular, _, _)); _ } + ) + :: ( Asttypes.Nolabel, +- { pexp_desc = Pexp_constant (Pconst_string (plural, _)); _ } ++ { pexp_desc = Pexp_constant (Pconst_string (plural, _, _)); _ } + ) + :: _ ) + when is_like lid [ "dngettext"; "fdngettext"; "dcngettext"; "fdcngettext" ] +-- +2.24.1 + diff --git a/37.patch b/37.patch deleted file mode 100644 index 2616f40..0000000 --- a/37.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 5462396bee53cb13d8d6fde4c6d430412a17b64d Mon Sep 17 00:00:00 2001 -From: Stephane Glondu -Date: Thu, 3 Apr 2025 09:52:20 +0200 -Subject: [PATCH] Do not use dune sites - -Using dune-site forces use of dune in all reverse-dependencies: - - https://github.com/gildor478/ocaml-gettext/issues/36 - -The use here is to add an ocaml-gettext-specific directory to the -default MO search path. Remove this directory altogether. (This may -break reverse dependencies.) ---- - dune-project | 2 -- - gettext-camomile.opam | 2 -- - gettext-stub.opam | 2 -- - gettext.opam | 3 --- - src/lib/gettext/base/.keep-directory | 1 - - src/lib/gettext/base/dune | 13 +------------ - src/lib/gettext/base/gettextConfig.ml | 9 +-------- - 7 files changed, 2 insertions(+), 30 deletions(-) - delete mode 100644 src/lib/gettext/base/.keep-directory - -diff --git a/dune-project b/dune-project -index 2ee85d7..ef2b58e 100644 ---- a/dune-project -+++ b/dune-project -@@ -2,7 +2,6 @@ - (name gettext) - - (explicit_js_mode) --(using dune_site 0.1) - (generate_opam_files) - - (source (github gildor478/ocaml-gettext)) -@@ -25,7 +24,6 @@ - "\| - ) - (depends -- dune-site - (ocaml (>= "4.14.0")) - (cppo (and (>= 1.8.0) :build)) - (seq (and (>= "base") :with-test)) -diff --git a/gettext-camomile.opam b/gettext-camomile.opam -index 1fde721..05c96d1 100644 ---- a/gettext-camomile.opam -+++ b/gettext-camomile.opam -@@ -25,11 +25,9 @@ build: [ - name - "-j" - jobs -- "--promote-install-files=false" - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -- ["dune" "install" "-p" name "--create-install-files" name] - ] - dev-repo: "git+https://github.com/gildor478/ocaml-gettext.git" -diff --git a/gettext-stub.opam b/gettext-stub.opam -index 2463a70..980a584 100644 ---- a/gettext-stub.opam -+++ b/gettext-stub.opam -@@ -24,12 +24,10 @@ build: [ - name - "-j" - jobs -- "--promote-install-files=false" - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -- ["dune" "install" "-p" name "--create-install-files" name] - ] - dev-repo: "git+https://github.com/gildor478/ocaml-gettext.git" - depexts: [ -diff --git a/gettext.opam b/gettext.opam -index 50a0933..d2f6490 100644 ---- a/gettext.opam -+++ b/gettext.opam -@@ -19,7 +19,6 @@ doc: "https://gildor478.github.io/ocaml-gettext/" - bug-reports: "https://github.com/gildor478/ocaml-gettext/issues" - depends: [ - "dune" {>= "3.17"} -- "dune-site" - "ocaml" {>= "4.14.0"} - "cppo" {>= "1.8.0" & build} - "seq" {>= "base" & with-test} -@@ -36,11 +35,9 @@ build: [ - name - "-j" - jobs -- "--promote-install-files=false" - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -- ["dune" "install" "-p" name "--create-install-files" name] - ] - dev-repo: "git+https://github.com/gildor478/ocaml-gettext.git" -diff --git a/src/lib/gettext/base/.keep-directory b/src/lib/gettext/base/.keep-directory -deleted file mode 100644 -index f1eab5f..0000000 ---- a/src/lib/gettext/base/.keep-directory -+++ /dev/null -@@ -1 +0,0 @@ --# This directory contains MO files. -diff --git a/src/lib/gettext/base/dune b/src/lib/gettext/base/dune -index 2eae0c5..7b98bb7 100644 ---- a/src/lib/gettext/base/dune -+++ b/src/lib/gettext/base/dune -@@ -4,17 +4,6 @@ - (ocamlyacc - (modules gettextFormat_parser gettextMo_parser)) - --(generate_sites_module -- (module gettextConfigDune) -- (sites gettext)) -- --(install -- (package gettext) -- (section -- (site -- (gettext locale))) -- (files .keep-directory)) -- - (rule - (target gettextConfigGen.ml) - (action -@@ -33,4 +22,4 @@ - GettextMo_int32 - GettextMo_lexer - GettextMo_parser) -- (libraries dune-site fileutils)) -+ (libraries fileutils)) -diff --git a/src/lib/gettext/base/gettextConfig.ml b/src/lib/gettext/base/gettextConfig.ml -index 9d5d986..fe8963b 100644 ---- a/src/lib/gettext/base/gettextConfig.ml -+++ b/src/lib/gettext/base/gettextConfig.ml -@@ -23,19 +23,12 @@ - let default_dir = GettextConfigGen.default_localedir - - let default_path () = -- let dunepath = -- match GettextConfigDune.Sites.locale with -- | [ path ] -> [ path ] -- | [] -> [] -- | _ -> assert false -- in - let envpath = - match Sys.getenv "OCAML_LOCALEPATH" with - | s -> String.split_on_char ':' s - | exception Not_found -> [] - in -- envpath @ dunepath -- @ [ GettextConfigGen.localedir; GettextConfigGen.default_localedir ] -+ envpath @ [ GettextConfigGen.localedir; GettextConfigGen.default_localedir ] - - let default_codeset = "" - diff --git a/gating.yaml b/gating.yaml deleted file mode 100755 index 2c7ed80..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-* -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec index 5a2eca2..a6da2f3 100644 --- a/ocaml-gettext.spec +++ b/ocaml-gettext.spec @@ -1,61 +1,45 @@ -# OCaml packages not built on i686 since OCaml 5 / Fedora 39. -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 +%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) Name: ocaml-gettext -Version: 0.5.0 -Release: 7%{?dist} +Version: 0.4.1 +Release: 5%{?dist}.1 Summary: OCaml library for i18n -License: LGPL-2.1-or-later with OCaml-LGPL-linking-exception +License: LGPLv2+ with exceptions URL: https://github.com/gildor478/ocaml-gettext -VCS: git:%{url}.git -Source0: %{url}/archive/v%{version}.tar.gz +Source0: https://github.com/gildor478/%{name}/archive/v%{version}.tar.gz -# Fix to stop using dune-site -# https://github.com/gildor478/ocaml-gettext/issues/36 -# https://github.com/gildor478/ocaml-gettext/pull/37 -Patch: https://github.com/gildor478/ocaml-gettext/pull/37.patch +# https://github.com/gildor478/ocaml-gettext/issues/8 +# Pconst_string added extra Loc.t parameter which we must ignore. +Patch1: 0001-xgettext-Ignore-extra-Loc.t-parameter-of-Pconst_stri.patch -# Fix for OCaml >= 5.4 -# https://github.com/gildor478/ocaml-gettext/issues/40 -# https://github.com/gildor478/ocaml-gettext/pull/41 -Patch: 0001-xgettext-Fix-type-for-OCaml-5.4.patch - -BuildRequires: ocaml >= 4.03.0 -BuildRequires: ocaml-fileutils-devel >= 0.6.6-1 -BuildRequires: ocaml-dune >= 1.11.0 -BuildRequires: ocaml-dune-configurator-devel -BuildRequires: ocaml-cppo -# This was orphaned and dropped from Fedora back in 2023, but may be -# needed to run the tests. -# https://github.com/gildor478/ocaml-gettext/issues/35 -#BuildRequires: ocaml-seq-devel +BuildRequires: ocaml >= 4.00.1 +BuildRequires: ocaml-findlib-devel >= 1.3.3-3 +BuildRequires: ocaml-compiler-libs +BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-fileutils-devel >= 0.4.4-4 +BuildRequires: ocaml-dune-devel BuildRequires: docbook-style-xsl BuildRequires: libxslt BuildRequires: libxml2 -%if %{with tests} +BuildRequires: chrpath +BuildRequires: autoconf +%if !0%{?rhel} || 0%{?rhel} >= 9 BuildRequires: ocaml-ounit-devel -%endif -%if %{with camomile} BuildRequires: ocaml-camomile-devel >= 0.8.6-3 BuildRequires: ocaml-camomile-data %endif +BuildRequires: autoconf, automake -%if %{with camomile} +%if !0%{?rhel} || 0%{?rhel} >= 9 # ocaml-gettext program needs camomile data files Requires: ocaml-camomile-data %endif +%global __ocaml_requires_opts -i Asttypes -i Parsetree +%global __ocaml_provides_opts -i Pr_gettext + %description Ocaml-gettext provides support for internationalization of Ocaml @@ -71,8 +55,10 @@ Constraints : %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: ocaml-fileutils-devel%{?_isa} >= 0.6.6 +Requires: %{name} = %{version}-%{release} + +# BZ 446919. +Requires: ocaml-fileutils-devel >= 0.4.0 %description devel @@ -80,10 +66,10 @@ The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. -%if %{with camomile} +%if !0%{?rhel} || 0%{?rhel} >= 9 %package camomile Summary: Parts of %{name} which depend on Camomile -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description camomile @@ -93,9 +79,8 @@ depend on Camomile. %package camomile-devel Summary: Development files for %{name}-camomile -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-camomile%{?_isa} = %{version}-%{release} -Requires: ocaml-camomile-devel%{?_isa} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-camomile = %{version}-%{release} %description camomile-devel @@ -106,45 +91,68 @@ signature files for developing applications that use %prep -%autosetup -p1 +%setup -q -n %{name}-%{version} +%autopatch -p1 -# Remove ocaml-seq dependency. See note above. -sed -i 's/ seq / /' test/dune - -%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` -awk -i inplace -v RS='^\\(package' -v ORS= \ - '{while(sub(/\(package\n *\(name gettext-camomile\).*\)\)\)\)/,""));} {print}' dune-project -%endif +# Remove dependency on batteries. +sed -i -e 's/batteries//' test/dune +sed -i -e 's/batteries//' test/test-stub/dune %build -%dune_build +make build + + +#check +# Tests require batteries, so they are disabled at present. +# Under discussion with upstream. %install -%dune_install -s -sed -i '\@%{_bindir}@d;\@%{_mandir}@d' .ofiles-gettext -cat .ofiles-gettext-stub >> .ofiles-gettext -cat .ofiles-gettext-stub-devel >> .ofiles-gettext-devel +mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml +mkdir -p $RPM_BUILD_ROOT%{_bindir} +dune install --destdir=$RPM_BUILD_ROOT + +# Remove this, we will use our own rules for documentation. +rm -rf $RPM_BUILD_ROOT/usr/doc -%if %{with tests} -%check -%dune_check +%files +%doc LICENSE.txt +%{_libdir}/ocaml/gettext +%{_libdir}/ocaml/gettext-stub +%if %opt +%exclude %{_libdir}/ocaml/gettext/*.a +%exclude %{_libdir}/ocaml/gettext/*.cmxa +%exclude %{_libdir}/ocaml/gettext/*/*.a +%exclude %{_libdir}/ocaml/gettext/*/*.cmxa +%exclude %{_libdir}/ocaml/gettext/*/*.cmx +%exclude %{_libdir}/ocaml/gettext-stub/*.a +%exclude %{_libdir}/ocaml/gettext-stub/*.cmxa +%exclude %{_libdir}/ocaml/gettext-stub/*.cmx %endif +%exclude %{_libdir}/ocaml/gettext/*/*.ml +%exclude %{_libdir}/ocaml/gettext/*/*.mli +%exclude %{_libdir}/ocaml/gettext-stub/*.ml +%{_libdir}/ocaml/stublibs/*.so -%files -f .ofiles-gettext -%license LICENSE.txt - - -%files devel -f .ofiles-gettext-devel +%files devel %doc README.md CHANGES.md THANKS TODO.md +# %doc build/share/doc/html/* +%if %opt +%{_libdir}/ocaml/gettext/*.a +%{_libdir}/ocaml/gettext/*.cmxa +%{_libdir}/ocaml/gettext/*/*.a +%{_libdir}/ocaml/gettext/*/*.cmxa +%{_libdir}/ocaml/gettext/*/*.cmx +%{_libdir}/ocaml/gettext-stub/*.a +%{_libdir}/ocaml/gettext-stub/*.cmxa +%{_libdir}/ocaml/gettext-stub/*.cmx +%endif +%{_libdir}/ocaml/gettext/*/*.ml +%{_libdir}/ocaml/gettext/*/*.mli +%{_libdir}/ocaml/gettext-stub/*.ml %{_bindir}/ocaml-gettext %{_bindir}/ocaml-xgettext %{_mandir}/man1/ocaml-gettext.1* @@ -152,132 +160,32 @@ cat .ofiles-gettext-stub-devel >> .ofiles-gettext-devel %{_mandir}/man5/ocaml-gettext.5* -%if %{with camomile} -%files camomile -f .ofiles-gettext-camomile -%license LICENSE.txt +%if !0%{?rhel} || 0%{?rhel} >= 9 +%files camomile +%doc LICENSE.txt +%{_libdir}/ocaml/gettext-camomile +%if %opt +%exclude %{_libdir}/ocaml/gettext-camomile/*.a +%exclude %{_libdir}/ocaml/gettext-camomile/*.cmxa +%exclude %{_libdir}/ocaml/gettext-camomile/*.cmx +%endif +%exclude %{_libdir}/ocaml/gettext-camomile/*.mli -%files camomile-devel -f .ofiles-gettext-camomile-devel +%files camomile-devel %doc README.md +%if %opt +%{_libdir}/ocaml/gettext-camomile/*.a +%{_libdir}/ocaml/gettext-camomile/*.cmxa +%{_libdir}/ocaml/gettext-camomile/*.cmx +%endif +%{_libdir}/ocaml/gettext-camomile/*.mli %endif %changelog -* Tue Oct 14 2025 Richard W.M. Jones - 0.5.0-7 -- OCaml 5.4.0 rebuild - -* Fri Aug 22 2025 Jerry James - 0.5.0-6 -- Rebuild for ocaml-dune 3.20.0 - -* Thu Jul 24 2025 Fedora Release Engineering - 0.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jul 12 2025 Jerry James - 0.5.0-4 -- Rebuild to fix OCaml dependencies - -* Thu Apr 03 2025 Richard W.M. Jones - 0.5.0-3 -- Remove use of dune-site - -* Thu Feb 27 2025 Richard W.M. Jones - 0.5.0-2 -- Add dependency from devel to ocaml-dune-site-devel. - https://src.fedoraproject.org/rpms/ocaml-gettext/pull-request/3#comment-249424 - -* Wed Feb 26 2025 Richard W.M. Jones - 0.5.0-1 -- New version 0.5.0 -- New dependency ocaml-dune-site-devel (copied from opam). -- Remove upstream patches. - -* Fri Jan 17 2025 Fedora Release Engineering - 0.4.2-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jan 10 2025 Jerry James - 0.4.2-23 -- OCaml 5.3.0 rebuild for Fedora 42 - -* Thu Jul 18 2024 Fedora Release Engineering - 0.4.2-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jun 19 2024 Richard W.M. Jones - 0.4.2-21 -- OCaml 5.2.0 ppc64le fix - -* Wed May 29 2024 Richard W.M. Jones - 0.4.2-20 -- OCaml 5.2.0 for Fedora 41 - -* Wed May 8 2024 Jerry James - 0.4.2-19 -- Add patch to fix tests with OCaml 5.2.0 - -* Thu Jan 25 2024 Fedora Release Engineering - 0.4.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.4.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 18 2023 Richard W.M. Jones - 0.4.2-17 -- OCaml 5.1.1 + s390x code gen fix for Fedora 40 - -* Tue Dec 12 2023 Richard W.M. Jones - 0.4.2-16 -- OCaml 5.1.1 rebuild for Fedora 40 - -* Thu Oct 05 2023 Richard W.M. Jones - 0.4.2-15 -- OCaml 5.1 rebuild for Fedora 40 - -* Thu Jul 20 2023 Fedora Release Engineering - 0.4.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 11 2023 Richard W.M. Jones - 0.4.2-13 -- OCaml 5.0 rebuild for Fedora 39 - -* Mon Jul 10 2023 Jerry James - 0.4.2-12 -- OCaml 5.0.0 rebuild -- Convert License tag to SPDX -- Enable tests -- Use new dune macros - -* Tue Jan 24 2023 Richard W.M. Jones - 0.4.2-11 -- Rebuild OCaml packages for F38 - -* Thu Jan 19 2023 Fedora Release Engineering - 0.4.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 0.4.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Jun 19 2022 Richard W.M. Jones - 0.4.2-8 -- OCaml 4.14.0 rebuild - -* Fri Feb 04 2022 Richard W.M. Jones - 0.4.2-7 -- OCaml 4.13.1 rebuild to remove package notes - -* Thu Jan 20 2022 Fedora Release Engineering - 0.4.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Oct 05 2021 Richard W.M. Jones - 0.4.2-5 -- OCaml 4.13.1 build - -* Thu Jul 22 2021 Fedora Release Engineering - 0.4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Mar 30 2021 Richard W.M. Jones - 0.4.2-3 -- Bump and rebuild for ELN. - -* Mon Mar 8 23:22:35 GMT 2021 Richard W.M. Jones - 0.4.2-2 -- Better handling of optional camomile subpackage. - -* Tue Mar 2 23:22:35 GMT 2021 Richard W.M. Jones - 0.4.2-1 -- New upstream version 4.2 -- Remove patch now upstream. -- BR ocaml-cppo - -* Mon Mar 1 23:22:35 GMT 2021 Richard W.M. Jones - 0.4.1-9 -- OCaml 4.12.0 build - -* Wed Feb 24 2021 Richard W.M. Jones - 0.4.1-8 -- Remove ocaml-camomile dep on RHEL 9. - -* Mon Feb 1 2021 Richard W.M. Jones - 0.4.1-7 -- Bump and rebuild for updated ocaml-camomile. - -* Tue Jan 26 2021 Fedora Release Engineering - 0.4.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Wed Sep 02 2020 Richard W.M. Jones - 0.4.1-5.1 +- Bump release and rebuild. * Tue Sep 01 2020 Richard W.M. Jones - 0.4.1-5 - OCaml 4.11.1 rebuild diff --git a/sources b/sources index 85cd65b..eea02c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.5.0.tar.gz) = f55505bbe0da2a06053d94ee895a3e610a8d4ab5a2283ccff6a5a0c6a8ec011f5f286ab93e117cc340f55f056c7cdcb5752cc798e9d8e18fb5ab17f27f4a64c2 +SHA512 (v0.4.1.tar.gz) = 52a48cdd00e16dcf3c191d400930e88c144c119eb730bfa825ad269f9a6785d5833f13cb32da3de544a12bfff104da78adec27a8172425f4b8fce6d05821ec31 diff --git a/tests/basic-test.sh b/tests/basic-test.sh deleted file mode 100755 index 8fdac2a..0000000 --- a/tests/basic-test.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -set -e -set -x - -# Compile trivial gettext program. -cat < gettexttest.ml -module Gettext = Gettext.Program ( - struct - let textdomain = "test" - let codeset = None - let dir = None - let dependencies = [] - end -) (GettextStub.Native) ;; -open Gettext ;; -print_endline (s_ "Hello world") -EOF -ocamlfind ocamlopt -package gettext,gettext-stub gettexttest.ml -linkpkg -o gettexttest -./gettexttest diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100755 index eea186d..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,13 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - required_packages: - - ocaml - - ocaml-findlib - - ocaml-gettext-devel - tests: - - simple: - dir: . - run: ./basic-test.sh