Compare commits

..

1 Commits
rawhide ... f32

Author SHA1 Message Date
Richard W.M. Jones b17dba981a OCaml 4.10.0 final (Fedora 32). 2020-02-28 01:52:25 +00:00
3 changed files with 52 additions and 45 deletions

View File

@ -0,0 +1,31 @@
diff -ur markup.ml-0.8.2.old/test/dune markup.ml-0.8.2/test/dune
--- markup.ml-0.8.2.old/test/dune 2019-12-09 21:10:45.000000000 +0000
+++ markup.ml-0.8.2/test/dune 2020-02-26 18:50:33.352347296 +0000
@@ -1,6 +1,6 @@
(executable
(name test)
- (libraries markup oUnit test_support)
+ (libraries markup ounit2 test_support)
(flags (:standard -w +A-44-48)))
(alias
diff -ur markup.ml-0.8.2.old/test/lwt_unix/dune markup.ml-0.8.2/test/lwt_unix/dune
--- markup.ml-0.8.2.old/test/lwt_unix/dune 2019-12-09 21:10:45.000000000 +0000
+++ markup.ml-0.8.2/test/lwt_unix/dune 2020-02-26 18:50:27.299431528 +0000
@@ -1,6 +1,6 @@
(executable
(name test_lwt)
- (libraries lwt.unix markup-lwt.unix oUnit test_support)
+ (libraries lwt.unix markup-lwt.unix ounit2 test_support)
(flags (:standard -w +A-44)))
(alias
diff -ur markup.ml-0.8.2.old/test/support/dune markup.ml-0.8.2/test/support/dune
--- markup.ml-0.8.2.old/test/support/dune 2019-12-09 21:10:45.000000000 +0000
+++ markup.ml-0.8.2/test/support/dune 2020-02-26 18:50:48.344138661 +0000
@@ -1,4 +1,4 @@
(library
(name test_support)
- (libraries markup oUnit)
+ (libraries markup ounit2)
(flags (:standard -w +A-44)))

View File

@ -5,22 +5,33 @@
%global srcname markup
Name: ocaml-%{srcname}
Version: 1.0.0
Release: 5%{?dist}
Version: 0.8.2
Release: 5%{?dist}.1
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
# Test looks for "oUnit" but the module is actually called "ounit2".
Patch1: markup-0.8.2-rename-ounit.patch
BuildRequires: ocaml >= 4.02.0
BuildRequires: ocaml-bisect-ppx-devel >= 2.0.0
BuildRequires: ocaml-dune >= 2.7.0
BuildRequires: ocaml-bisect-ppx-devel
BuildRequires: ocaml-dune
BuildRequires: ocaml-findlib
BuildRequires: ocaml-lwt-devel
BuildRequires: ocaml-mmap-devel
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-ocplib-endian-devel
BuildRequires: ocaml-ounit-devel
BuildRequires: ocaml-result-devel
BuildRequires: ocaml-uutf-devel >= 1.0.0
# Workaround for possible bug in another package (maybe LWT?).
# /usr/bin/ld: cannot find -lev
BuildRequires: libev-devel
%description
Markup.ml is a pair of parsers implementing the HTML5 and XML
specifications, including error recovery. Usage is simple, because each
@ -78,13 +89,12 @@ developing applications that use %{name}-lwt.
sed -i '/uchar/d' markup.opam
%build
dune build %{?_smp_mflags} @install
dune build %{?_smp_mflags}
# 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.
# my way of working around the problem. Please fix if you know how.
mkdir tmp
sed '/Kstream/d' _build/default/src/markup.mli > tmp/markup.mli
@ -109,7 +119,7 @@ find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod 0755 {} \+
%endif
%check
dune runtest
make test
%files
%doc README.md
@ -170,42 +180,8 @@ dune runtest
%{_libdir}/ocaml/%{srcname}-lwt/unix/%{srcname}_lwt_unix.mli
%changelog
* Mon Mar 1 21:30:59 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.0.0-5
- OCaml 4.12.0 build
* Mon Feb 22 2021 Jerry James <loganjerry@gmail.com> - 1.0.0-4
- Rebuild for ocaml-lwt 5.4.0
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Dec 2 2020 Jerry James <loganjerry@gmail.com> - 1.0.0-2
- Upstream re-released version 1.0.0
* Fri Oct 23 2020 Jerry James <loganjerry@gmail.com> - 1.0.0-1
- Version 1.0.0
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 0.8.2-12
- OCaml 4.11.1 rebuild
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 0.8.2-11
- OCaml 4.11.0 rebuild
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-10
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 05 2020 Richard W.M. Jones <rjones@redhat.com> - 0.8.2-8
- OCaml 4.11.0+dev2-2020-04-22 rebuild
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 0.8.2-7
- OCaml 4.11.0 pre-release attempt 2
* Sat Apr 04 2020 Richard W.M. Jones <rjones@redhat.com> - 0.8.2-6
- Update all OCaml dependencies for RPM 4.16.
* Fri Feb 28 2020 Richard W.M. Jones <rjones@redhat.com> - 0.8.2-5.1
- OCaml 4.10.0 final (Fedora 32).
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 0.8.2-5
- OCaml 4.10.0 final.

View File

@ -1 +1 @@
SHA512 (markup-1.0.0.tar.gz) = 6383ed24fd86be0f6a64d9386b547d323fa0e763571ff3e7405119173c6ac6a7ed043bc0d35afd6e933101f22ed4b2f8baa08ba07d3df57a68015caaf79030ab
SHA512 (markup-0.8.2.tar.gz) = d529e5bf8ef154244603474a5e017d0a62baf64e3550346e8440adcc1166576813a22b17d0419b0399d35673f463bea5e2ae46ab5abef3f3b9befc4821fd7e1b