SOURCES/macros.ocaml-srpm

@@ -4,52 +4,12 @@
 # compilation is available on a particular architecture.
 
 # Architectures that support the OCaml native code compiler.
-%ocaml_native_compiler  aarch64 %{power64} riscv64 s390x x86_64
+%ocaml_native_compiler  aarch64 %{arm} %{ix86} ppc ppc64 ppc64le riscv64 s390x sparc sparcv9 x86_64
 
 # Architectures that support native dynamic linking of OCaml code.
-%ocaml_natdynlink       aarch64 %{power64} riscv64 s390x x86_64
+%ocaml_natdynlink       aarch64 %{arm} %{ix86} ppc ppc64 ppc64le riscv64 s390x sparc sparcv9 x86_64
 
 # Architectures that support profiling of native code (ocamlopt -p).
 # This was removed in OCaml 4.09.
 # https://github.com/ocaml/ocaml/pull/2314
 %ocaml_native_profiling %{nil}
-
-# Toplevel OCaml directory
-%ocamldir %{_libdir}/ocaml
-
-# Common elements for all OCaml packages.
-#
-# ExcludeArch: OCaml packages have not been built on i686 since OCaml 5 was
-#     introduced in Fedora 39.
-# -d: most OCaml packages have no ELF objects when built on a bytecode-only
-#     architecture, so debuginfo generation is suppressed.  Use this flag to
-#     enable a debuginfo package on such architectures; i.e., when the package
-#     contains an ELF object even on bytecode-only architectures.
-%ocaml_pkg(d) %{lua:
-  print("ExcludeArch: %{ix86}\\n")
-  if not opt.d then
-    local arch = rpm.expand("%{_target_cpu}")
-    local native = rpm.expand("%{ocaml_native_compiler}")
-    if not string.find(native, arch) then
-      rpm.define('debug_package %{nil}')
-    end
-  end
-}
-
-# Generate %package and %files definitions for a doc subpackage,
-# containing content generated by odoc.
-# Use on the top-level only, preferably just before %prep.
-#
-# Options:
-# -L: specify the license file name.  Example:
-#     %odoc_package -L LICENSE
-%odoc_package(L:) %{expand:
-%package doc
-BuildArch: noarch
-BuildRequires: ocaml-odoc
-Summary: Documentation for %{name}
-%description doc
-Developer documentation for %{name}.
-%files doc
-%doc _build/default/_doc/_html/*
-%{?-L:%%license %{-L*} %*}}

SPECS/ocaml-srpm-macros.spec

@@ -3,17 +3,19 @@
 # architectures.  A further subset of architectures support native
 # dynamic linking.
 #
-# This package contains a file needed to define some RPM macros
+# This package contains a single file needed to define some RPM macros
 # which are required before any SRPM is built.
 #
 # See also: https://bugzilla.redhat.com/show_bug.cgi?id=1087794
 
+%global macros_dir %{_rpmconfigdir}/macros.d
+
 Name:           ocaml-srpm-macros
-Version:        10
-Release:        3%{?dist}
+Version:        6
+Release:        6%{?dist}
 
 Summary:        OCaml architecture macros
-License:        GPL-2.0-or-later
+License:        GPLv2+
 
 BuildArch:      noarch
 
@@ -34,57 +36,21 @@ SRPMS.  It does not pull in any other OCaml dependencies.
 
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{rpmmacrodir}
-install -p -m 0644 %{SOURCE0} $RPM_BUILD_ROOT%{rpmmacrodir}/macros.ocaml-srpm
+mkdir -p $RPM_BUILD_ROOT%{macros_dir}
+install -m 0644 %{SOURCE0} $RPM_BUILD_ROOT%{macros_dir}/macros.ocaml-srpm
 
 
 %files
-%{rpmmacrodir}/macros.ocaml-srpm
+%{macros_dir}/macros.ocaml-srpm
 
 
 %changelog
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 10-3
-- Bump release for June 2024 mass rebuild
-
-* Fri May 31 2024 Richard W.M. Jones <rjones@redhat.com> - 10-2
-- Bump and rebuild
-
-* Thu May 23 2024 Jerry James <loganjerry@gmail.com> - 10-1
-- Update OCaml native arches for OCaml 5.2
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Oct  4 2023 Jerry James <loganjerry@gmail.com> - 9-1
-- Update OCaml native arches for OCaml 5.1
-- Remove the Python file and some macros (now in ocaml-rpm-macros)
-- Add %%ocaml_pkg macro for common declarations
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Jul 10 2023 Richard W.M. Jones <rjones@redhat.com> - 8-1
-- Update OCaml native archs for OCaml 5.0
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Feb 16 2022 Jerry James <loganjerry@gmail.com> - 7-1
-- Add odoc and dune macros
-- Add ocaml_files.py to support %%files automation
-- Use %%rpmmacrodir instead of a custom macro
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 6-6
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6-5
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild