diff --git a/.gitignore b/.gitignore index 3cfc1a3..777f97d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -ocaml-augeas-0.4.tar.gz -/ocaml-augeas-0.5.tar.gz -/ocaml-augeas-0.6.tar.gz +SOURCES/ocaml-augeas-0.6.tar.gz diff --git a/.ocaml-augeas.metadata b/.ocaml-augeas.metadata new file mode 100644 index 0000000..95f6ffd --- /dev/null +++ b/.ocaml-augeas.metadata @@ -0,0 +1 @@ +8590df106931c670cedeb2088f5b90cf538e04c1 SOURCES/ocaml-augeas-0.6.tar.gz diff --git a/0001-Use-ocamlopt-g-option.patch b/SOURCES/0001-Use-ocamlopt-g-option.patch similarity index 100% rename from 0001-Use-ocamlopt-g-option.patch rename to SOURCES/0001-Use-ocamlopt-g-option.patch diff --git a/0002-caml_named_value-returns-const-value-pointer-in-OCam.patch b/SOURCES/0002-caml_named_value-returns-const-value-pointer-in-OCam.patch similarity index 100% rename from 0002-caml_named_value-returns-const-value-pointer-in-OCam.patch rename to SOURCES/0002-caml_named_value-returns-const-value-pointer-in-OCam.patch diff --git a/ocaml-augeas.spec b/SPECS/ocaml-augeas.spec similarity index 82% rename from ocaml-augeas.spec rename to SPECS/ocaml-augeas.spec index d4eca10..db756e9 100644 --- a/ocaml-augeas.spec +++ b/SPECS/ocaml-augeas.spec @@ -1,26 +1,26 @@ -# OCaml packages not built on i686 since OCaml 5 / Fedora 39. -ExcludeArch: %{ix86} +%undefine _package_note_flags +%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) Name: ocaml-augeas Version: 0.6 -Release: 36%{?dist} +Release: 23%{?dist} Summary: OCaml bindings for Augeas configuration API -License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception +License: LGPLv2+ with exceptions -URL: https://people.redhat.com/~rjones/augeas/files/ -Source0: https://people.redhat.com/~rjones/augeas/files/%{name}-%{version}.tar.gz +URL: http://people.redhat.com/~rjones/augeas/files/ +Source0: http://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 +BuildRequires: ocaml-findlib-devel 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}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description devel @@ -41,13 +41,10 @@ developing applications that use %{name}. %prep %autosetup -p1 -# Pass -g to ocamlmklib -sed -i 's/ocamlmklib/& -g/' Makefile.in - %build %configure -%ifarch %{ocaml_native_compiler} +%if %opt make %else make mlaugeas.cma test_augeas @@ -67,62 +64,39 @@ 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 -%ifarch %{ocaml_native_compiler} +%if %opt ocamlfind install augeas META *.mli *.cmx *.cma *.cmxa *.a augeas.cmi *.so %else ocamlfind install augeas META *.mli *.cma *.a augeas.cmi *.so %endif -%ocaml_files +chrpath --delete $OCAMLFIND_DESTDIR/stublibs/dll*.so -%files -f .ofiles -%license COPYING.LIB +%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 devel -f .ofiles-devel +%files devel %doc html +%if %opt +%{_libdir}/ocaml/augeas/*.a +%{_libdir}/ocaml/augeas/*.cmxa +%{_libdir}/ocaml/augeas/*.cmx +%endif +%{_libdir}/ocaml/augeas/*.mli %changelog -* Tue Jun 25 2024 Troy Dawson - 0.6-36 -- Bump release for June 2024 mass rebuild - -* Wed Jun 19 2024 Richard W.M. Jones - 0.6-35 -- OCaml 5.2.0 ppc64le fix - -* Wed May 29 2024 Richard W.M. Jones - 0.6-34 -- OCaml 5.2.0 for Fedora 41 - -* Mon Apr 08 2024 Richard W.M. Jones - 0.6-33 -- No change, just bump release. - -* Thu Jan 25 2024 Fedora Release Engineering - 0.6-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.6-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 18 2023 Richard W.M. Jones - 0.6-29 -- OCaml 5.1.1 + s390x code gen fix for Fedora 40 - -* Tue Dec 12 2023 Richard W.M. Jones - 0.6-28 -- OCaml 5.1.1 rebuild for Fedora 40 - -* Thu Oct 05 2023 Richard W.M. Jones - 0.6-27 -- OCaml 5.1 rebuild for Fedora 40 - -* Thu Jul 20 2023 Fedora Release Engineering - 0.6-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 11 2023 Richard W.M. Jones - 0.6-25 -- OCaml 5.0 rebuild for Fedora 39 - -* Mon Jul 10 2023 Jerry James - 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 - 0.6-23 - Rebuild OCaml packages for F38 diff --git a/gating.yaml b/gating.yaml deleted file mode 100755 index 2c7ed80..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-* -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} diff --git a/sources b/sources deleted file mode 100644 index f55c17d..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (ocaml-augeas-0.6.tar.gz) = e747f5c09d3821b41d98e3f12c8dfe9bb13a69d6ccaaf954f4bb33e8e4d9d62603ae26fe9f93f10b2705872526b1863a1c20e0c8a53858fdf60f8cb8cbf50b7a diff --git a/tests/basic-test.sh b/tests/basic-test.sh deleted file mode 100755 index 10e138d..0000000 --- a/tests/basic-test.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100755 index 68d1d0a..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,13 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - required_packages: - - ocaml - - ocaml-findlib - - ocaml-augeas-devel - tests: - - simple: - dir: . - run: ./basic-test.sh