Version 1.4.0.

ocaml-csexp-result.patch

@@ -10,7 +10,7 @@
  build: [
 --- a/src/csexp.ml
 +++ b/src/csexp.ml
-@@ -15,12 +15,6 @@ end
+@@ -102,12 +102,6 @@ end
  module Make (Sexp : Sexp) = struct
    open Sexp
  
@@ -23,7 +23,7 @@
    module Parser = struct
      exception Parse_error of string
  
-@@ -283,9 +277,9 @@ module Make (Sexp : Sexp) = struct
+@@ -370,9 +364,9 @@ module Make (Sexp : Sexp) = struct
  
      module Monad : Monad
  
@@ -37,37 +37,37 @@
    module Make_parser (Input : Input) = struct
 --- a/src/csexp.mli
 +++ b/src/csexp.mli
-@@ -33,24 +33,24 @@ module Make (Sexp : Sexp) : sig
+@@ -34,24 +34,24 @@ module type S = sig
        [s]. It is an error for [s] to contain a S-expression followed by more
        data. In case of error, the offset of the error as well as an error
        message is returned. *)
--  val parse_string : string -> (Sexp.t, int * string) Result.t
-+  val parse_string : string -> (Sexp.t, int * string) result
+-  val parse_string : string -> (sexp, int * string) Result.t
++  val parse_string : string -> (sexp, int * string) result
  
    (** [parse_string s] parses a sequence of S-expressions encoded in canonical
        form in [s] *)
--  val parse_string_many : string -> (Sexp.t list, int * string) Result.t
-+  val parse_string_many : string -> (Sexp.t list, int * string) result
+-  val parse_string_many : string -> (sexp list, int * string) Result.t
++  val parse_string_many : string -> (sexp list, int * string) result
  
    (** Read exactly one canonical S-expressions from the given channel. Note that
        this function never raises [End_of_file]. Instead, it returns [Error]. *)
--  val input : in_channel -> (Sexp.t, string) Result.t
-+  val input : in_channel -> (Sexp.t, string) result
+-  val input : in_channel -> (sexp, string) Result.t
++  val input : in_channel -> (sexp, string) result
  
    (** Same as [input] but returns [Ok None] if the end of file has already been
        reached. If some more characters are available but the end of file is
        reached before reading a complete S-expression, this function returns
        [Error]. *)
--  val input_opt : in_channel -> (Sexp.t option, string) Result.t
-+  val input_opt : in_channel -> (Sexp.t option, string) result
+-  val input_opt : in_channel -> (sexp option, string) Result.t
++  val input_opt : in_channel -> (sexp option, string) result
  
    (** Read many S-expressions until the end of input is reached. *)
--  val input_many : in_channel -> (Sexp.t list, string) Result.t
-+  val input_many : in_channel -> (Sexp.t list, string) result
+-  val input_many : in_channel -> (sexp list, string) Result.t
++  val input_many : in_channel -> (sexp list, string) result
  
    (** {2 Serialising} *)
  
-@@ -352,18 +352,18 @@ module Make (Sexp : Sexp) : sig
+@@ -353,18 +353,18 @@ module type S = sig
        val bind : 'a t -> ('a -> 'b t) -> 'b t
      end
  
@@ -82,11 +82,11 @@
    [@@@warning "-3"]
  
    module Make_parser (Input : Input) : sig
--    val parse : Input.t -> (Sexp.t, string) Result.t Input.Monad.t
-+    val parse : Input.t -> (Sexp.t, string) result Input.Monad.t
+-    val parse : Input.t -> (sexp, string) Result.t Input.Monad.t
++    val parse : Input.t -> (sexp, string) result Input.Monad.t
  
--    val parse_many : Input.t -> (Sexp.t list, string) Result.t Input.Monad.t
-+    val parse_many : Input.t -> (Sexp.t list, string) result Input.Monad.t
+-    val parse_many : Input.t -> (sexp list, string) Result.t Input.Monad.t
++    val parse_many : Input.t -> (sexp list, string) result Input.Monad.t
    end
    [@@deprecated "Use Parser module instead"]
  end

ocaml-csexp.spec

@@ -15,8 +15,8 @@
 %bcond_with dune
 
 Name:           ocaml-%{srcname}
-Version:        1.3.2
-Release:        2%{?dist}
+Version:        1.4.0
+Release:        1%{?dist}
 Summary:        Parsing and printing of S-expressions in canonical form
 
 License:        MIT
@@ -68,9 +68,9 @@ cd src
 ocamlc $OCFLAGS -output-obj csexp.mli
 ocamlc $OCFLAGS -a -o csexp.cma csexp.ml
 %ifarch %{ocaml_native_compiler}
-ocamlopt $OFLAGS -ccopt "%{optflags}" -cclib "$RPM_LD_FLAGS" -a \
+ocamlopt $OFLAGS -ccopt "%{build_cflags}" -cclib "%{build_ldflags}" -a \
   -o csexp.cmxa csexp.ml
-ocamlopt $OFLAGS -ccopt "%{optflags}" -cclib "$RPM_LD_FLAGS" -shared \
+ocamlopt $OFLAGS -ccopt "%{build_cflags}" -cclib "%{build_ldflags}" -shared \
   -o csexp.cmxs csexp.ml
 %endif
 cd -
@@ -116,7 +116,7 @@ plugin(native) = "csexp.cmxs"
 EOF
 
 cat >> %{buildroot}%{_libdir}/ocaml/%{srcname}/dune-package << EOF
-(lang dune 2.5)
+(lang dune 2.8)
 (name csexp)
 (version %{version})
 (library
@@ -171,6 +171,9 @@ EOF
 %{_libdir}/ocaml/%{srcname}/*.mli
 
 %changelog
+* Wed Feb 24 2021 Jerry James <loganjerry@gmail.com> - 1.4.0-1
+- Version 1.4.0
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (csexp-1.3.2.tbz) = ff1bd6a7c6bb3a73ca9ab0506c9ec1f357657deaa9ecc7eb32955817d9b0f266d976af3e2b8fc34c621cb0caf1fde55f9a609dd184e2054f500bf09afeb83026
+SHA512 (csexp-1.4.0.tbz) = 604a5094fbbf61f497b342ad0aa8ec25275b2a904cd0c1823fc40daa54a15796b360374ff495c0d8ca3b4c1e6723b2ce37e030857fae131222606de818fb8129