.gitignore

@@ -1 +1 @@
-SOURCES/ocamlbuild-0.14.3.tar.gz
+SOURCES/ocaml-ocamlbuild-0.14.0.tar.gz

.ocaml-ocamlbuild.metadata

@@ -1 +1 @@
-3082c39b670541567dd03b3d8cd8bd372a001d82 SOURCES/ocamlbuild-0.14.3.tar.gz
+be89f02fd406116aa0c334cb4eac53a7974bc6dd SOURCES/ocaml-ocamlbuild-0.14.0.tar.gz

SPECS/ocaml-ocamlbuild.spec

@@ -1,47 +1,38 @@
-# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
-ExcludeArch: %{ix86}
-
-# 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.3
+Version:       0.14.0
-Release:       7%{?dist}
+Release:       27%{?dist}
 
 Summary:       Build tool for OCaml libraries and programs
 
-License:       LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
+License:       LGPLv2 with exceptions
 
 URL:           https://github.com/ocaml/ocamlbuild
-Source0:       %{url}/archive/%{version}/ocamlbuild-%{version}.tar.gz
+Source0:       https://github.com/ocaml/ocamlbuild/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires: make
 BuildRequires: ocaml >= 4.04.0
-BuildRequires: ocaml-rpm-macros
-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}
-License:       CC0
+Requires:      %{name}%{?_isa} = %{version}-%{release}
-BuildArch:     noarch
 
 
 %description doc
@@ -49,7 +40,7 @@ This package contains the manual for %{name}.
 
 
 %prep
-%autosetup -n ocamlbuild-%{version}
+%setup -q -n ocamlbuild-%{version}
 
 
 %build
@@ -57,13 +48,10 @@ make configure \
   OCAMLBUILD_PREFIX=%{_prefix} \
   OCAMLBUILD_BINDIR=%{_bindir} \
   OCAMLBUILD_LIBDIR=%{_libdir}/ocaml \
-  OCAMLBUILD_MANDIR=%{_mandir} \
 %ifarch %{ocaml_native_compiler}
-  OCAML_NATIVE=true \
+  OCAML_NATIVE=true
-  OCAML_NATIVE_TOOLS=true
 %else
-  OCAML_NATIVE=false \
+  OCAML_NATIVE=false
-  OCAML_NATIVE_TOOLS=false
 %endif
 
 # Parallel builds fail.
@@ -76,12 +64,11 @@ make \
      OCAMLOPT="ocamlopt -g"
 %endif
 
-# Build the manual
-asciidoc manual/manual.adoc
-
 
 %install
-%make_install CHECK_IF_PREINSTALLED=false
+make install \
+     DESTDIR=$RPM_BUILD_ROOT \
+     CHECK_IF_PREINSTALLED=false
 
 # The install copies ocamlbuild & ocamlbuild.{byte or native}.
 # Symlink them instead.
@@ -93,107 +80,65 @@ ln -sf ocamlbuild.byte ocamlbuild
 %endif
 popd
 
-%ocaml_files -n
+# Install the man page, which for some reason is not copied
+# in by the make install rule above.
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
+install -p -m 0644 man/ocamlbuild.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
+# Remove the META file.  It will be replaced by ocaml-ocamlfind (findlib).
+rm $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild/META
 
-%files -f .ofiles
+
+%files
 %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 doc
+%files devel
-%license manual/LICENSE
+%license LICENSE
-%doc manual/manual.html
+%ifarch %{ocaml_native_compiler}
-
+%{_libdir}/ocaml/ocamlbuild/*.a
-
+%{_libdir}/ocaml/ocamlbuild/*.o
-%changelog
+%{_libdir}/ocaml/ocamlbuild/*.cmx
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.14.3-7
+%{_libdir}/ocaml/ocamlbuild/*.cmxa
-- Bump release for October 2024 mass rebuild:
+%endif
-  Resolves: RHEL-64018
+%{_libdir}/ocaml/ocamlbuild/*.mli
-
-* Tue Jun 25 2024 Troy Dawson <tdawson@redhat.com> - 0.14.3-6
-- Bump release for June 2024 mass rebuild
-
-* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 0.14.3-5
-- OCaml 5.2.0 ppc64le fix
-
-* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 0.14.3-4
-- OCaml 5.2.0 for Fedora 41
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Jan 02 2024 Richard W.M. Jones <rjones@redhat.com> - 0.14.3-1
-- New upstream version 0.14.3 (RHBZ#1992935)
-
-* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 0.14.2-6
-- OCaml 5.1.1 + s390x code gen fix for Fedora 40
-
-* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 0.14.2-5
-- OCaml 5.1.1 rebuild for Fedora 40
-
-* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 0.14.2-4
-- OCaml 5.1 rebuild for Fedora 40
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 0.14.2-2
-- OCaml 5.0 rebuild for Fedora 39
-
-* 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
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-35
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jun 18 2022 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-33
-- OCaml 4.14.0 rebuild
-
-* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-32
-- Bump release and rebuild.
-
-* Fri Feb 04 2022 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-31
-- OCaml 4.13.1 rebuild to remove package notes
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-29
-- Bump and rebuild for OCaml 4.13.1
 
-* Mon Oct 04 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-28
+%files doc
-- OCaml 4.13.1 build
+%license LICENSE
+%doc manual/*
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-27
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Mon Jul 19 2021 Jerry James <loganjerry@gmail.com> - 0.14.0-26
+%changelog
-- Specify OCAMLBUILD_MANDIR to fix man page installation
+* Fri Mar 11 2022 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-27
+- Rebuild for EPEL
+resolves: rhbz#2060850
 
-* Mon Mar 15 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-26
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.14.0-26
-- Bump and rebuild for ELN broken deps.
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Sun Feb 28 22:16:45 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-25
+* Wed Jun 23 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-25
-- Bump release and rebuild.
+- Bump and rebuild
+  resolves: rhbz#1975312
 
-* Sun Feb 28 22:08:24 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 0.14.0-24
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.14.0-24
-- OCaml 4.12.0 build
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.0-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild