Compare commits

...

No commits in common. "c9s" and "c10s" have entirely different histories.
c9s ... c10s

4 changed files with 88 additions and 31 deletions

6
gating.yaml Executable file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1,26 +1,26 @@
%undefine _package_note_flags
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
ExcludeArch: %{ix86}
Name: ocaml-augeas
Version: 0.6
Release: 23%{?dist}
Release: 37%{?dist}
Summary: OCaml bindings for Augeas configuration API
License: LGPLv2+ with exceptions
License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
URL: http://people.redhat.com/~rjones/augeas/files/
Source0: http://people.redhat.com/~rjones/augeas/files/%{name}-%{version}.tar.gz
URL: https://people.redhat.com/~rjones/augeas/files/
Source0: https://people.redhat.com/~rjones/augeas/files/%{name}-%{version}.tar.gz
# Upstream patch to enable debuginfo.
Patch1: 0001-Use-ocamlopt-g-option.patch
# Const-correctness fix for OCaml 4.09+
Patch2: 0002-caml_named_value-returns-const-value-pointer-in-OCam.patch
BuildRequires: make
BuildRequires: make
BuildRequires: ocaml >= 3.09.0
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-findlib
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros
BuildRequires: augeas-devel >= 0.1.0
BuildRequires: chrpath
%description
@ -30,7 +30,7 @@ files. This provides complete OCaml bindings for Augeas.
%package devel
Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@ -41,10 +41,13 @@ developing applications that use %{name}.
%prep
%autosetup -p1
# Pass -g to ocamlmklib
sed -i 's/ocamlmklib/& -g/' Makefile.in
%build
%configure
%if %opt
%ifarch %{ocaml_native_compiler}
make
%else
make mlaugeas.cma test_augeas
@ -64,39 +67,66 @@ mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
# The upstream 'make install' rule is missing '*.so' and distributes
# '*.cmi' instead of just the augeas.cmi file. Temporary fix:
#make install
%if %opt
%ifarch %{ocaml_native_compiler}
ocamlfind install augeas META *.mli *.cmx *.cma *.cmxa *.a augeas.cmi *.so
%else
ocamlfind install augeas META *.mli *.cma *.a augeas.cmi *.so
%endif
chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so
%ocaml_files
%files
%doc COPYING.LIB
%{_libdir}/ocaml/augeas
%if %opt
%exclude %{_libdir}/ocaml/augeas/*.a
%exclude %{_libdir}/ocaml/augeas/*.cmxa
%exclude %{_libdir}/ocaml/augeas/*.cmx
%endif
%exclude %{_libdir}/ocaml/augeas/*.mli
%{_libdir}/ocaml/stublibs/*.so
%{_libdir}/ocaml/stublibs/*.so.owner
%files -f .ofiles
%license COPYING.LIB
%files devel
%files devel -f .ofiles-devel
%doc html
%if %opt
%{_libdir}/ocaml/augeas/*.a
%{_libdir}/ocaml/augeas/*.cmxa
%{_libdir}/ocaml/augeas/*.cmx
%endif
%{_libdir}/ocaml/augeas/*.mli
%changelog
* Wed Oct 30 2024 Troy Dawson <tdawson@redhat.com> - 0.6-37
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Tue Jun 25 2024 Troy Dawson <tdawson@redhat.com> - 0.6-36
- Bump release for June 2024 mass rebuild
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 0.6-35
- OCaml 5.2.0 ppc64le fix
* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 0.6-34
- OCaml 5.2.0 for Fedora 41
* Mon Apr 08 2024 Richard W.M. Jones <rjones@redhat.com> - 0.6-33
- No change, just bump release.
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 18 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6-29
- OCaml 5.1.1 + s390x code gen fix for Fedora 40
* Tue Dec 12 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6-28
- OCaml 5.1.1 rebuild for Fedora 40
* Thu Oct 05 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6-27
- OCaml 5.1 rebuild for Fedora 40
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jul 11 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6-25
- OCaml 5.0 rebuild for Fedora 39
* Mon Jul 10 2023 Jerry James <loganjerry@gmail.com> - 0.6-24
- OCaml 5.0.0 rebuild
- Convert License tag to SPDX
- Use new OCaml macros
* Tue Jan 24 2023 Richard W.M. Jones <rjones@redhat.com> - 0.6-23
- Rebuild OCaml packages for F38

8
tests/basic-test.sh Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash -
set -e
set -x
# Compile trivial augeas program.
echo 'Augeas.create "/" None [AugNoLoad]' > augtest.ml
ocamlfind ocamlopt -package augeas augtest.ml -linkpkg -o augtest
./augtest

13
tests/tests.yml Executable file
View File

@ -0,0 +1,13 @@
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
required_packages:
- ocaml
- ocaml-findlib
- ocaml-augeas-devel
tests:
- simple:
dir: .
run: ./basic-test.sh