diff --git a/0.3.7.tar.gz b/0.3.7.tar.gz deleted file mode 100644 index 5cc85d5..0000000 Binary files a/0.3.7.tar.gz and /dev/null differ diff --git a/ocaml-gettext-0.3.7-bytes-fix.patch b/ocaml-gettext-0.3.7-bytes-fix.patch deleted file mode 100644 index df1c80f..0000000 --- a/ocaml-gettext-0.3.7-bytes-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -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-0.4.2.tar.gz b/ocaml-gettext-0.4.2.tar.gz new file mode 100644 index 0000000..acc71e2 Binary files /dev/null and b/ocaml-gettext-0.4.2.tar.gz differ diff --git a/ocaml-gettext.spec b/ocaml-gettext.spec index daf2ec1..b93d1aa 100644 --- a/ocaml-gettext.spec +++ b/ocaml-gettext.spec @@ -1,13 +1,12 @@ Name: ocaml-gettext -Version: 0.3.7 -Release: 9 +Version: 0.4.2 +Release: 1 Summary: Internationalization library for OCaml License: LGPLv2+ with exceptions URL: https://github.com/gildor478/ocaml-gettext -Source0: https://github.com/gildor478/ocaml-gettext/archive/%{version}.tar.gz -Patch0001: ocaml-gettext-0.3.7-bytes-fix.patch +Source0: https://github.com/gildor478/ocaml-gettext/archive/%{name}-%{version}.tar.gz BuildRequires: ocaml >= 4.00.1 ocaml-findlib-devel >= 1.3.3-3 ocaml-ocamldoc ocaml-camlp4-devel -BuildRequires: ocaml-fileutils-devel >= 0.4.4-4 docbook-style-xsl +BuildRequires: ocaml-fileutils-devel >= 0.4.4-4 docbook-style-xsl ocaml-dune-devel ocaml-cppo BuildRequires: libxslt libxml2 chrpath autoconf automake %global __ocaml_requires_opts -i Asttypes -i Parsetree @@ -26,54 +25,48 @@ The ocaml-gettext-devel package contains development and libraries and files for %prep %autosetup -p1 -autoreconf -i + +sed -i -e 's/batteries//' test/dune +sed -i -e 's/batteries//' test/test-stub/dune +sed -i 's/dev/%{version}/g' configure.ml src/lib/gettext/base/gettextConfigGen.ml +rm -r src/lib/gettext-camomile +rm -r test/test-camomile +sed -i -e 's/camomile//' `find -name dune` %build -unset MAKEFLAGS -CFLAGS="$RPM_OPT_FLAGS" ./configure --libdir=%{_libdir} --disable-camomile \ - --with-docbook-stylesheet=/usr/share/sgml/docbook/xsl-stylesheets -make all +make build %install -export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml -install -d $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs -install -d $RPM_BUILD_ROOT%{_bindir} -ocamlfind install gettext _build/lib/gettext/* -ocamlfind install gettext-stub _build/lib/gettext-stub/* -cp _build/bin/ocaml-gettext $RPM_BUILD_ROOT%{_bindir}/ -chmod 0755 $RPM_BUILD_ROOT%{_bindir}/ocaml-gettext -cp _build/bin/ocaml-xgettext $RPM_BUILD_ROOT%{_bindir}/ -chmod 0755 $RPM_BUILD_ROOT%{_bindir}/ocaml-xgettext -chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so +mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml +mkdir -p $RPM_BUILD_ROOT%{_bindir} +dune install --destdir=$RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT/%{_libdir}/ocaml/gettext-camomile +rm -rf $RPM_BUILD_ROOT/usr/doc %files -%doc COPYING -%{_libdir}/ocaml/gettext/*.cma -%{_libdir}/ocaml/gettext/*.cmi -%{_libdir}/ocaml/gettext/*.cmo -%{_libdir}/ocaml/gettext/META +%doc LICENSE.txt +%{_libdir}/ocaml/gettext +%{_libdir}/ocaml/gettext-stub +%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 -%{_libdir}/ocaml/gettext-stub/*.cma -%{_libdir}/ocaml/gettext-stub/*.cmi -%{_libdir}/ocaml/gettext-stub/META -%exclude %{_libdir}/ocaml/gettext-stub/*.o %files devel -%doc README CHANGELOG TODO -%{_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 -%{_libdir}/ocaml/gettext/*.ml -%{_libdir}/ocaml/gettext/*.mli +%doc README.md CHANGES.md THANKS TODO.md +%{_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* %changelog +* Tue Sep 19 2023 liyanan - 0.4.2-1 +- update to 0.4.2 + * Wed Aug 24 2022 wangkai - 0.3.7-9 - Enable debuginfo for fix strip diff --git a/ocaml-gettext.yaml b/ocaml-gettext.yaml new file mode 100644 index 0000000..f6def33 --- /dev/null +++ b/ocaml-gettext.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: gildor478/ocaml-gettext +tag_prefix: "^v" +separator: .