Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ocaml-markup: update to 1.0.3 #11723

Open
wants to merge 1 commit into
base: 3.0-dev
Choose a base branch
from
+30 −108
Open

ocaml-markup: update to 1.0.3 #11723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SPECS-EXTENDED/ocaml-markup/ocaml-markup.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"markup-1.0.0.tar.gz": "0a82c7a1e3c6516f835ef5a9ca07a9dee11f0006420a57afaa7f57257d3ded26"
"markup-1.0.3.tar.gz": "9526fd06a0afc37d7ae6e2528787142d52b124238ffb0e7e8e83bdd383806eb5"
}
}
132 changes: 27 additions & 105 deletions SPECS-EXTENDED/ocaml-markup/ocaml-markup.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
Vendor: Microsoft Corporation
Distribution: Azure Linux
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
ExcludeArch: %{ix86}

%ifnarch %{ocaml_native_compiler}
%global debug_package %{nil}
%endif

%global srcname markup
%bcond_with tests
%bcond_with docs
%global giturl https://github.com/aantron/markup.ml

Name: ocaml-%{srcname}
Version: 1.0.0
Release: 5%{?dist}
Name: ocaml-markup
Version: 1.0.3
Release: 1%{?dist}
Summary: Error-recovering streaming HTML5 and XML parsers for OCaml

License: MIT
URL: http://aantron.github.io/markup.ml/
Source0: https://github.com/aantron/markup.ml/archive/%{version}/%{srcname}-%{version}.tar.gz
URL: https://aantron.github.io/markup.ml/
VCS: git:%{giturl}.git
Source: %{giturl}/archive/%{version}/markup-%{version}.tar.gz

BuildRequires: ocaml >= 4.02.0
BuildRequires: ocaml-bisect-ppx-devel >= 2.0.0
BuildRequires: ocaml >= 4.03.0
BuildRequires: ocaml-bisect-ppx-devel >= 2.5.0
BuildRequires: ocaml-dune >= 2.7.0
BuildRequires: ocaml-lwt-devel
BuildRequires: ocaml-uutf-devel >= 1.0.0
%if %{with tests}
BuildRequires: ocaml-ounit-devel
%endif
%if %{with docs}
BuildRequires: ocaml-ocamldoc
%endif
BuildRequires: ocaml-uutf-devel >= 1.0.0

%description
Markup.ml is a pair of parsers implementing the HTML5 and XML
Expand Down Expand Up @@ -69,15 +66,14 @@ This package contains an adapter between Markup.ml and Lwt.
Summary: Development files for %{name}-lwt
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Requires: %{name}-lwt%{?_isa} = %{version}-%{release}
Requires: ocaml-bisect-ppx-devel%{?_isa}
Requires: ocaml-lwt-devel%{?_isa}

%description lwt-devel
The %{name}-lwt-devel package contains libraries and signature files for
developing applications that use %{name}-lwt.

%prep
%autosetup -n %{srcname}.ml-%{version} -p1
%autosetup -n markup.ml-%{version} -p1

# The uchar package is a forward compatibility package for OCaml versions prior
# to 4.03. We have a later OCaml in Fedora; uchar is in the standard library.
Expand All @@ -86,104 +82,30 @@ developing applications that use %{name}-lwt.
sed -i '/uchar/d' markup.opam

%build
dune build %{?_smp_mflags} @install

%if %{with docs}
# Build the documentation. Unfortunately, ocamldoc is not smart enough to
# figure out that Kstream is Markup.Kstream. I have not been able to figure
# out how to convince it, so the temporary hacked-up copy of markup.mli is
# my way of working around the problem. We should really build documentation
# with odoc, but this package is a build dependency of odoc.
mkdir tmp
sed '/Kstream/d' _build/default/src/markup.mli > tmp/markup.mli

mkdir html
ocamldoc -html -d html -css-style doc/style.css -I +lwt -I +lwt/unix \
-I _build/install/default/lib/markup \
-I _build/install/default/lib/markup-lwt \
-I _build/install/default/lib/markup-lwt/unix \
tmp/markup.mli \
_build/default/src/lwt/markup_lwt.mli \
_build/default/src/lwt_unix/markup_lwt_unix.mli
%endif
%dune_build

%install
dune install --destdir=%{buildroot}

# We install the documentation with the doc macro
rm -fr %{buildroot}%{_prefix}/doc

%ifarch %{ocaml_native_compiler}
# Add missing executable bits
find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod 0755 {} \+
%endif
%dune_install -s

%check
%if %{with tests}
dune runtest
%endif
%dune_check

%files
%files -f .ofiles-markup
%doc README.md
%license LICENSE.md
%dir %{_libdir}/ocaml/%{srcname}/
%{_libdir}/ocaml/%{srcname}/META
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cma
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmi
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxs
%endif

%files devel
%if %{with docs}
%doc html/*
%endif
%{_libdir}/ocaml/%{srcname}/dune-package
%{_libdir}/ocaml/%{srcname}/opam
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/%{srcname}/%{srcname}*.a
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmx
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmxa
%endif
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmt
%{_libdir}/ocaml/%{srcname}/%{srcname}*.cmti
%{_libdir}/ocaml/%{srcname}/*.ml
%{_libdir}/ocaml/%{srcname}/*.mli

%files lwt
%dir %{_libdir}/ocaml/%{srcname}-lwt/
%dir %{_libdir}/ocaml/%{srcname}-lwt/unix/
%{_libdir}/ocaml/%{srcname}-lwt/META
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cma
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmi
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cma
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmi
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmxs
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmxs
%endif
%files devel -f .ofiles-markup-devel

%files lwt-devel
%{_libdir}/ocaml/%{srcname}-lwt/dune-package
%{_libdir}/ocaml/%{srcname}-lwt/opam
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.a
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmx
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmxa
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.a
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmx
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmxa
%endif
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmt
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.cmti
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.ml
%{_libdir}/ocaml/%{srcname}-lwt/%{srcname}_lwt.mli
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmt
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.cmti
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.ml
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.mli
%files lwt -f .ofiles-markup-lwt

%files lwt-devel -f .ofiles-markup-lwt-devel

%changelog
* Tue Dec 24 2024 Durga Jagadeesh Palli <[email protected]> - 1.0.3-1
- Update to 1.0.3.
- License verified


* Mon Aug 09 2021 Thomas Crain <[email protected]> - 1.0.0-5
- Initial CBL-Mariner import from Fedora 34 (license: MIT).
- Remove test, docs circular dependencies
Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14702,8 +14702,8 @@
"type": "other",
"other": {
"name": "ocaml-markup",
"version": "1.0.0",
"downloadUrl": "https://github.com/aantron/markup.ml/archive/1.0.0/markup-1.0.0.tar.gz"
"version": "1.0.3",
"downloadUrl": "https://github.com/aantron/markup.ml/archive/1.0.3/markup-1.0.3.tar.gz"
}
}
},
Expand Down