PR#1: Version 6.1 - rpms/ocaml-dose3

rpms / ocaml-dose3

#1 Version 6.1

Merged 2 years ago by tc01. Opened 3 years ago by jjames.

rpms/ jjames/ocaml-dose3 rawhide into rawhide

Jerry James • 3 years ago

c51ee6c

.gitignore

file modified

		`@@ -3,3 +3,4 @@`
		`/dose-2c1b8df.tar.gz`
		`/dose-24316fe8.tar.gz`
		`/dose-24316fe.tar.gz`
		`+ /dose3-6.1.tar.gz`

0001-Enable-use-of-ocaml-base64-to-provide-Base64-functio.patch

file removed

-60

		`@@ -1,60 +0,0 @@`
		`- From 88b6a72e1b62000ea239c30c774762db2d375202 Mon Sep 17 00:00:00 2001`
		`- From: "Richard W.M. Jones" <rjones@redhat.com>`
		`- Date: Thu, 21 Jan 2021 20:21:45 +0000`
		`- Subject: [PATCH 1/4] Enable use of ocaml-base64 to provide Base64 functions.`
		`-`
		`- This module is no longer included in the minimal extlib:`
		`- https://github.com/ygrek/ocaml-extlib/issues/53`
		`- ---`
		`- _tags.in \| 8 ++++----`
		`- npm/packages.ml \| 2 +-`
		`- 2 files changed, 5 insertions(+), 5 deletions(-)`
		`-`
		`- diff --git a/_tags.in b/_tags.in`
		`- index 23ed855..68c4d4e 100644`
		`- --- a/_tags.in`
		`- +++ b/_tags.in`
		`- @@ -9,9 +9,9 @@ true: -traverse`
		`- <applications/.ml> or <experimental//.ml> or <experimental/.ml>: pp(cppo @CPPOFLAGS@ @CONFIG_PARMAP@ @CONFIG_OCAMLGRAPH@ @CONFIG_MCCS@)`
		`-`
		`- </.ml{i,}>: pp(cppo)`
		`- -</.ml{i,}>: package(extlib), @PKG_CUDF@, package(re.pcre)`
		`- +</.ml{i,}>: package(extlib), package(base64), @PKG_CUDF@, package(re.pcre)`
		`-`
		`- -</tests.>: package(oUnit), package(extlib), @PKG_CUDF@, package(re.pcre), package(zip), package(bz2), package(ocamlgraph)`
		`- +</tests.>: package(oUnit), package(extlib), package(base64), @PKG_CUDF@, package(re.pcre), package(zip), package(bz2), package(ocamlgraph)`
		`-`
		`- <common/tests.*>: use_common`
		`- <algo/tests.*>: use_common`
		`- @@ -54,7 +54,7 @@ true: -traverse`
		`- <doseparseNoRpm/.cmx> and not <doseparseNoRpm/doseparse.cmx>: for-pack(DoseparseNoRpm)`
		`-`
		`- <{applications,experimental}/*>: use_common, use_versioning, use_debian, use_opam, use_npm, use_pef, use_csw`
		`- -<{applications,experimental}/*>: package(extlib), package(re.pcre), package(unix), package(re.str), package(ocamlgraph)`
		`- +<{applications,experimental}/*>: package(extlib), package(base64), package(re.pcre), package(unix), package(re.str), package(ocamlgraph)`
		`- <{applications,experimental}/*>: @PKG_CUDF@, @PKG_ZIP@, @PKG_BZ2@`
		`-`
		`- <applications/apt-cudf.*>: use_doseparseNoRpm, use_algo, @PKG_MCCS@`
		`- @@ -85,5 +85,5 @@ true: -traverse`
		`- <experimental/cnftocudf.*>: use_doseparseNoRpm`
		`- <experimental/example.*>: use_doseparse`
		`-`
		`- -<experimental/dudftocudf/*>: use_common, use_debian, use_pef, use_csw, package(extlib), package(re.pcre), package(unix), @PKG_CUDF@, @PKG_ZIP@, @PKG_BZ2@, @PKG_CURL@, @PKG_XML@, use_doseparseNoRpm`
		`- +<experimental/dudftocudf/*>: use_common, use_debian, use_pef, use_csw, package(extlib), package(base64), package(re.pcre), package(unix), @PKG_CUDF@, @PKG_ZIP@, @PKG_BZ2@, @PKG_CURL@, @PKG_XML@, use_doseparseNoRpm`
		`- true: safe_string`
		`- diff --git a/npm/packages.ml b/npm/packages.ml`
		`- index 0511950..1f36322 100644`
		`- --- a/npm/packages.ml`
		`- +++ b/npm/packages.ml`
		`- @@ -30,7 +30,7 @@ let lexbuf_wrapper type_parser v =`
		`- match v with`
		`- \| (_, (_, package)) ->`
		`- let splited = Pcre.split (Pcre.regexp " : ") package in`
		`- - let base64 = Bytes.to_string (Base64.str_encode (List.nth splited 1)) in`
		`- + let base64 = Base64.encode_string (List.nth splited 1) in`
		`- [[("", None), Some ("=", base64)]]`
		`-`
		`- let parse_dependlist v = lexbuf_wrapper Npm_parser.dependlist_top v ;;`
		`- --`
		`- 2.29.2`
		`-`

0001-Use-ounit2.patch

file added

+124

		`@@ -0,0 +1,124 @@`
		`+ From d359da8587ddfedd54f8bc67d2c1486110573f33 Mon Sep 17 00:00:00 2001`
		`+ From: Jerry James <loganjerry@gmail.com>`
		`+ Date: Tue, 4 May 2021 14:51:31 -0600`
		`+ Subject: [PATCH 1/2] Use ounit2`
		`+`
		`+ ---`
		`+ dose3.opam \| 2 +-`
		`+ dune-project \| 2 +-`
		`+ src/algo/tests/dune \| 2 +-`
		`+ src/common/tests/dune \| 2 +-`
		`+ src/deb/tests/dune \| 2 +-`
		`+ src/npm/tests/dune \| 2 +-`
		`+ src/opam2/tests/dune \| 2 +-`
		`+ src/pef/tests/dune \| 2 +-`
		`+ src/versioning/tests/dune \| 2 +-`
		`+ 9 files changed, 9 insertions(+), 9 deletions(-)`
		`+`
		`+ diff --git a/dose3.opam b/dose3.opam`
		`+ index 669fdbe..16804f7 100644`
		`+ --- a/dose3.opam`
		`+ +++ b/dose3.opam`
		`+ @@ -52,7 +52,7 @@ depends: [`
		`+ "re" {>= "1.2.2"}`
		`+ "parmap"`
		`+ "stdlib-shims"`
		`+ - "ounit" {with-test}`
		`+ + "ounit2" {with-test}`
		`+ "conf-python-3" {with-test}`
		`+ "conf-python3-yaml" {with-test}`
		`+ "conf-dpkg" {with-test}`
		`+ diff --git a/dune-project b/dune-project`
		`+ index 7bceee6..24c455a 100644`
		`+ --- a/dune-project`
		`+ +++ b/dune-project`
		`+ @@ -44,7 +44,7 @@`
		`+ (re (>= 1.2.2))`
		`+ parmap`
		`+ stdlib-shims`
		`+ - (ounit :with-test)`
		`+ + (ounit2 :with-test)`
		`+ (conf-python-3 :with-test)`
		`+ (conf-python3-yaml :with-test)`
		`+ (conf-dpkg :with-test)`
		`+ diff --git a/src/algo/tests/dune b/src/algo/tests/dune`
		`+ index e42ab4d..de00d97 100644`
		`+ --- a/src/algo/tests/dune`
		`+ +++ b/src/algo/tests/dune`
		`+ @@ -1,5 +1,5 @@`
		`+ (executable`
		`+ (name tests)`
		`+ - (libraries extlib dose3.common dose3.algo oUnit)`
		`+ + (libraries extlib dose3.common dose3.algo ounit2)`
		`+ (modules tests)`
		`+ (flags (:standard)))`
		`+ diff --git a/src/common/tests/dune b/src/common/tests/dune`
		`+ index e42ab4d..de00d97 100644`
		`+ --- a/src/common/tests/dune`
		`+ +++ b/src/common/tests/dune`
		`+ @@ -1,5 +1,5 @@`
		`+ (executable`
		`+ (name tests)`
		`+ - (libraries extlib dose3.common dose3.algo oUnit)`
		`+ + (libraries extlib dose3.common dose3.algo ounit2)`
		`+ (modules tests)`
		`+ (flags (:standard)))`
		`+ diff --git a/src/deb/tests/dune b/src/deb/tests/dune`
		`+ index 1597cb3..7bdf8ee 100644`
		`+ --- a/src/deb/tests/dune`
		`+ +++ b/src/deb/tests/dune`
		`+ @@ -1,5 +1,5 @@`
		`+ (executable`
		`+ (name tests)`
		`+ - (libraries extlib dose3.common dose3.algo dose3.debian oUnit)`
		`+ + (libraries extlib dose3.common dose3.algo dose3.debian ounit2)`
		`+ (modules tests)`
		`+ (flags (:standard)))`
		`+ diff --git a/src/npm/tests/dune b/src/npm/tests/dune`
		`+ index da0835c..9183e63 100644`
		`+ --- a/src/npm/tests/dune`
		`+ +++ b/src/npm/tests/dune`
		`+ @@ -1,5 +1,5 @@`
		`+ (executable`
		`+ (name tests)`
		`+ - (libraries extlib dose3.common dose3.algo dose3.pef dose3.npm oUnit)`
		`+ + (libraries extlib dose3.common dose3.algo dose3.pef dose3.npm ounit2)`
		`+ (modules tests)`
		`+ (flags (:standard)))`
		`+ diff --git a/src/opam2/tests/dune b/src/opam2/tests/dune`
		`+ index 8e3593b..bd73c86 100644`
		`+ --- a/src/opam2/tests/dune`
		`+ +++ b/src/opam2/tests/dune`
		`+ @@ -1,6 +1,6 @@`
		`+ (executable`
		`+ (name tests)`
		`+ (libraries extlib dose3.common dose3.algo dose3.versioning dose3.pef`
		`+ - dose3.opam2 oUnit)`
		`+ + dose3.opam2 ounit2)`
		`+ (modules tests)`
		`+ (flags (:standard)))`
		`+ diff --git a/src/pef/tests/dune b/src/pef/tests/dune`
		`+ index 12b0d2f..a00bfeb 100644`
		`+ --- a/src/pef/tests/dune`
		`+ +++ b/src/pef/tests/dune`
		`+ @@ -1,5 +1,5 @@`
		`+ (executable`
		`+ (name tests)`
		`+ - (libraries extlib dose3.common dose3.algo dose3.versioning dose3.pef oUnit)`
		`+ + (libraries extlib dose3.common dose3.algo dose3.versioning dose3.pef ounit2)`
		`+ (modules tests)`
		`+ (flags (:standard)))`
		`+ diff --git a/src/versioning/tests/dune b/src/versioning/tests/dune`
		`+ index cc59e52..4fc29f6 100644`
		`+ --- a/src/versioning/tests/dune`
		`+ +++ b/src/versioning/tests/dune`
		`+ @@ -1,5 +1,5 @@`
		`+ (executable`
		`+ (name tests)`
		`+ - (libraries extlib dose3.common dose3.algo dose3.versioning oUnit)`
		`+ + (libraries extlib dose3.common dose3.algo dose3.versioning ounit2)`
		`+ (modules tests)`
		`+ (flags (:standard)))`
		`+ --`
		`+ 2.30.2`
		`+`

0002-Do-not-depend-on-stdlib-shims.patch

file added

+51

		`@@ -0,0 +1,51 @@`
		`+ From 544dd9fc13a05d1225eccb8ce0e55dc8d0e62200 Mon Sep 17 00:00:00 2001`
		`+ From: Jerry James <loganjerry@gmail.com>`
		`+ Date: Tue, 4 May 2021 14:51:59 -0600`
		`+ Subject: [PATCH 2/2] Do not depend on stdlib-shims`
		`+`
		`+ ---`
		`+ dose3.opam \| 1 -`
		`+ dune-project \| 1 -`
		`+ src/common/dune \| 2 +-`
		`+ 3 files changed, 1 insertion(+), 3 deletions(-)`
		`+`
		`+ diff --git a/dose3.opam b/dose3.opam`
		`+ index 16804f7..af13dd1 100644`
		`+ --- a/dose3.opam`
		`+ +++ b/dose3.opam`
		`+ @@ -51,7 +51,6 @@ depends: [`
		`+ "ocamlgraph" {>= "2.0.0"}`
		`+ "re" {>= "1.2.2"}`
		`+ "parmap"`
		`+ - "stdlib-shims"`
		`+ "ounit2" {with-test}`
		`+ "conf-python-3" {with-test}`
		`+ "conf-python3-yaml" {with-test}`
		`+ diff --git a/dune-project b/dune-project`
		`+ index 24c455a..32c52cc 100644`
		`+ --- a/dune-project`
		`+ +++ b/dune-project`
		`+ @@ -43,7 +43,6 @@`
		`+ (ocamlgraph (>= 2.0.0))`
		`+ (re (>= 1.2.2))`
		`+ parmap`
		`+ - stdlib-shims`
		`+ (ounit2 :with-test)`
		`+ (conf-python-3 :with-test)`
		`+ (conf-python3-yaml :with-test)`
		`+ diff --git a/src/common/dune b/src/common/dune`
		`+ index 19f92e3..1dfbcd9 100644`
		`+ --- a/src/common/dune`
		`+ +++ b/src/common/dune`
		`+ @@ -1,7 +1,7 @@`
		`+ (library`
		`+ (name dose_common)`
		`+ (public_name dose3.common)`
		`+ - (libraries extlib cudf zip bz2 re.pcre stdlib-shims unix)`
		`+ + (libraries extlib cudf zip bz2 re.pcre unix)`
		`+ (flags (:standard)))`
		`+`
		`+ (ocamllex shell_lexer)`
		`+ --`
		`+ 2.30.2`
		`+`

0002-Enable-debuginfo-generation.patch

file removed

-25

		`@@ -1,25 +0,0 @@`
		`- From 06e25cbeb8cc08e67edbc494b1a21c1eb4420cf7 Mon Sep 17 00:00:00 2001`
		`- From: "Richard W.M. Jones" <rjones@redhat.com>`
		`- Date: Thu, 21 Jan 2021 20:25:16 +0000`
		`- Subject: [PATCH 2/4] Enable debuginfo generation.`
		`-`
		`- ---`
		`- Makefile \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`-`
		`- diff --git a/Makefile b/Makefile`
		`- index dc89a48..2c8b1e0 100644`
		`- --- a/Makefile`
		`- +++ b/Makefile`
		`- @@ -10,7 +10,7 @@ DIST_TARBALL = $(DIST_DIR).tar.gz`
		`- #VERBOSE := -classic-display`
		`- OBFLAGS := $(VERBOSE) -j 10 -no-links -cflags -warn-error,FPSXY $(PICOPTS)`
		`- APPFLAGS := $(VERBOSE) -j 10 $(PICOPTS)`
		`- -#OBFLAGS := $(OBFLAGS) -tag debug`
		`- +OBFLAGS := $(OBFLAGS) -tag debug`
		`- #OBFLAGS := $(OBFLAGS) -tag profile`
		`- #OBFLAGS := $(OBFLAGS) -classic-display`
		`-`
		`- --`
		`- 2.29.2`
		`-`

0003-Use-ounit2.patch

file removed

-46

		`@@ -1,46 +0,0 @@`
		`- From a1b8ae01723917a1829ef20d719cb005548347ce Mon Sep 17 00:00:00 2001`
		`- From: "Richard W.M. Jones" <rjones@redhat.com>`
		`- Date: Thu, 21 Jan 2021 20:26:31 +0000`
		`- Subject: [PATCH 3/4] Use ounit2.`
		`-`
		`- ---`
		`- _tags.in \| 2 +-`
		`- configure.ac \| 8 ++++----`
		`- 2 files changed, 5 insertions(+), 5 deletions(-)`
		`-`
		`- diff --git a/_tags.in b/_tags.in`
		`- index 68c4d4e..b1987a3 100644`
		`- --- a/_tags.in`
		`- +++ b/_tags.in`
		`- @@ -11,7 +11,7 @@ true: -traverse`
		`- </.ml{i,}>: pp(cppo)`
		`- </.ml{i,}>: package(extlib), package(base64), @PKG_CUDF@, package(re.pcre)`
		`-`
		`- -</tests.>: package(oUnit), package(extlib), package(base64), @PKG_CUDF@, package(re.pcre), package(zip), package(bz2), package(ocamlgraph)`
		`- +</tests.>: package(ounit2), package(extlib), package(base64), @PKG_CUDF@, package(re.pcre), package(zip), package(bz2), package(ocamlgraph)`
		`-`
		`- <common/tests.*>: use_common`
		`- <algo/tests.*>: use_common`
		`- diff --git a/configure.ac b/configure.ac`
		`- index 02d8579..fae22e1 100644`
		`- --- a/configure.ac`
		`- +++ b/configure.ac`
		`- @@ -203,11 +203,11 @@ AC_ARG_WITH(oUnit,`
		`- HAS_OUNIT=no)`
		`- AC_SUBST(HAS_OUNIT)`
		`- if test "$HAS_OUNIT" = "yes" ; then`
		`- - AC_CHECK_OCAML_PKG([oUnit])`
		`- - if test "$OCAML_PKG_oUnit" = "no"; then`
		`- - AC_MSG_ERROR([Please install OCaml findlib module 'oUnit'.])`
		`- + AC_CHECK_OCAML_PKG([ounit2])`
		`- + if test "$OCAML_PKG_ounit2" = "no"; then`
		`- + AC_MSG_ERROR([Please install OCaml findlib module 'ounit2'.])`
		`- fi`
		`- - PKG_OUNIT="pkg_oUnit"`
		`- + PKG_OUNIT="pkg_ounit2"`
		`- fi`
		`-`
		`- AC_ARG_WITH(benchmark,`
		`- --`
		`- 2.29.2`
		`-`

0004-Makefile.config.in-Disable-runtime-variant-pic.patch

file removed

-29

		`@@ -1,29 +0,0 @@`
		`- From d43ea399d74be91ea6019117226700628ed722c5 Mon Sep 17 00:00:00 2001`
		`- From: "Richard W.M. Jones" <rjones@redhat.com>`
		`- Date: Thu, 21 Jan 2021 20:36:09 +0000`
		`- Subject: [PATCH 4/4] Makefile.config.in: Disable -runtime-variant pic`
		`-`
		`- Fails with this error for unclear reasons:`
		`-`
		`- File "myocamlbuild.ml", line 1:`
		`- Error: Cannot find file camlheader_pic`
		`- ---`
		`- Makefile.config.in \| 2 +-`
		`- 1 file changed, 1 insertion(+), 1 deletion(-)`
		`-`
		`- diff --git a/Makefile.config.in b/Makefile.config.in`
		`- index 0dbc000..cae4d5f 100644`
		`- --- a/Makefile.config.in`
		`- +++ b/Makefile.config.in`
		`- @@ -64,7 +64,7 @@ endif`
		`-`
		`- ifeq ("@OCAMLEXT@","native")`
		`- OCAMLBUILD=@OCAMLBUILD@`
		`- - PICOPTS=-lflags -runtime-variant,_pic`
		`- + #PICOPTS=-lflags -runtime-variant,_pic`
		`- ifeq ("@OCAML_SYSTEM@","mingw")`
		`- INSTALLOPTS=-s --strip-program=i686-w64-mingw32-strip`
		`- else`
		`- --`
		`- 2.29.2`
		`-`

ocaml-dose3.spec

file modified

+84 -73

		`@@ -1,14 +1,9 @@`
		`- # We need the ocaml bz2 bindings to run the unit tests via ounit.`
		`# There is also a separate test data repository for a different set of tests`
		`# that is distributed separately.`

		`- # Currently packaging a snapshot to build with newer ocaml.`
		`- %global commit0 24316fe8532a529bf53703902d679a0cc3fea934`
		`- %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})`
		`-`
		`Name: ocaml-dose3`
		`- Version: 5.0.1`
		`- Release: 32.20200502git%{shortcommit0}%{?dist}`
		`+ Version: 6.1`
		`+ Release: 1%{?dist}`
		`Summary: Framework for managing distribution packages and dependencies`

		`%global libname %(echo %{name} \| sed -e 's/^ocaml-//')`
		`@@ -17,30 +12,24 @@`
		`License: LGPLv3+ with exceptions`
		`URL: http://www.mancoosi.org/software/`

		`- #Source0: https://gforge.inria.fr/frs/download.php/file/36063/dose3-{version}.tar.gz`
		`- Source0: https://scm.gforge.inria.fr/anonscm/gitweb?p=dose/dose.git;a=snapshot;h=%{commit0};sf=tgz#/dose-%{shortcommit0}.tar.gz`
		`-`
		`- # Patches.`
		`- # All sent upstream 2021-01-21.`
		`- Patch1: 0001-Enable-use-of-ocaml-base64-to-provide-Base64-functio.patch`
		`- Patch2: 0002-Enable-debuginfo-generation.patch`
		`- Patch3: 0003-Use-ounit2.patch`
		`- Patch4: 0004-Makefile.config.in-Disable-runtime-variant-pic.patch`
		`+ Source0: https://gitlab.com/irill/dose3/-/archive/%{version}/%{libname}-%{version}.tar.gz`

		`- BuildRequires: make`
		`- BuildRequires: autoconf, automake`
		`+ # Use oUnit2 instead of oUnit`
		`+ Patch0: 0001-Use-ounit2.patch`
		`+ # We do not need stdlib-shims, which provides backwards compatibility`
		`+ Patch1: 0002-Do-not-depend-on-stdlib-shims.patch`

		`BuildRequires: ocaml`
		`- BuildRequires: ocaml-ocamlbuild`
		`- BuildRequires: ocaml-ocamldoc`
		`+ BuildRequires: ocaml-dune`
		`+ BuildRequires: ocaml-odoc`
		`BuildRequires: ocaml-ocamlgraph-devel`
		`- BuildRequires: ocaml-findlib-devel`
		`+ BuildRequires: ocaml-findlib`
		`BuildRequires: ocaml-extlib-devel`
		`- BuildRequires: ocaml-expat-devel`
		`BuildRequires: ocaml-re-devel`
		`- BuildRequires: ocaml-seq-devel`
		`BuildRequires: ocaml-cudf-devel`
		`+ BuildRequires: ocaml-parmap-devel`
		`BuildRequires: ocaml-cppo`
		`+ BuildRequires: ocaml-camlbz2-devel`
		`BuildRequires: ocaml-zip-devel`
		`BuildRequires: ocaml-ounit-devel`
		`BuildRequires: ocaml-base64-devel >= 3.4.0-1`
		`@@ -50,11 +39,19 @@`

		`BuildRequires: perl, perl-generators`

		`+ # Test dependencies`
		`+ BuildRequires: dpkg`
		`+ BuildRequires: %{py3_dist pyyaml}`
		`+`
		`# Needs latex for documentation.`
		`- BuildRequires: texlive`
		`- BuildRequires: texlive-comment`
		`- BuildRequires: hevea`
		`+ BuildRequires: tex(latex)`
		`+ BuildRequires: tex(comment.sty)`
		`+ BuildRequires: pandoc`
		`BuildRequires: graphviz`
		`+ BuildRequires: poetry`
		`+ BuildRequires: %{py3_dist sphinx}`
		`+ BuildRequires: %{py3_dist sphinx_rtd_theme}`
		`+ BuildRequires: %{py3_dist wheel}`

		`# Depend on pod2man, pod2html.`
		`BuildRequires: /usr/bin/pod2man`
		`@@ -94,30 +91,28 @@`
		`for manipulating packages of various formats.`

		`%prep`
		`- %autosetup -p1 -n dose-%{shortcommit0} #dose3-%{version}`
		`- # Patches touch configure.ac.`
		`- autoreconf -i`
		`+ %autosetup -p1 -n %{libname}-%{version}`

		`- # I think we want to package the .cmx files if possible.`
		`- sed "s/.cmx /.cmxignore /g" -i Makefile`
		`- sed "s,.cmxs,.cmxs _build/doselibs/*.cmx,g" -i Makefile`
		`- sed "s,cmxa cmxs,cmx cmxa cmxs,g" -i Makefile.config.in`
		`-`
		`- # Fix an issue with re 1.7.3+`
		`- sed "s/module Str = Re_str/module Str = Re.Str/g" -i rpm/version.ml`
		`+ # Do not run linkcheck; the koji builders have no network access`
		`+ sed -i 's/html linkcheck/html/' doc/rtd/Makefile`

		`%build`
		`- %configure --with-zip --with-oUnit --with-rpm4 --with-xml`
		`-`
		`- # Build fails when built with %{?_smp_mflags} and thus we can't use the magic macro.`
		`- make`
		`- make doc man`
		`+ dune build %{?_smp_mflags} --display=verbose @install`
		`+ dune build %{?_smp_mflags} @doc`
		`+ # FIXME: parallel build does not work`
		`+ make -C doc`

		`%install`
		`- # Apparently, the make_install macro doesn't work on rawhide?`
		`- # fails with something like: install -- invalid option a`
		`- # So...`
		`- make install DESTDIR=%{buildroot}`
		`+ dune install --destdir=%{buildroot}`
		`+`
		`+ # We do not want the dune markers`
		`+ find _build/default/_doc/_html -name .dune-keep -delete`
		`+`
		`+ # We do not want the ml files`
		`+ find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete`
		`+`
		`+ # We install the documentation with the doc macro`
		`+ rm -fr %{buildroot}%{_prefix}/doc`

		`# Install manpages.`
		`mkdir -p %{buildroot}%{_mandir}/man1/`
		`@@ -127,35 +122,42 @@`
		`cp -a doc/manpages/*.5 %{buildroot}%{_mandir}/man5/`
		`cp -a doc/manpages/*.1 %{buildroot}%{_mandir}/man1/`

		`- # Rewrite symlinks.`
		`- rm -f %{buildroot}%{_bindir}/rpmcheck`
		`- rm -f %{buildroot}%{_bindir}/debcheck`
		`- rm -f %{buildroot}%{_bindir}/eclipsecheck`
		`- ln -s %{_bindir}/distcheck %{buildroot}%{_bindir}/rpmcheck`
		`- ln -s %{_bindir}/distcheck %{buildroot}%{_bindir}/debcheck`
		`- ln -s %{_bindir}/distcheck %{buildroot}%{_bindir}/eclipsecheck`
		`+ %check`
		`+ dune runtest`

		`%files`
		`%license COPYING`
		`- %doc README.architecture`
		`- %{_libdir}/ocaml/%{libname}`
		`+ %doc CHANGES CREDITS README.architecture`
		`+ %dir %{_libdir}/ocaml/%{libname}/`
		`+ %dir %{_libdir}/ocaml/%{libname}/algo/`
		`+ %dir %{_libdir}/ocaml/%{libname}/common/`
		`+ %dir %{_libdir}/ocaml/%{libname}/debian/`
		`+ %dir %{_libdir}/ocaml/%{libname}/doseparse/`
		`+ %dir %{_libdir}/ocaml/%{libname}/npm/`
		`+ %dir %{_libdir}/ocaml/%{libname}/opam2/`
		`+ %dir %{_libdir}/ocaml/%{libname}/opencsw/`
		`+ %dir %{_libdir}/ocaml/%{libname}/pef/`
		`+ %dir %{_libdir}/ocaml/%{libname}/versioning/`
		`+ %{_libdir}/ocaml/%{libname}/META`
		`+ %{_libdir}/ocaml/%{libname}//.cma`
		`+ %{_libdir}/ocaml/%{libname}//.cmi`
		`%ifarch %{ocaml_native_compiler}`
		`- %exclude %{_libdir}/ocaml//.a`
		`- %exclude %{_libdir}/ocaml//.cmx`
		`- %exclude %{_libdir}/ocaml//.cmxa`
		`+ %{_libdir}/ocaml/%{libname}//.cmxs`
		`%endif`
		`- %exclude %{_libdir}/ocaml//.cmi`
		`- %{_libdir}/ocaml/stublibs/*.so`
		`- %{_libdir}/ocaml/stublibs/*.so.owner`

		`%files devel`
		`%license COPYING`
		`+ %doc _build/default/_doc/_html/*`
		`+ %{_libdir}/ocaml/%{libname}/dune-package`
		`+ %{_libdir}/ocaml/%{libname}/opam`
		`%ifarch %{ocaml_native_compiler}`
		`- %{_libdir}/ocaml//.a`
		`- %{_libdir}/ocaml//.cmx`
		`- %{_libdir}/ocaml//.cmxa`
		`+ %{_libdir}/ocaml/%{libname}//.a`
		`+ %{_libdir}/ocaml/%{libname}//.cmx`
		`+ %{_libdir}/ocaml/%{libname}//.cmxa`
		`%endif`
		`- %{_libdir}/ocaml//.cmi`
		`+ %{_libdir}/ocaml/%{libname}//.cmt`
		`+ %{_libdir}/ocaml/%{libname}//.cmti`
		`+ %{_libdir}/ocaml/%{libname}//.mli`

		`%files -n dose3-tools`
		`%license COPYING`
		`@@ -163,20 +165,29 @@`
		`%doc doc/apt-external-solvers.primer/*.pdf`
		`%doc doc/apt-cudf/`
		`%{_bindir}/apt-cudf`
		`- %{_bindir}/ceve`
		`- %{_bindir}/challenged`
		`- %{_bindir}/deb-buildcheck`
		`- %{_bindir}/deb-coinstall`
		`- %{_bindir}/debcheck`
		`- %{_bindir}/eclipsecheck`
		`- %{_bindir}/distcheck`
		`- %{_bindir}/outdated`
		`- %{_bindir}/rpmcheck`
		`+ %{_bindir}/dose-builddebcheck`
		`+ %{_bindir}/dose-ceve`
		`+ %{_bindir}/dose-challenged`
		`+ %{_bindir}/dose-deb-coinstall`
		`+ %{_bindir}/dose-distcheck`
		`+ %{_bindir}/dose-outdated`
		`%{_mandir}/man1/.1`
		`%{_mandir}/man5/.5`
		`%{_mandir}/man8/.8`

		`%changelog`
		`+ * Tue May 4 2021 Jerry James <loganjerry@gmail.com> - 6.1-1`
		`+ - Version 6.1`
		`+ - Drop upstreamed patches 0001, 0002, and 0004`
		`+ - Rename patch 0003 to 0001`
		`+ - Add 0002-Do-not-depend-on-stdlib-shims.patch`
		`+ - Remove unneeded BRs: autoconf, automake, make, ocaml-ocamlbuild,`
		`+ ocaml-ocamldoc, ocaml-expat-devel, ocaml-seq-devel, hevea`
		`+ - Add BRs: ocaml-dune, ocaml-odoc, ocaml-parmap-devel, ocaml-camlbz2-devel,`
		`+ dpkg, pandoc, poetry, and python3 packages poetry, sphinx, sphinx_rtd_theme,`
		`+ and wheel`
		`+ - Build, install, and test with dune`
		`+`
		`* Mon Mar 1 21:40:04 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 5.0.1-32.20200502git24316fe`
		`- OCaml 4.12.0 build`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (dose-24316fe.tar.gz) = a23d7b8ae857421c1687abda53ced0e76cec32efa19295638e69933bce5012e396948b0504ab9d97242f877977152f4d720ce9a33797386d3dd760599da6c710`
		`+ SHA512 (dose3-6.1.tar.gz) = 603462645bac190892a816ecb36ef7b9c52f0020f8d7710dc430e2db65122090fdedb24a8d2e03c32bf53a96515f5b51499603b839680d0a7a2146d6e0fb6e34`

jjames commented 3 years ago

I would like to update ocaml-ocamlgraph to version 2.0.0. The frama-c package is ready to go; the current version works with both ocamlgraph 1.8.8 and 2.0.0. This pull request is to update ocaml-dose3 to a version that supports ocamlgraph 2.0.0. If you merge this request, do not build until I get the new ocamlgraph version built in Rawhide. I am happy to do the build for you, if you prefer.

For a look at all of the builds involved, see https://copr.fedorainfracloud.org/coprs/jjames/ocamlgraph/.