Compare commits

..

No commits in common. "rawhide" and "f29" have entirely different histories.
rawhide ... f29

3 changed files with 26 additions and 102 deletions

2
.gitignore vendored
View File

@ -5,5 +5,3 @@ camomile-0.7.2.tar.bz2
/camomile-3f4d657d.tar.gz
/camomile-0.8.6.tar.gz
/camomile-0.8.7.tar.gz
/camomile-1.0.1.tar.gz
/camomile-1.0.2.tar.gz

View File

@ -1,9 +1,6 @@
# FIXME: Broken in 1.0.1 for unknown reasons.
%global debug_package %{nil}
Name: ocaml-camomile
Version: 1.0.2
Release: 15%{?dist}
Version: 0.8.7
Release: 4%{?dist}
Summary: Unicode library for OCaml
# Several files are MIT and UCD licensed, but the overall work is LGPLv2+
@ -11,13 +8,14 @@ Summary: Unicode library for OCaml
# https://www.redhat.com/archives/fedora-legal-list/2008-March/msg00005.html
License: LGPLv2+
URL: https://github.com/yoriyuki/Camomile
Source0: https://github.com/yoriyuki/Camomile/archive/%{version}.tar.gz/camomile-%{version}.tar.gz
Source0: https://github.com/yoriyuki/Camomile/archive/rel-%{version}/camomile-%{version}.tar.gz
BuildRequires: ocaml >= 3.12.1-12
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-camlp4-devel
BuildRequires: ocaml-cppo
BuildRequires: ocaml-dune
BuildRequires: jbuilder
# The base package requires the data files. Note that it is possible
# to install the data files on their own to support other packages
@ -53,7 +51,7 @@ applications that use %{name}.
%prep
%setup -q -n Camomile-%{version}
%setup -q -n Camomile-rel-%{version}
%build
@ -62,32 +60,30 @@ applications that use %{name}.
ulimit -Hs 65536
ulimit -Ss 65536
%endif
dune build --verbose --profile release
jbuilder build --verbose
%install
dune install \
--destdir=%{buildroot} \
--libdir=%{_libdir}/ocaml \
--verbose \
--profile release
# Remove /usr/doc because we will use %%doc rules instead.
rm -rf %{buildroot}/usr/doc
# Install the *.mli files by hand.
cp _build/install/default/lib/camomile/library/*.mli %{buildroot}%{_libdir}/ocaml/camomile/
# We have to do this by hand because jbuilder doesn't work.
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}
mkdir -p $RPM_BUILD_ROOT%{_datadir}
ocamlfind install camomile _build/install/default/lib/camomile/*
cp -r -L _build/install/default/share/camomile $RPM_BUILD_ROOT%{_datadir}
%ifarch %{ocaml_native_compiler}
cp _build/default/Camomile/tools/camomilecharmap.exe $RPM_BUILD_ROOT%{_bindir}/camomilecharmap
cp _build/default/Camomile/tools/camomilelocaledef.exe $RPM_BUILD_ROOT%{_bindir}/camomilelocaledef
%endif
%check
# Broken in 1.0.2.
# https://github.com/yoriyuki/Camomile/issues/82
#jbuilder runtest --profile release
jbuilder runtest
%files
%doc README.md CHANGES.md
%license LICENSE.md
%doc README
%{_libdir}/ocaml/camomile
%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/camomile/*.a
@ -96,11 +92,13 @@ cp _build/install/default/lib/camomile/library/*.mli %{buildroot}%{_libdir}/ocam
%endif
%exclude %{_libdir}/ocaml/camomile/*.mli
%ifarch %{ocaml_native_compiler}
%{_bindir}/camomilecharmap
%{_bindir}/camomilelocaledef
%endif
%files devel
%license LICENSE.md
%doc README web/dochtml/*
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/camomile/*.a
%{_libdir}/ocaml/camomile/*.cmxa
@ -110,83 +108,11 @@ cp _build/install/default/lib/camomile/library/*.mli %{buildroot}%{_libdir}/ocam
%files data
%license LICENSE.md
%doc README
%{_datadir}/camomile/
%changelog
* Mon Mar 1 15:16:09 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-15
- OCaml 4.12.0 build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-13
- OCaml 4.11.1 rebuild
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-12
- OCaml 4.11.0 rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-10
- OCaml 4.11.0+dev2-2020-04-22 rebuild
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-9
- OCaml 4.11.0 pre-release attempt 2
* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-8
- Update all OCaml dependencies for RPM 4.16.
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-7
- OCaml 4.10.0 final.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-5
- OCaml 4.10.0+beta1 rebuild.
- Use dune instead of jbuilder.
* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-4
- OCaml 4.09.0 (final) rebuild.
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-3
- OCaml 4.08.1 (final) rebuild.
* Fri Aug 09 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-2
- Reenable armv7 architecture now that nodynlink issue has been worked around.
https://github.com/ocaml/dune/issues/2527
* Thu Aug 08 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.2-1
- New upstream version 1.0.2.
* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-6
- OCaml 4.08.1 (rc2) rebuild.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-4
- OCaml 4.08.0 (final) rebuild.
* Tue Apr 30 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-3
- Use jbuilder --profile release to disable warn-error.
- Use jbuilder install instead of hand-installing.
- Use %%doc and %%license.
- Remove some binaries which are no longer installed.
* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-2
- OCaml 4.08.0 (beta 3) rebuild.
* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-1
- New upstream version 1.0.1.
- Remove ocaml-camlp4 dependency, no longer needed.
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (camomile-1.0.2.tar.gz) = d62ecaa297058b52674f98e513a6d776148fe62651b2b4a2dac4bb3e05abb8b7684960e889f68c6dab60aee669fbab715a2d6a9206645e24d10d8aaaf7cedf0e
SHA512 (camomile-0.8.7.tar.gz) = a8db2086030b703e1ada0e2cc195e1c6338946439b3a6b6a05febb3a0d24388add9fe06961025e043181a885bb085e33cebc8027c66c7dbbe1cc30e18df27cf2