From 636edcf283f27d301f239f34549b4089170e5594 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Mon, 10 Jul 2023 14:17:55 -0600
Subject: [PATCH] Version 0.14.2

Other changes:
- Convert License tag to SPDX
- Change license for the doc subpackage to CC0
- Make the doc subpackage noarch
- Fold the devel subpackage into the main package
- Ship the manual as HTML instead of asciidoc source
- Use new OCaml macros
---
 .gitignore            |  1 +
 ocaml-ocamlbuild.spec | 86 +++++++++++++++++++------------------------
 sources               |  2 +-
 3 files changed, 39 insertions(+), 50 deletions(-)

diff --git a/.gitignore b/.gitignore
index daef5c0..fff4eea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /ocaml-ocamlbuild-0.11.0.tar.gz
 /ocaml-ocamlbuild-0.12.0.tar.gz
 /ocaml-ocamlbuild-0.14.0.tar.gz
+/ocamlbuild-0.14.2.tar.gz
diff --git a/ocaml-ocamlbuild.spec b/ocaml-ocamlbuild.spec
index b078468..9c390cc 100644
--- a/ocaml-ocamlbuild.spec
+++ b/ocaml-ocamlbuild.spec
@@ -1,39 +1,43 @@
-%undefine _package_note_flags
+# NOTE: there is no devel subpackage because the main package *IS* a devel
+# package.
+
 %ifnarch %{ocaml_native_compiler}
 %global debug_package %{nil}
 %endif
 
 Name:          ocaml-ocamlbuild
-Version:       0.14.0
-Release:       36%{?dist}
+Version:       0.14.2
+Release:       1%{?dist}
 
 Summary:       Build tool for OCaml libraries and programs
 
-License:       LGPLv2 with exceptions
+License:       LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
 
 URL:           https://github.com/ocaml/ocamlbuild
-Source0:       https://github.com/ocaml/ocamlbuild/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:       %{url}/archive/%{version}/ocamlbuild-%{version}.tar.gz
 
 BuildRequires: make
 BuildRequires: ocaml >= 4.04.0
+BuildRequires: ncurses
+BuildRequires: asciidoc
+BuildRequires: python3-pygments
+
+# Ocamlbuild can invoke tput; see src/display.ml
+Requires:      ncurses
+
+# This can be removed when F42 reaches EOL
+Obsoletes:     %{name}-devel < 0.14.0-37
+Provides:      %{name}-devel = %{version}-%{release}
 
 
 %description
 OCamlbuild is a build tool for building OCaml libraries and programs.
 
 
-%package devel
-Summary:       Development files for %{name}
-Requires:      %{name}%{?_isa} = %{version}-%{release}
-
-
-%description devel
-This package contains development files for %{name}.
-
-
 %package doc
 Summary:       Documentation for %{name}
-Requires:      %{name}%{?_isa} = %{version}-%{release}
+License:       CC0
+BuildArch:     noarch
 
 
 %description doc
@@ -41,7 +45,7 @@ This package contains the manual for %{name}.
 
 
 %prep
-%setup -q -n ocamlbuild-%{version}
+%autosetup -n ocamlbuild-%{version}
 
 
 %build
@@ -68,11 +72,12 @@ make \
      OCAMLOPT="ocamlopt -g"
 %endif
 
+# Build the manual
+asciidoc manual/manual.adoc
+
 
 %install
-make install \
-     DESTDIR=$RPM_BUILD_ROOT \
-     CHECK_IF_PREINSTALLED=false
+%make_install CHECK_IF_PREINSTALLED=false
 
 # The install copies ocamlbuild & ocamlbuild.{byte or native}.
 # Symlink them instead.
@@ -84,46 +89,29 @@ ln -sf ocamlbuild.byte ocamlbuild
 %endif
 popd
 
-# Remove the META file.  It will be replaced by ocaml-ocamlfind (findlib).
-rm $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild/META
+%ocaml_files -n
 
 
-%files
+%files -f .ofiles
 %doc Changes Readme.md VERSION
 %license LICENSE
-%{_bindir}/ocamlbuild
-%{_bindir}/ocamlbuild.byte
-%ifarch %{ocaml_native_compiler}
-%{_bindir}/ocamlbuild.native
-%endif
-%{_mandir}/man1/ocamlbuild.1*
-%{_libdir}/ocaml/ocamlbuild
-%ifarch %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/ocamlbuild/*.a
-%exclude %{_libdir}/ocaml/ocamlbuild/*.o
-%exclude %{_libdir}/ocaml/ocamlbuild/*.cmx
-%exclude %{_libdir}/ocaml/ocamlbuild/*.cmxa
-%endif
-%exclude %{_libdir}/ocaml/ocamlbuild/*.mli
-
-
-%files devel
-%license LICENSE
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/ocamlbuild/*.a
-%{_libdir}/ocaml/ocamlbuild/*.o
-%{_libdir}/ocaml/ocamlbuild/*.cmx
-%{_libdir}/ocaml/ocamlbuild/*.cmxa
-%endif
-%{_libdir}/ocaml/ocamlbuild/*.mli
 
 
 %files doc
-%license LICENSE
-%doc manual/*
+%license manual/LICENSE
+%doc manual/manual.html
 
 
 %changelog
+* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 0.14.2-1
+- Version 0.14.2
+- Convert License tag to SPDX
+- Change license for the doc subpackage to CC0
+- Make the doc subpackage noarch
+- Fold the devel subpackage into the main package
+- Ship the manual as HTML instead of asciidoc source
+- Use new OCaml macros
+
 * Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-36
 - Rebuild OCaml packages for F38
 
diff --git a/sources b/sources
index 9108f79..9c0a586 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ocaml-ocamlbuild-0.14.0.tar.gz) = ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
+SHA512 (ocamlbuild-0.14.2.tar.gz) = f568bf10431a1f701e8bd7554dc662400a0d978411038bbad93d44dceab02874490a8a5886a9b44e017347e7949997f13f5c3752f74e1eb5e273d2beb19a75fd