From a33a714a8d0d86e051f1e3c9ae84790a4cb32966 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Jul 11 2023 04:36:31 +0000 Subject: Build from git HEAD for OCaml 5.0.0 --- diff --git a/.gitignore b/.gitignore index 09fac91..afcdc2b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /tyxml-*.tbz +/tyxml-*.tar.gz diff --git a/ocaml-tyxml-seq.patch b/ocaml-tyxml-seq.patch index a9d97fb..648fd14 100644 --- a/ocaml-tyxml-seq.patch +++ b/ocaml-tyxml-seq.patch @@ -1,14 +1,14 @@ ---- a/dune-project 2021-04-22 04:28:38.000000000 -0600 -+++ b/dune-project 2022-02-20 13:54:46.769381898 -0700 -@@ -78,6 +78,5 @@ +--- a/dune-project 2023-06-22 05:45:17.000000000 -0600 ++++ b/dune-project 2023-06-25 21:21:32.824542280 -0600 +@@ -80,6 +80,5 @@ (alcotest :with-test) (re (>= 1.5.0)) - seq (uutf (>= 1.0.0)))) ---- a/lib/dune 2021-04-22 04:28:38.000000000 -0600 -+++ b/lib/dune 2022-02-20 13:55:30.753387619 -0700 +--- a/lib/dune 2023-06-22 05:45:17.000000000 -0600 ++++ b/lib/dune 2023-06-25 21:21:32.824542280 -0600 @@ -5,7 +5,7 @@ (modules_without_implementation Xml_sigs Html_sigs Svg_sigs Html_types Svg_types) @@ -18,13 +18,13 @@ (flags (:standard -safe-string)) ) ---- a/tyxml.opam 2021-04-22 04:28:38.000000000 -0600 -+++ b/tyxml.opam 2022-02-20 13:55:02.625383960 -0700 -@@ -15,7 +15,6 @@ depends: [ - "ocaml" {>= "4.02"} +--- a/tyxml.opam 2023-06-22 05:45:17.000000000 -0600 ++++ b/tyxml.opam 2023-06-25 21:21:32.825542265 -0600 +@@ -14,7 +14,6 @@ depends: [ + "ocaml" {>= "4.03"} "alcotest" {with-test} "re" {>= "1.5.0"} - "seq" "uutf" {>= "1.0.0"} + "odoc" {with-doc} ] - build: [ diff --git a/ocaml-tyxml.spec b/ocaml-tyxml.spec index 1200eb1..992bfd8 100644 --- a/ocaml-tyxml.spec +++ b/ocaml-tyxml.spec @@ -1,17 +1,19 @@ -%undefine _package_note_flags - -%ifnarch %{ocaml_native_compiler} -%global debug_package %{nil} -%endif +# The 4.5.0 release does not support OCaml 5.0. Build from git until the +# next release. +%global commit 407f41b2cc17ee636b4c5046b2efc16a26f27d8f +%global date 20230622 +%global forgeurl https://github.com/ocsigen/tyxml Name: ocaml-tyxml Version: 4.5.0 -Release: 16%{?dist} Summary: Build valid HTML and SVG documents +%forgemeta + +Release: 17%{?dist} License: LGPL-2.1-only WITH OCaml-LGPL-linking-exception URL: https://ocsigen.org/tyxml/ -Source0: https://github.com/ocsigen/tyxml/releases/download/%{version}/tyxml-%{version}.tbz +Source0: %{forgesource} # Fedora's OCaml is new enough that we do not need the seq shim Patch0: %{name}-seq.patch @@ -115,7 +117,7 @@ The %{name}-ppx-devel package contains libraries and signature files for developing applications that use %{name}-ppx. %prep -%autosetup -n tyxml-%{version} -p1 +%forgeautosetup -p1 %build %dune_build @@ -147,6 +149,9 @@ developing applications that use %{name}-ppx. %files ppx-devel -f .ofiles-tyxml-ppx-devel %changelog +* Mon Jul 10 2023 Jerry James - 4.5.0-17.20230622git407f41b +- Build from git HEAD for OCaml 5.0.0 + * Tue Jan 24 2023 Richard W.M. Jones - 4.5.0-16 - Rebuild OCaml packages for F38 diff --git a/sources b/sources index 95ae1e0..8b9e45b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tyxml-4.5.0.tbz) = 772535441b09c393d53c27152e65f404a0a541aa0cea1bda899a8d751ab64d1729237e583618c3ff33d75e3865d53503d1ea413c6bbc8c68c413347efd1709b3 +SHA512 (tyxml-407f41b2cc17ee636b4c5046b2efc16a26f27d8f.tar.gz) = f9791999d5df446dd99860d325d048a168234209188c720920ce88c0b7169d25d1b27c72883d2075951d5a1ec7782d2c8603492a1ab24f051037f11e4b05ec1b