From: Jan Rękorajski Date: Mon, 22 Nov 2021 08:03:43 +0000 (+0100) Subject: - updated BRs and opt patch, rel 4 X-Git-Tag: auto/th/ocaml-curl-0.9.1-4 X-Git-Url: http://git.pld-linux.org/?p=packages%2Focaml-curl.git;a=commitdiff_plain;h=0680142db505e787c1c4238128fa621c511b9476 - updated BRs and opt patch, rel 4 --- diff --git a/ocaml-curl.spec b/ocaml-curl.spec index d04ad1d..4759640 100644 --- a/ocaml-curl.spec +++ b/ocaml-curl.spec @@ -12,7 +12,7 @@ Summary: OCaml Curl library (ocurl) Name: ocaml-%{pkgname} Version: 0.9.1 -Release: 3 +Release: 4 License: MIT Group: Libraries Source0: https://github.com/ygrek/ocurl/releases/download/%{version}/ocurl-%{version}.tar.gz @@ -23,6 +23,8 @@ BuildRequires: curl-devel >= 7.12.0 BuildRequires: gawk BuildRequires: ocaml >= 3.10.0-7 BuildRequires: ocaml-findlib-devel +BuildRequires: ocaml-lwt-devel +BuildRequires: ocaml-lwt-ppx-devel # Explicitly require Curl (fixes RHBZ#711261). Since ocaml-curl uses # -custom rather than ocamlmklib, automatic detection is infeasible. Requires: curl-devel >= 7.12.0 @@ -94,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT %doc examples/* %{_libdir}/ocaml/curl/*.a %{_libdir}/ocaml/curl/*.cmi +%{_libdir}/ocaml/curl/*.cmo %{_libdir}/ocaml/curl/*.cmt %{_libdir}/ocaml/curl/*.cmti %if %{with ocaml_opt} diff --git a/ocaml_opt.patch b/ocaml_opt.patch index 1c4c675..d21c171 100644 --- a/ocaml_opt.patch +++ b/ocaml_opt.patch @@ -1,6 +1,11 @@ ---- ocurl-0.7.1/Makefile.in~ 2014-05-12 22:10:26.000000000 +0200 -+++ ocurl-0.7.1/Makefile.in 2015-07-25 14:46:23.107163100 +0200 -@@ -32,7 +32,10 @@ +--- ocurl-0.9.1/Makefile.in.orig 2020-02-13 23:53:48.000000000 +0100 ++++ ocurl-0.9.1/Makefile.in 2021-11-22 09:01:46.344220377 +0100 +@@ -41,16 +41,19 @@ + ifeq (@OCAMLBEST@,opt) + TARGETS += curl.cmxa curl.cmx curl.cmxs + ifneq (@OCAML_PKG_lwt_unix@,no) +-TARGETS += curl_lwt.cmx curl_lwt.cmxs ++TARGETS += curl_lwt.cmx curl_lwt.cmxs curl_lwt$(EXT_OBJ) endif endif @@ -12,7 +17,13 @@ ifeq (@OCAML_HAS_BIN_ANNOT@,yes) INSTALL_TARGETS += curl.cmt curl.cmti endif -@@ -97,10 +97,10 @@ + ifneq (@OCAML_PKG_lwt_unix@,no) +-INSTALL_TARGETS += curl_lwt.cmi curl_lwt.mli curl_lwt$(EXT_OBJ) ++INSTALL_TARGETS += curl_lwt.cmi curl_lwt.mli + ifeq (@OCAML_HAS_BIN_ANNOT@,yes) + INSTALL_TARGETS += curl_lwt.cmt curl_lwt.cmti + endif +@@ -134,10 +137,10 @@ mkdir -p $(INSTALLDIR) $(INSTALLDATA) curl.cma $(INSTALLDIR) ifeq (@OCAMLBEST@,opt)