| |
@@ -1,17 +1,15 @@
|
| |
%undefine _package_note_flags
|
| |
+
|
| |
Name: ocaml-lambda-term
|
| |
- Version: 3.1.0
|
| |
- Release: 15%{?dist}
|
| |
+ Version: 3.2.0
|
| |
+ Release: 1%{?dist}
|
| |
Summary: Terminal manipulation library for OCaml
|
| |
|
| |
- %global libname %(echo %{name} | sed -e 's/^ocaml-//')
|
| |
-
|
| |
- License: BSD
|
| |
+ License: BSD-3-Clause
|
| |
URL: https://github.com/ocaml-community/lambda-term
|
| |
- Source0: https://github.com/ocaml-community/lambda-term/archive/%{version}/%{libname}-%{version}.tar.gz
|
| |
+ Source0: %{url}/archive/%{version}/lambda-term-%{version}.tar.gz
|
| |
|
| |
- BuildRequires: make
|
| |
- BuildRequires: ocaml >= 4.02.3
|
| |
+ BuildRequires: ocaml >= 4.08.0
|
| |
BuildRequires: ocaml-camomile-devel >= 1.0.1
|
| |
BuildRequires: ocaml-lwt-devel >= 4.0.0
|
| |
BuildRequires: ocaml-lwt-react-devel
|
| |
@@ -31,18 +29,16 @@
|
| |
interface to terminal manipulation than, for example, ncurses, by providing
|
| |
a native OCaml interface instead of bindings to a C library.
|
| |
|
| |
- Lambda-term integrates with zed to provide text edition facilities in
|
| |
+ Lambda-term integrates with zed to provide text editing facilities in
|
| |
console applications.
|
| |
|
| |
%package devel
|
| |
Summary: Development files for %{name}
|
| |
Requires: %{name}%{?_isa} = %{version}-%{release}
|
| |
- Requires: ocaml-camomile-devel%{?_isa}
|
| |
Requires: ocaml-lwt-devel%{?_isa}
|
| |
Requires: ocaml-lwt-log-devel%{?_isa}
|
| |
Requires: ocaml-lwt-react-devel%{?_isa}
|
| |
Requires: ocaml-mew-vi-devel%{?_isa}
|
| |
- Requires: ocaml-react-devel%{?_isa}
|
| |
Requires: ocaml-zed-devel%{?_isa}
|
| |
|
| |
%description devel
|
| |
@@ -50,13 +46,10 @@
|
| |
developing applications that use %{name}.
|
| |
|
| |
%prep
|
| |
- %autosetup -n %{libname}-%{version}
|
| |
+ %autosetup -n lambda-term-%{version}
|
| |
|
| |
%build
|
| |
- dune build \
|
| |
- --verbose \
|
| |
- --for-release-of-packages=%{libname} \
|
| |
- %{?_smp_mflags}
|
| |
+ %dune_build
|
| |
|
| |
# Relink the stublib with RPM_LD_FLAGS
|
| |
cd _build/default/src
|
| |
@@ -65,50 +58,30 @@
|
| |
cd -
|
| |
|
| |
%install
|
| |
- dune install \
|
| |
- --verbose \
|
| |
- --for-release-of-packages=%{libname} \
|
| |
- --prefix=%{_prefix} \
|
| |
- --libdir=%{_libdir}/ocaml \
|
| |
- --mandir=%{_mandir} \
|
| |
- --destdir=%{buildroot}
|
| |
-
|
| |
- mkdir -p %{buildroot}%{_mandir}/man{1,5} \
|
| |
- %{buildroot}%{_datadir}/lambda-term \
|
| |
- %{buildroot}%{_docdir}
|
| |
- mv %{buildroot}%{_prefix}/doc/lambda-term %{buildroot}%{_docdir}
|
| |
+ %dune_install
|
| |
+
|
| |
+ mkdir -p %{buildroot}%{_datadir}/lambda-term
|
| |
mv %{buildroot}%{_datadir}/lambda-term{rc,-inputrc} %{buildroot}%{_datadir}/lambda-term
|
| |
+ sed -e 's,%{_datadir}/lambda-termrc,%{_datadir}/lambda-term,' \
|
| |
+ -e '\,%{_datadir}/lambda-term-inputrc,d' \
|
| |
+ -i .ofiles
|
| |
|
| |
%check
|
| |
- make test
|
| |
+ %dune_check
|
| |
|
| |
- %files
|
| |
+ %files -f .ofiles
|
| |
%license LICENSE
|
| |
- %doc %{_docdir}/lambda-term
|
| |
- %{_libdir}/ocaml/%{libname}
|
| |
- %{_bindir}/lambda-term-actions
|
| |
- %{_mandir}/man1/lambda-term-actions.1*
|
| |
- %{_mandir}/man5/lambda-term-inputrc.5*
|
| |
- %{_datadir}/lambda-term
|
| |
- %ifarch %{ocaml_native_compiler}
|
| |
- %exclude %{_libdir}/ocaml/*/*.a
|
| |
- %exclude %{_libdir}/ocaml/*/*.cmxa
|
| |
- %exclude %{_libdir}/ocaml/*/*.cmx
|
| |
- %endif
|
| |
- %exclude %{_libdir}/ocaml/*/*.mli
|
| |
- %{_libdir}/ocaml/stublibs/*.so
|
| |
-
|
| |
- %files devel
|
| |
- %license LICENSE
|
| |
- %ifarch %{ocaml_native_compiler}
|
| |
- %{_libdir}/ocaml/*/*.a
|
| |
- %{_libdir}/ocaml/*/*.cmxa
|
| |
- %{_libdir}/ocaml/*/*.cmx
|
| |
- %endif
|
| |
- %{_libdir}/ocaml/*/*.mli
|
| |
+ %doc CHANGES.md README.md
|
| |
|
| |
+ %files devel -f .ofiles-devel
|
| |
+ %license LICENSE
|
| |
|
| |
%changelog
|
| |
+ * Mon Aug 8 2022 Jerry James <loganjerry@gmail.com> - 3.2.0-1
|
| |
+ - Version 3.2.0
|
| |
+ - Convert license to SPDX
|
| |
+ - Use new OCaml macros
|
| |
+
|
| |
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-15
|
| |
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
| |
|
| |
jjames
commented 2 years ago
See the message to ocaml-devel dated 9 Aug 2022 with subject "ocaml-ppxlib upgrade". Please merge this PR if it looks good to you, but don't build yet. I will take care of the builds (in the correct order!) once all of the PRs have been merged.
Notes, in no particular order:
- I removed %libname because after converting to the new dune macros, there was only 2 uses of it left, in Source0 and %autosetup. If you want to keep it anyway, I can put it back.
- Even though upstream's README uses "text edition", I changed that to "text editing" in %description because that will make more sense to native English speakers.