Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ocaml-extlib: update to 1.7.9 #11567

Open
wants to merge 3 commits into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SPECS-EXTENDED/ocaml-extlib/ocaml-extlib.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"extlib-1.7.8.tar.gz": "935ca46843af40dc33306d9cce66163d3733312bf444e969b5a8fa3f3024f85a"
"ocaml-extlib-1.7.9.tar.gz": "58de4dde016deb00b4f33956ab9697282f4e607c6452e3d38f8e116405ffcdcb"
}
}
90 changes: 57 additions & 33 deletions SPECS-EXTENDED/ocaml-extlib/ocaml-extlib.spec
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
# The debuginfo package is empty, so don't generate it.
# Could possibly be fixed by passing -g option correctly to the compiler.
%ifnarch %{ocaml_native_compiler}
%global debug_package %{nil}
Summary: OCaml ExtLib additions to the standard library
%endif

Name: ocaml-extlib
Version: 1.7.8
Version: 1.7.9
Release: 1%{?dist}
License: LGPLv2 with exceptions
Summary: OCaml ExtLib additions to the standard library
License: LGPL-2.1-or-later with OCaml-LGPL-linking-exception
Vendor: Microsoft Corporation
Distribution: Azure Linux
URL: https://github.com/ygrek/ocaml-extlib
Source0: https://github.com/ygrek/ocaml-extlib/releases/download/%{version}/extlib-%{version}.tar.gz
BuildRequires: gawk
BuildRequires: ocaml
BuildRequires: ocaml-cppo
BuildRequires: ocaml-findlib-devel >= 1.5.1
Source0: https://github.com/ygrek/ocaml-extlib/releases/download/%{version}/extlib-%{version}.tar.gz#/%{name}-%{version}.tar.gz

BuildRequires: make
BuildRequires: ocaml >= 4.02
BuildRequires: ocaml-findlib-devel >= 1.3.3-3
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-cppo
BuildRequires: ocaml-rpm-macros
# In order to apply patches:
BuildRequires: git-core


%description
ExtLib is a project aiming at providing a complete - yet small -
Expand All @@ -24,48 +30,65 @@ modules, to modify some functions in order to get better performances
or more safety (tail-recursive) but also to provide new modules which
should be useful for the average OCaml programmer.


%package devel
Summary: Development files for %{name}
Requires: %{name} = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}


%description devel
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.


%prep
%autosetup -n extlib-%{version}
%autosetup -S git -n extlib-%{version}

# Remove references to the bytes library for OCaml 5.0
sed -i '/bytes/d' src/META


%build
# Parallel builds do not work.
unset MAKEFLAGS
make build -j1
# https://bugzilla.redhat.com/show_bug.cgi?id=1837823
export minimal=1
%ifarch %{ocaml_native_compiler}
%make_build
%else
%make_build -C src all
%endif


%install
export DESTDIR=%{buildroot}
export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
make install -j1

%files
%doc README.md
%license LICENSE
%{_libdir}/ocaml/extlib
%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/extlib/*.a
%exclude %{_libdir}/ocaml/extlib/*.cmxa
%exclude %{_libdir}/ocaml/extlib/*.cmx
%endif
%exclude %{_libdir}/ocaml/extlib/*.mli
export minimal=1
%make_install
%ocaml_files

%files devel

%check
export minimal=1
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/extlib/*.a
%{_libdir}/ocaml/extlib/*.cmxa
%{_libdir}/ocaml/extlib/*.cmx
make test
%else
make -C test all run
%endif
%{_libdir}/ocaml/extlib/*.mli


%files -f .ofiles
%doc README.md
%license LICENSE


%files devel -f .ofiles-devel


%changelog
* Fri Dec 20 2024 Durga Jagadeesh Palli <[email protected]> - 1.7.9-1
- Update to 1.7.9
- License verified

* Tue Feb 08 2022 Thomas Crain <[email protected]> - 1.7.8-1
- Upgrade to latest upstream version
- Lint spec
Expand Down Expand Up @@ -307,3 +330,4 @@ make install -j1

* Fri May 18 2007 Richard W.M. Jones <[email protected]> - 1.5-1
- Initial RPM release.

4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -14602,8 +14602,8 @@
"type": "other",
"other": {
"name": "ocaml-extlib",
"version": "1.7.8",
"downloadUrl": "https://github.com/ygrek/ocaml-extlib/releases/download/1.7.8/extlib-1.7.8.tar.gz"
"version": "1.7.9",
"downloadUrl": "https://github.com/ygrek/ocaml-extlib/releases/download/1.7.9/extlib-1.7.9.tar.gz"
}
}
},
Expand Down