diff --git a/ocaml-camomile.spec b/ocaml-camomile.spec index f5d8b47..00e64f9 100644 --- a/ocaml-camomile.spec +++ b/ocaml-camomile.spec @@ -1,7 +1,7 @@ %define ocamlpck camomile Name: ocaml-camomile -Version: 1.0.2 +Version: 2.0.0 Release: 2mamba Summary: a Unicode library for objective caml language Group: System/Libraries @@ -9,15 +9,19 @@ Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://github.com/yoriyuki/Camomile -Source: https://github.com/yoriyuki/Camomile.git/%{version}/Camomile-%{version}.tar.bz2 +Source: https://github.com/ocaml-community/Camomile.git/v%{version}/Camomile-%{version}.tar.bz2 +#Source: https://github.com/yoriyuki/Camomile.git/%{version}/Camomile-%{version}.tar.bz2 Patch0: ocaml-camomile-1.0.2-add-version.patch License: LGPL ## AUTOBUILDREQ-BEGIN +BuildRequires: dune BuildRequires: glibc-devel BuildRequires: ocaml +BuildRequires: ocaml-camlp-streams-devel +BuildRequires: ocaml-runtime ## AUTOBUILDREQ-END +BuildRequires: ocaml >= 4.14.1 BuildRequires: dune -BuildRequires: ocaml BuildRequires: ocaml-findlib Requires: %{name}-data = %{?epoch:%epoch:}%{version}-%{release} @@ -29,6 +33,7 @@ The library is currently designed for Unicode Standard 3.2. %package data Group: System/Libraries Summary: Data files for %{name} +Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} %description data This package contains the data files provided with %{name}. @@ -45,31 +50,34 @@ This package contains libraries and signature files for developing applications %prep %setup -q -n Camomile-%{version} -%patch0 -p1 +#%patch 0 -p1 %build -find . -name "*.mli" -exec sed -i 's,Pervasives.in_channel,Stdlib.in_channel,g' {} + -find . -name "*.mli" -exec sed -i 's,Pervasives.out_channel,Stdlib.out_channel,g' {} + -find . -name "*.ml" -exec sed -i 's,Pervasives.in_channel,Stdlib.in_channel,g' {} + -find . -name "*.ml" -exec sed -i 's,Pervasives.out_channel,Stdlib.out_channel,g' {} + -find . -name "*.ml" -exec sed -i 's,Pervasives.compare,Stdlib.compare,g' {} + +#find . -name "*.mli" -exec sed -i 's,Pervasives.in_channel,Stdlib.in_channel,g' {} + +#find . -name "*.mli" -exec sed -i 's,Pervasives.out_channel,Stdlib.out_channel,g' {} + +#find . -name "*.ml" -exec sed -i 's,Pervasives.in_channel,Stdlib.in_channel,g' {} + +#find . -name "*.ml" -exec sed -i 's,Pervasives.out_channel,Stdlib.out_channel,g' {} + +#find . -name "*.ml" -exec sed -i 's,Pervasives.compare,Stdlib.compare,g' {} + dune build @install %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -mkdir -p %{buildroot}%{_libdir}/ocaml -dune install \ - --destdir="%{buildroot}" \ - --libdir="%{_libdir}/ocaml" +DESTDIR=%{buildroot} dune install --prefix "/usr" --libdir "%{_libdir}/ocaml" + +#mkdir -p %{buildroot}%{_libdir}/ocaml +#dune install \ +# --destdir="%{buildroot}" \ +# --prefix=%{_prefix} \ +# --libdir="%{_libdir}/ocaml" rm -rf %{buildroot}/usr/doc -# Remove annotation files and sources. -rm -Rf %{buildroot}%{_libdir}/ocaml/camomile/*.cmt* -rm -Rf %{buildroot}%{_libdir}/ocaml/camomile/*.ml +## Remove annotation files and sources. +#rm -Rf %{buildroot}%{_libdir}/ocaml/camomile/*.cmt* +#rm -Rf %{buildroot}%{_libdir}/ocaml/camomile/*.ml # Install the *.mli files by hand. -cp _build/install/default/lib/camomile/library/*.mli %{buildroot}%{_libdir}/ocaml/camomile/ +#cp _build/install/default/lib/camomile/library/*.mli %{buildroot}%{_libdir}/ocaml/camomile/ %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -81,7 +89,7 @@ cp _build/install/default/lib/camomile/library/*.mli %{buildroot}%{_libdir}/ocam %exclude %{_libdir}/ocaml/%{ocamlpck}/*.a %exclude %{_libdir}/ocaml/%{ocamlpck}/*.cmx %exclude %{_libdir}/ocaml/%{ocamlpck}/*.cmxa -%exclude %{_libdir}/ocaml/%{ocamlpck}/*.mli +#%exclude %{_libdir}/ocaml/%{ocamlpck}/*.mli %doc LICENSE.md %files devel @@ -89,7 +97,7 @@ cp _build/install/default/lib/camomile/library/*.mli %{buildroot}%{_libdir}/ocam %{_libdir}/ocaml/%{ocamlpck}/*.a %{_libdir}/ocaml/%{ocamlpck}/*.cmx %{_libdir}/ocaml/%{ocamlpck}/*.cmxa -%{_libdir}/ocaml/%{ocamlpck}/*.mli +#%{_libdir}/ocaml/%{ocamlpck}/*.mli %files data %defattr(-,root,root) @@ -97,6 +105,13 @@ cp _build/install/default/lib/camomile/library/*.mli %{buildroot}%{_libdir}/ocam %{_datadir}/camomile/* %changelog +* Sun Jul 16 2023 Silvan Calarco 2.0.0-2mamba +- rebuilt + +* Thu Jul 06 2023 Silvan Calarco 2.0.0-1mamba +- update to 2.0.0 +- rebuilt with ocaml 4.14.1 + * Thu Feb 03 2022 Silvan Calarco 1.0.2-2mamba - add version in dune-project to fix liquidsoap detection