Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
45a670577d | ||
|
8687ad4e41 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
/alcotest-*.tbz
|
||||
/alcotest-1.1.0.tar.gz
|
||||
|
52
0001-Drop-the-stdlib-shims-subpackage.patch
Normal file
52
0001-Drop-the-stdlib-shims-subpackage.patch
Normal file
@ -0,0 +1,52 @@
|
||||
From c21aec01927498729143b5358c88a97d0d08e872 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com>
|
||||
Date: Sat, 4 Apr 2020 00:34:23 +0200
|
||||
Subject: [PATCH] Drop the stdlib-shims subpackage
|
||||
|
||||
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.
|
||||
---
|
||||
alcotest.opam | 1 -
|
||||
dune-project | 3 +--
|
||||
src/alcotest/dune | 2 +-
|
||||
3 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/alcotest.opam b/alcotest.opam
|
||||
index 0245e17..b8b399f 100644
|
||||
--- a/alcotest.opam
|
||||
+++ b/alcotest.opam
|
||||
@@ -26,7 +26,6 @@ depends: [
|
||||
"cmdliner"
|
||||
"uuidm"
|
||||
"re"
|
||||
- "stdlib-shims"
|
||||
]
|
||||
build: [
|
||||
["dune" "subst"] {pinned}
|
||||
diff --git a/dune-project b/dune-project
|
||||
index ac7db6e..e746ce9 100644
|
||||
--- a/dune-project
|
||||
+++ b/dune-project
|
||||
@@ -29,8 +29,7 @@ tests to run.
|
||||
astring
|
||||
cmdliner
|
||||
uuidm
|
||||
- re
|
||||
- stdlib-shims))
|
||||
+ re))
|
||||
|
||||
(package
|
||||
(name alcotest-async)
|
||||
diff --git a/src/alcotest/dune b/src/alcotest/dune
|
||||
index 99b3174..20ba848 100644
|
||||
--- a/src/alcotest/dune
|
||||
+++ b/src/alcotest/dune
|
||||
@@ -1,3 +1,3 @@
|
||||
(library
|
||||
(public_name alcotest)
|
||||
- (libraries fmt astring cmdliner fmt.cli fmt.tty uuidm re stdlib-shims))
|
||||
+ (libraries fmt astring cmdliner fmt.cli fmt.tty uuidm re))
|
||||
--
|
||||
2.25.1
|
||||
|
@ -1,17 +0,0 @@
|
||||
--- a/alcotest.opam
|
||||
+++ b/alcotest.opam
|
||||
@@ -22,7 +22,6 @@ depends: [
|
||||
"cmdliner"
|
||||
"uuidm"
|
||||
"re"
|
||||
- "stdlib-shims"
|
||||
]
|
||||
|
||||
synopsis: "Alcotest is a lightweight and colourful test framework"
|
||||
--- a/src/alcotest/dune
|
||||
+++ b/src/alcotest/dune
|
||||
@@ -1,3 +1,3 @@
|
||||
(library
|
||||
(public_name alcotest)
|
||||
- (libraries fmt astring cmdliner fmt.cli fmt.tty uuidm re stdlib-shims))
|
||||
+ (libraries fmt astring cmdliner fmt.cli fmt.tty uuidm re))
|
@ -11,24 +11,24 @@
|
||||
%global srcname alcotest
|
||||
|
||||
Name: ocaml-%{srcname}
|
||||
Version: 1.0.1
|
||||
Release: 2%{?dist}
|
||||
Version: 1.1.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Lightweight and colorful test framework for OCaml
|
||||
|
||||
License: ISC
|
||||
URL: https://github.com/mirage/alcotest
|
||||
Source0: %{url}/releases/download/%{version}/%{srcname}-%{version}.tbz
|
||||
Source0: %{URL}/archive/%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
|
||||
# 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.
|
||||
Patch0: %{name}-stdlib-shims.patch
|
||||
Patch0: 0001-Drop-the-stdlib-shims-subpackage.patch
|
||||
|
||||
BuildRequires: ocaml >= 4.03.0
|
||||
BuildRequires: ocaml-astring-devel
|
||||
BuildRequires: ocaml-cmdliner-devel
|
||||
BuildRequires: ocaml-dune >= 1.1.0
|
||||
BuildRequires: ocaml-dune >= 2.0
|
||||
BuildRequires: ocaml-findlib
|
||||
BuildRequires: ocaml-fmt-devel >= 0.8.0
|
||||
BuildRequires: ocaml-fmt-devel >= 0.8.6
|
||||
BuildRequires: ocaml-re-devel
|
||||
BuildRequires: ocaml-uuidm-devel
|
||||
|
||||
@ -107,6 +107,13 @@ dune runtest -p alcotest
|
||||
%{_libdir}/ocaml/%{srcname}/*.mli
|
||||
|
||||
%changelog
|
||||
* Sat Apr 4 2020 Dan Čermák <dan.cermak@cgc-instruments.com> - 1.1.0-1
|
||||
- New upstream release 1.1.0
|
||||
- Rebase ocaml-alcotest-stdlib-shims.patch as 0001-Drop-the-stdlib-shims-subpackage.patch
|
||||
|
||||
* Fri Feb 28 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-2.1
|
||||
- OCaml 4.10.0 final (Fedora 32).
|
||||
|
||||
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.0.1-2
|
||||
- OCaml 4.10.0 final.
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (alcotest-1.0.1.tbz) = f5f52dea5bb143e7001b8d0ac6131f8851389b080f46b9ad1ccacb95cc31a38143dd7122ccba59bb190abe559dbf81f33cc4dc3401ed95772d59be75fa566f19
|
||||
SHA512 (alcotest-1.1.0.tar.gz) = ee406232897da0132a7ca0e0cd31eda2b6750141db0e5aac94634388107dc5cf4d5fdd4b6bcf1d2979da7102eef13fb8269218f91cfbb2fbfc6468142e2bb9c6
|
||||
|
Loading…
Reference in New Issue
Block a user