PR#1: Version 2.2.6 - rpms/ocaml-ounit

rpms / ocaml-ounit

#1 Version 2.2.6

Merged 2 years ago by rjones. Opened 2 years ago by jjames.

rpms/ jjames/ocaml-ounit rawhide into rawhide

Jerry James • 2 years ago

ef0451b

.gitignore

file modified

		`@@ -6,3 +6,4 @@`
		`/ounit-2.0.8.tar.gz`
		`/ounit-v2.2.2.tbz`
		`/ounit-v2.2.4.tbz`
		`+ /ounit-2.2.6.tbz`

0001-Remove-stdlib-shims.patch

file modified

+33 -15

		`@@ -1,39 +1,57 @@`
		`From fec0a725231d5769b3d3454687d6b0e1bd6b5e58 Mon Sep 17 00:00:00 2001`
		`From: "Richard W.M. Jones" <rjones@redhat.com>`
		`Date: Tue, 5 May 2020 12:30:50 +0100`
		`- Subject: [PATCH] Remove stdlib-shims.`
		`+ Subject: [PATCH] Remove stdlib-shims and seq.`

		`- We neither need nor want the stdlib-shims package in Fedora. It is a`
		`- forward compatibility package for older OCaml installations. Patch it`
		`- out instead. Upstream does not want this patch until stdlib-shims is`
		`- obsolete.`
		`+ We neither need nor want the stdlib-shims or seq packages in Fedora. They`
		`+ are forward compatibility package for older OCaml installations. Patch them`
		`+ out instead. Upstream does not want this patch until stdlib-shims and seq`
		`+ are obsolete.`
		`---`
		`ounit2.opam \| 1 -`
		`src/lib/ounit2/advanced/dune \| 2 +-`
		`2 files changed, 1 insertion(+), 2 deletions(-)`

		`- diff --git a/ounit2.opam b/ounit2.opam`
		`- index d07d8ca..2ae6fe9 100644`
		`- --- a/ounit2.opam`
		`- +++ b/ounit2.opam`
		`- @@ -10,7 +10,6 @@ depends: [`
		`+ --- a/ounit2-lwt.opam 2022-02-08 11:14:15.000000000 -0700`
		`+ +++ b/ounit2-lwt.opam 2022-02-19 14:34:26.474961756 -0700`
		`+ @@ -11,7 +11,6 @@ depends: [`
		`+ "ocaml" {>= "4.04.0"}`
		`+ "dune" {>= "1.11.0"}`
		`+ "lwt"`
		`+ - "seq"`
		`+ "ounit2" {= version}`
		`+ ]`
		`+ build: [`
		`+ --- a/ounit2.opam 2022-02-08 11:14:15.000000000 -0700`
		`+ +++ b/ounit2.opam 2022-02-19 14:33:56.242934851 -0700`
		`+ @@ -12,8 +12,6 @@ depends: [`
		`"dune" {>= "1.11.0"}`
		`"base-bytes"`
		`"base-unix"`
		`+ - "seq"`
		`- "stdlib-shims"`
		`]`
		`build: [`
		`["dune" "build" "-p" name "-j" jobs]`
		`- diff --git a/src/lib/ounit2/advanced/dune b/src/lib/ounit2/advanced/dune`
		`- index df87fe1..529a7e4 100644`
		`- --- a/src/lib/ounit2/advanced/dune`
		`- +++ b/src/lib/ounit2/advanced/dune`
		`+ --- a/src/lib/ounit2/advanced/dune 2022-02-08 11:14:15.000000000 -0700`
		`+ +++ b/src/lib/ounit2/advanced/dune 2022-02-19 14:35:12.907003067 -0700`
		`@@ -7,4 +7,4 @@`
		`(name oUnitAdvanced)`
		`(public_name ounit2.advanced)`
		`(wrapped false)`
		`- - (libraries unix bytes stdlib-shims))`
		`+ - (libraries unix bytes seq stdlib-shims))`
		`+ (libraries unix bytes))`
		`+ --- a/src/lib/ounit2/dune 2022-02-08 11:14:15.000000000 -0700`
		`+ +++ b/src/lib/ounit2/dune 2022-02-19 14:34:58.818990532 -0700`
		`+ @@ -2,7 +2,7 @@`
		`+ (name oUnit)`
		`+ (public_name ounit2)`
		`+ (wrapped false)`
		`+ - (libraries unix seq ounit2.advanced))`
		`+ + (libraries unix ounit2.advanced))`
		`+`
		`+ (documentation`
		`+ (package ounit2)`
		`--`
		`2.29.2`

ocaml-ounit.spec

file modified

+32 -118

		`@@ -1,40 +1,24 @@`
		`%undefine _package_note_flags`
		`+`
		`%ifnarch %{ocaml_native_compiler}`
		`%global debug_package %{nil}`
		`%endif`

		`- %global srcname ounit`
		`-`
		`- # -doc subpackage requires ocaml-odoc which has rather a lot of`
		`- # dependencies. This flag allows the non-essential subpackage to be`
		`- # enabled.`
		`- %bcond_with doc`
		`-`
		`- Name: ocaml-%{srcname}`
		`- Version: 2.2.4`
		`- Release: 9%{?dist}`
		`+ Name: ocaml-ounit`
		`+ Version: 2.2.6`
		`+ Release: 1%{?dist}`
		`Summary: Unit test framework for OCaml`

		`License: MIT`
		`URL: https://github.com/gildor478/ounit`
		`- Source0: %{url}/releases/download/v%{version}/%{srcname}-v%{version}.tbz`
		`+ Source0: %{url}/releases/download/v%{version}/ounit-%{version}.tbz`

		`# Remove stdlib-shims downstream. Not needed in Fedora.`
		`Patch0001: 0001-Remove-stdlib-shims.patch`

		`- # https://github.com/gildor478/ounit/issues/85`
		`- Patch0002: ounit-v2.2.4-remove-Thread-kill.patch`
		`-`
		`- BuildRequires: ocaml >= 4.02.3`
		`+ BuildRequires: ocaml >= 4.04.0`
		`BuildRequires: ocaml-dune >= 1.11.0`
		`- BuildRequires: ocaml-findlib`
		`BuildRequires: ocaml-lwt-devel`
		`- BuildRequires: ocaml-mmap-devel`
		`- BuildRequires: ocaml-ocplib-endian-devel`
		`- %if %{with doc}`
		`- BuildRequires: ocaml-odoc`
		`- %endif`
		`- BuildRequires: ocaml-result-devel`

		`# The ounit name is now just an alias for ounit2`
		`Provides: %{name}2 = %{version}-%{release}`
		`@@ -48,7 +32,7 @@`

		`%package devel`
		`Summary: Development files for %{name}`
		`- Requires: %{name} = %{version}-%{release}`
		`+ Requires: %{name}%{?_isa} = %{version}-%{release}`
		`Provides: %{name}2-devel = %{version}-%{release}`


		`@@ -59,7 +43,7 @@`

		`%package lwt`
		`Summary: Helper functions for building Lwt tests using OUnit`
		`- Requires: %{name} = %{version}-%{release}`
		`+ Requires: %{name}%{?_isa} = %{version}-%{release}`
		`Provides: %{name}2-lwt = %{version}-%{release}`


		`@@ -70,8 +54,8 @@`

		`%package lwt-devel`
		`Summary: Development files for %{name}-lwt`
		`- Requires: %{name}-devel = %{version}-%{release}`
		`- Requires: %{name}-lwt = %{version}-%{release}`
		`+ Requires: %{name}-devel%{?_isa} = %{version}-%{release}`
		`+ Requires: %{name}-lwt%{?_isa} = %{version}-%{release}`
		`Requires: ocaml-lwt-devel%{?_isa}`
		`Provides: %{name}2-lwt-devel = %{version}-%{release}`

		`@@ -81,125 +65,55 @@`
		`files for developing applications that use %{name}-lwt.`


		`- %package doc`
		`- Summary: Documentation for %{name}`
		`- BuildArch: noarch`
		`-`
		`-`
		`- %description doc`
		`- Documentation for %{name}.`
		`-`
		`-`
		`%prep`
		`- %autosetup -n %{srcname}-v%{version} -p1`
		`+ %autosetup -n ounit-%{version} -p1`


		`%build`
		`- dune build %{?_smp_mflags} --profile release`
		`- %if %{with doc}`
		`- dune build %{?_smp_mflags} @doc --profile release`
		`- %endif`
		`+ %dune_build`


		`%check`
		`# Disabled on s390(x) because:`
		`# https://github.com/gildor478/ounit/issues/18`
		`%ifnarch s390 s390x`
		`- dune runtest --profile release`
		`+ %dune_check`
		`%endif`


		`%install`
		`- dune install --destdir=%{buildroot} --profile release`
		`-`
		`- %if %{with doc}`
		`- # We do not want the dune markers`
		`- find _build/default/_doc/_html -name .dune-keep -delete`
		`- %endif`
		`-`
		`- # We install the documentation with the doc macro`
		`- rm -fr %{buildroot}%{_prefix}/doc`
		`+ %dune_install -s`


		`- %files`
		`+ %files -f .ofiles-ounit2`
		`%doc CHANGES.md README.md`
		`%license LICENSE.txt`
		`- %dir %{_libdir}/ocaml/%{srcname}/`
		`- %dir %{_libdir}/ocaml/%{srcname}2/`
		`- %dir %{_libdir}/ocaml/%{srcname}2/advanced/`
		`- %dir %{_libdir}/ocaml/%{srcname}2/threads/`
		`- %{_libdir}/ocaml/%{srcname}2/threads/.private/`
		`- %{_libdir}/ocaml/%{srcname}/META`
		`- %{_libdir}/ocaml/%{srcname}2/META`
		`- %{_libdir}/ocaml/%{srcname}2/*.cma`
		`- %{_libdir}/ocaml/%{srcname}2/*.cmi`
		`- %{_libdir}/ocaml/%{srcname}2//.cma`
		`- %{_libdir}/ocaml/%{srcname}2//.cmi`
		`- %ifarch %{ocaml_native_compiler}`
		`- %{_libdir}/ocaml/%{srcname}2/*.cmxs`
		`- %{_libdir}/ocaml/%{srcname}2//.cmxs`
		`- %endif`
		`+ %dir %{ocamldir}/ounit/`
		`+ %{ocamldir}/ounit/META`


		`- %files devel`
		`- %{_libdir}/ocaml/%{srcname}/dune-package`
		`- %{_libdir}/ocaml/%{srcname}/opam`
		`- %{_libdir}/ocaml/%{srcname}2/dune-package`
		`- %{_libdir}/ocaml/%{srcname}2/opam`
		`- %ifarch %{ocaml_native_compiler}`
		`- %{_libdir}/ocaml/%{srcname}2/*.a`
		`- %{_libdir}/ocaml/%{srcname}2/*.cmx`
		`- %{_libdir}/ocaml/%{srcname}2/*.cmxa`
		`- %{_libdir}/ocaml/%{srcname}2//.a`
		`- %{_libdir}/ocaml/%{srcname}2//.cmx`
		`- %{_libdir}/ocaml/%{srcname}2//.cmxa`
		`- %endif`
		`- %{_libdir}/ocaml/%{srcname}2/*.cmt`
		`- %{_libdir}/ocaml/%{srcname}2/*.cmti`
		`- %{_libdir}/ocaml/%{srcname}2/*.ml`
		`- %{_libdir}/ocaml/%{srcname}2/*.mli`
		`- %{_libdir}/ocaml/%{srcname}2//.cmt`
		`- %{_libdir}/ocaml/%{srcname}2//.cmti`
		`- %{_libdir}/ocaml/%{srcname}2//.ml`
		`- %{_libdir}/ocaml/%{srcname}2//.mli`
		`-`
		`-`
		`- %files lwt`
		`- %dir %{_libdir}/ocaml/%{srcname}-lwt/`
		`- %dir %{_libdir}/ocaml/%{srcname}2-lwt/`
		`- %{_libdir}/ocaml/%{srcname}-lwt/META`
		`- %{_libdir}/ocaml/%{srcname}2-lwt/META`
		`- %{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cma`
		`- %{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmi`
		`- %ifarch %{ocaml_native_compiler}`
		`- %{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmxs`
		`- %endif`
		`+ %files devel -f .ofiles-ounit2-devel`
		`+ %{ocamldir}/ounit/dune-package`
		`+ %{ocamldir}/ounit/opam`


		`- %files lwt-devel`
		`- %{_libdir}/ocaml/%{srcname}-lwt/dune-package`
		`- %{_libdir}/ocaml/%{srcname}-lwt/opam`
		`- %{_libdir}/ocaml/%{srcname}2-lwt/dune-package`
		`- %{_libdir}/ocaml/%{srcname}2-lwt/opam`
		`- %ifarch %{ocaml_native_compiler}`
		`- %{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.a`
		`- %{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmx`
		`- %{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmxa`
		`- %endif`
		`- %{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmt`
		`- %{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.ml`
		`+ %files lwt -f .ofiles-ounit2-lwt`
		`+ %dir %{ocamldir}/ounit-lwt/`
		`+ %{ocamldir}/ounit-lwt/META`


		`- %if %{with doc}`
		`- %files doc`
		`- %doc _build/default/_doc/_html/`
		`- %doc _build/default/_doc/_mlds/`
		`- %doc _build/default/_doc/_odoc/`
		`- %license LICENSE.txt`
		`- %endif`
		`+ %files lwt-devel -f .ofiles-ounit2-lwt-devel`
		`+ %{ocamldir}/ounit-lwt/dune-package`
		`+ %{ocamldir}/ounit-lwt/opam`


		`%changelog`
		`+ * Mon Aug 8 2022 Jerry James <loganjerry@gmail.com> - 2.2.6-1`
		`+ - Version 2.2.6`
		`+ - Trim BRs`
		`+ - Give up on using odoc to generate documentation`
		`+ - Use new OCaml macros`
		`+`
		`* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-9`
		`- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild`

ounit-v2.2.4-remove-Thread-kill.patch

file removed

-13

		`@@ -1,13 +0,0 @@`
		`- --- ounit-v2.2.4.old/src/lib/ounit2/threads/oUnitRunnerThreads.ml 2021-03-01 21:14:43.656815139 +0000`
		`- +++ ounit-v2.2.4/src/lib/ounit2/threads/oUnitRunnerThreads.ml 2020-12-19 23:59:04.000000000 +0000`
		`- @@ -143,8 +143,8 @@`
		`- Mutex.lock worker_finished_mutex`
		`- done;`
		`- if not !worker_finished then begin`
		`- - (* This will fail... because probably not implemented. *)`
		`- - Thread.kill thread;`
		`- + (* This will fail... because probably not implemented.`
		`- + Thread.kill thread; *)`
		`- worker_finished := true;`
		`- Condition.broadcast worker_finished_cond`
		`- end;`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (ounit-v2.2.4.tbz) = d69dc501a360c31f7854322b5e2c2abcb1e43890737e1cc00c167ee104d5dee471b6b8d8186f8044b0482c91a8f15210a25d833a1e03ed7baabfba923815962f`
		`+ SHA512 (ounit-2.2.6.tbz) = d7cb36a1fe245d02afab606cd1ee755a178ee4cb18fbbfec1df32baa88fa90ef6c9a50d9fd5bde46c7fd9c481f2debe4bafac75c4e3bdfbdb63fc18b0ccce3cc`

jjames commented 2 years ago

See the message to ocaml-devel dated 9 Aug 2022 with subject "ocaml-ppxlib upgrade". Please merge this PR if it looks good to you, but don't build yet. I will take care of the builds (in the correct order!) once all of the PRs have been merged.