diff --git a/.gitignore b/.gitignore index 8fe92f1..e11a1eb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,3 @@ ocaml-gettext-0.3.3.tar.gz /ocaml-gettext-0.3.4.tar.gz /ocaml-gettext-0.3.5.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-pr_gettext-stop-tracking-and-printing-untranslated-s.patch b/0001-pr_gettext-stop-tracking-and-printing-untranslated-s.patch new file mode 100644 index 0000000..511eb3b --- /dev/null +++ b/0001-pr_gettext-stop-tracking-and-printing-untranslated-s.patch @@ -0,0 +1,109 @@ +From 35d2d7381c7101bb73d0b7f00fea06442c7b2ab8 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 29 Aug 2017 18:29:34 +0200 +Subject: [PATCH 1/3] pr_gettext: stop tracking (and printing) untranslated + strings + +Do not collect anymore the information of untranslated strings, since it +is only used to print all of them at the end of the message extraction. + +While I understand the reason why this was done (i.e. to discover +potentially untranslated user strings), this is something that just +causes lots of output in complex projects, since strings are basically +used for many non-UI tasks (say Str, Sys.command, etc), so the actual +result is that there are lots of false positive. Also, this is not +something xgettext (from GNU gettext) does. +--- + libgettext-ocaml/pr_gettext.ml | 44 ------------------------------------------ + 1 file changed, 44 deletions(-) + +diff --git a/libgettext-ocaml/pr_gettext.ml b/libgettext-ocaml/pr_gettext.ml +index c44933f..d78cf21 100644 +--- a/libgettext-ocaml/pr_gettext.ml ++++ b/libgettext-ocaml/pr_gettext.ml +@@ -71,17 +71,10 @@ struct + module Loc = Syntax.Loc + module Ast = Syntax.Ast + +- type untranslated_t = +- { +- str: string; (* Real string, not OCaml one *) +- locations: (string * int) list; (* Location in the file *) +- } +- + type t = + { + po_content: po_content; + translated: SetString.t; +- untranslated: untranslated_t MapString.t; + } + + let string_of_ocaml_string str = +@@ -91,29 +84,6 @@ struct + "%S" + (fun s -> s) + +- let string_not_translated t ocaml_str = +- not (SetString.mem ocaml_str t.translated) +- +- let add_untranslated t loc ocaml_str = +- let cur = +- try +- MapString.find ocaml_str t.untranslated +- with Not_found -> +- { +- str = string_of_ocaml_string ocaml_str; +- locations = []; +- } +- in +- let untranslated = +- MapString.add +- ocaml_str +- {cur with +- locations = +- (Loc.file_name loc, Loc.start_line loc) :: cur.locations} +- t.untranslated +- in +- {t with untranslated = untranslated} +- + + let add_translation t loc ocaml_singular plural_opt domain = + let filepos = +@@ -164,15 +134,6 @@ struct + | Some f -> open_out f + | None -> stdout + in +- MapString.iter +- (fun _ {str = str; locations = locs} -> +- List.iter +- (fun (fn, lineno) -> +- Printf.eprintf +- "%s:%d String %S not translated\n%!" +- fn lineno str) +- locs) +- t.untranslated; + Marshal.to_channel fd t.po_content [] + + (* Check if the given node belong to the given functions *) +@@ -197,7 +158,6 @@ struct + val t = + { + po_content = empty_po; +- untranslated = MapString.empty; + translated = SetString.empty; + } + +@@ -234,10 +194,6 @@ struct + (* Add a plural / defined domain string *) + {< t = add_translation t loc singular (Some plural) (Some domain) >} + +- | <:expr@loc<$str:str$>> when +- string_not_translated t str -> +- {< t = add_untranslated t loc str >} +- + | e -> super#expr e + + end +-- +2.13.2 + 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/0002-pr_gettext-stop-printing-extracted-strings.patch b/0002-pr_gettext-stop-printing-extracted-strings.patch new file mode 100644 index 0000000..6d656d9 --- /dev/null +++ b/0002-pr_gettext-stop-printing-extracted-strings.patch @@ -0,0 +1,26 @@ +From 3f4fc73c2a0315c2da16dee7db0fcb2766f55d3c Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 29 Aug 2017 18:36:10 +0200 +Subject: [PATCH 2/3] pr_gettext: stop printing extracted strings + +They are written in the pot file already, no need to print them to +stderr (even though they are not errors). +--- + libgettext-ocaml/pr_gettext.ml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libgettext-ocaml/pr_gettext.ml b/libgettext-ocaml/pr_gettext.ml +index d78cf21..47d93e5 100644 +--- a/libgettext-ocaml/pr_gettext.ml ++++ b/libgettext-ocaml/pr_gettext.ml +@@ -78,7 +78,6 @@ struct + } + + let string_of_ocaml_string str = +- prerr_endline str; + Scanf.sscanf + (Printf.sprintf "\"%s\"" str) + "%S" +-- +2.13.2 + diff --git a/0003-add-more-generated-files-to-.gitignore.patch b/0003-add-more-generated-files-to-.gitignore.patch new file mode 100644 index 0000000..00b410c --- /dev/null +++ b/0003-add-more-generated-files-to-.gitignore.patch @@ -0,0 +1,44 @@ +From 202bf1e00eaa533e133c29b509d77cdfb7c13f5e Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Tue, 29 Aug 2017 18:55:37 +0200 +Subject: [PATCH 3/3] add more generated files to .gitignore + +Make sure all the files generated during a build are properly ignored +from the git status. +--- + .gitignore | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/.gitignore b/.gitignore +index d853d40..87821c3 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,3 +1,12 @@ ++*.a ++*.cma ++*.cmi ++*.cmo ++*.cmx ++*.cmxa ++*.o ++*.so ++*_parser.output + /_build/ + /setup.data + /setup.log +@@ -7,6 +16,12 @@ + /configure + /libgettext-ocaml/META + /libgettext-ocaml/gettextConfig.ml ++/libgettext-ocaml/gettextPo_parser.mli + /config.log + /config.status ++/po/*.mo + /po/fr.po.bak ++/doc/*.1 ++/doc/*.5 ++/ocaml-gettext/ocaml-gettext ++/ocaml-gettext/ocaml-xgettext +-- +2.13.2 + 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-0.3.4-use-ocamlopt-g.patch b/ocaml-gettext-0.3.4-use-ocamlopt-g.patch new file mode 100644 index 0000000..f8f05b5 --- /dev/null +++ b/ocaml-gettext-0.3.4-use-ocamlopt-g.patch @@ -0,0 +1,33 @@ +--- ocaml-gettext-0.3.4/TopMakefile.old 2013-09-14 08:54:04.713986462 +0100 ++++ ocaml-gettext-0.3.4/TopMakefile 2013-09-14 08:54:18.319006115 +0100 +@@ -102,7 +102,7 @@ + %.cmxa %.a %.so: + $(if $(STUBSOBJS), \ + $(OCAMLMKLIB) -o $* $^ $(OCAMLMKLIB_FLAGS), \ +- $(OCAMLOPT) -a -o $*.cmxa $^ \ ++ $(OCAMLOPT) -g -a -o $*.cmxa $^ \ + ) + + %.cma %.a %.so: +@@ -161,7 +161,7 @@ + OLIBS = $(addsuffix .cmxa,$(LIBS)) + + install-buildprog-opt: $(CMX) +- $(OCAMLOPT) -o $(NAME) $(INCLUDES) -package "$(REQUIRES)" -linkpkg \ ++ $(OCAMLOPT) -g -o $(NAME) $(INCLUDES) -package "$(REQUIRES)" -linkpkg \ + -predicates "$(PREDICATES)" $(OLIBS) $(CMX) + $(INSTALL) -d $(BUILDBIN) + $(INSTALL_SCRIPT) -t $(BUILDBIN) $(NAME) +@@ -300,10 +300,10 @@ + $(OCAMLC) $(INCLUDES) $(CLI_OCAMLFIND) -c $< + + .ml.o: +- $(OCAMLOPT) $(INCLUDES) $(CLI_OCAMLFIND) -c $< ++ $(OCAMLOPT) -g $(INCLUDES) $(CLI_OCAMLFIND) -c $< + + .ml.cmx: +- $(OCAMLOPT) $(INCLUDES) $(CLI_OCAMLFIND) -c $< ++ $(OCAMLOPT) -g $(INCLUDES) $(CLI_OCAMLFIND) -c $< + + .mll.ml: + $(OCAMLLEX) $< diff --git a/ocaml-gettext-0.3.7-bytes-fix.patch b/ocaml-gettext-0.3.7-bytes-fix.patch new file mode 100644 index 0000000..df1c80f --- /dev/null +++ b/ocaml-gettext-0.3.7-bytes-fix.patch @@ -0,0 +1,17 @@ +diff -ur ocaml-gettext-0.3.7.old/libgettext-ocaml/gettextMo_int32.ml ocaml-gettext-0.3.7/libgettext-ocaml/gettextMo_int32.ml +--- ocaml-gettext-0.3.7.old/libgettext-ocaml/gettextMo_int32.ml 2017-03-01 22:03:24.000000000 +0000 ++++ ocaml-gettext-0.3.7/libgettext-ocaml/gettextMo_int32.ml 2017-11-08 18:33:04.486280040 +0000 +@@ -104,11 +104,11 @@ + (Int32.to_int length,Int32.to_int offset) + in + if 0 <= ioffset + ilength && ioffset + ilength < in_channel_length chn then +- let str = String.make ilength 'X' ++ let str = Bytes.make ilength 'X' + in + seek_in chn ioffset; + really_input chn str 0 ilength; +- str ++ Bytes.to_string str + else + (* We use this exception, because that what should happen if we try to + read the string *) diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec index 5a2eca2..35e64b6 100644 --- a/ocaml-gettext.spec +++ b/ocaml-gettext.spec @@ -1,61 +1,47 @@ -# 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.3.7 +Release: 6%{?dist} 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/%{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 +Patch0: ocaml-gettext-0.3.4-use-ocamlopt-g.patch +Patch0001: 0001-pr_gettext-stop-tracking-and-printing-untranslated-s.patch +Patch0002: 0002-pr_gettext-stop-printing-extracted-strings.patch +Patch0003: 0003-add-more-generated-files-to-.gitignore.patch +# Fix for immutable strings in OCaml 4.06. +Patch4: ocaml-gettext-0.3.7-bytes-fix.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-ocamldoc +BuildRequires: ocaml-camlp4-devel +BuildRequires: ocaml-fileutils-devel >= 0.4.4-4 BuildRequires: docbook-style-xsl BuildRequires: libxslt BuildRequires: libxml2 -%if %{with tests} +BuildRequires: chrpath +BuildRequires: autoconf +%if !0%{?rhel} 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} # 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 +57,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 +68,10 @@ The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. -%if %{with camomile} +%if !0%{?rhel} %package camomile Summary: Parts of %{name} which depend on Camomile -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description camomile @@ -93,9 +81,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,237 +93,120 @@ signature files for developing applications that use %prep -%autosetup -p1 +%setup -q +%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 +autoreconf -i %build -%dune_build +# Parallel builds don't work. +unset MAKEFLAGS +CFLAGS="$RPM_OPT_FLAGS" \ +./configure \ + --libdir=%{_libdir} \ +%if 0%{?rhel} + --disable-camomile \ +%else + --enable-test \ +%endif + --with-docbook-stylesheet=/usr/share/sgml/docbook/xsl-stylesheets +make all -%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 - - -%if %{with tests} %check -%dune_check +%if %opt +%if !0%{?rhel} +pushd test +../_build/bin/test +popd +%endif %endif -%files -f .ofiles-gettext -%license LICENSE.txt +%install +# make install in the package is screwed up completely. Install +# by hand instead. +export DESTDIR=$RPM_BUILD_ROOT +export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml +mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs +mkdir -p $RPM_BUILD_ROOT%{_bindir} + +# Remove *.o files - these shouldn't be distributed. +find _build -name '*.o' -exec rm {} \; + +ocamlfind install gettext _build/lib/gettext/* +ocamlfind install gettext-stub _build/lib/gettext-stub/* +%if !0%{?rhel} +ocamlfind install gettext-camomile _build/lib/gettext-camomile/* +%endif +install -m 0755 _build/bin/ocaml-gettext $RPM_BUILD_ROOT%{_bindir}/ +install -m 0755 _build/bin/ocaml-xgettext $RPM_BUILD_ROOT%{_bindir}/ + +chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so -%files devel -f .ofiles-gettext-devel -%doc README.md CHANGES.md THANKS TODO.md +%files +%doc COPYING +%{_libdir}/ocaml/gettext +%{_libdir}/ocaml/gettext-stub +%if %opt +%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 +%{_libdir}/ocaml/stublibs/*.so.owner + + +%files devel +%doc README CHANGELOG TODO +# %doc build/share/doc/html/* +%if %opt +%{_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* -%{_mandir}/man1/ocaml-xgettext.1* -%{_mandir}/man5/ocaml-gettext.5* -%if %{with camomile} -%files camomile -f .ofiles-gettext-camomile -%license LICENSE.txt +%if !0%{?rhel} +%files camomile +%doc COPYING +%{_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 -%doc README.md +%files camomile-devel +%doc README +%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 - -* Tue Sep 01 2020 Richard W.M. Jones - 0.4.1-5 -- OCaml 4.11.1 rebuild - -* Fri Aug 21 2020 Richard W.M. Jones - 0.4.1-4 -- OCaml 4.11.0 rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 05 2020 Richard W.M. Jones - 0.4.1-2 -- OCaml 4.11.0+dev2-2020-04-22 rebuild - -* Wed Apr 22 2020 Richard W.M. Jones - 0.4.1-1 -- New upstream version 0.4.1. -- Add small fix for OCaml 4.11. -- Package the man pages. - -* Tue Apr 21 2020 Richard W.M. Jones - 0.3.8-0.7.git3aecf8e5350f -- OCaml 4.11.0 pre-release attempt 2 - -* Sat Apr 04 2020 Richard W.M. Jones - 0.3.8-0.6.git3aecf8e5350f -- Update all OCaml dependencies for RPM 4.16. - -* Thu Feb 27 2020 Richard W.M. Jones - 0.3.8-0.5.git3aecf8e5350f -- OCaml 4.10.0 final. - -* Wed Jan 29 2020 Fedora Release Engineering - 0.3.8-0.4.git3aecf8e5350f -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Jan 19 2020 Richard W.M. Jones - 0.3.8-0.3.git3aecf8e5350f -- OCaml 4.10.0+beta1 rebuild. - -* Fri Dec 06 2019 Richard W.M. Jones - 0.3.8-0.2.git3aecf8e5350f -- OCaml 4.09.0 (final) rebuild. - -* Tue Oct 1 2019 Richard W.M. Jones - 0.3.8-0.1 -- Move to pre-release of 0.3.8. -- Requires dune. - -* Fri Aug 16 2019 Richard W.M. Jones - 0.3.7-13 -- Bump release and rebuild. - -* Fri Aug 16 2019 Richard W.M. Jones - 0.3.7-12 -- OCaml 4.08.1 (final) rebuild. - -* Wed Jul 31 2019 Richard W.M. Jones - 0.3.7-11 -- OCaml 4.08.1 (rc2) rebuild. - -* Thu Jul 25 2019 Fedora Release Engineering - 0.3.7-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jul 19 2019 Richard W.M. Jones - 0.3.7-9 -- Remove camlp4 dependency. -- Add all upstream patches since 0.3.7. - -* Fri Feb 01 2019 Fedora Release Engineering - 0.3.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - * Fri Jul 13 2018 Fedora Release Engineering - 0.3.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 85cd65b..9645c1e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v0.5.0.tar.gz) = f55505bbe0da2a06053d94ee895a3e610a8d4ab5a2283ccff6a5a0c6a8ec011f5f286ab93e117cc340f55f056c7cdcb5752cc798e9d8e18fb5ab17f27f4a64c2 +SHA512 (0.3.7.tar.gz) = 1358320359b9d2f3fd97a47d69b2a619942a65605c1e5cbf25e33ef42a10273167b526bca15e6c9523b87d8ea9dfd3215334050ad8eb84a8c41d4feef880a27a 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