| |
@@ -1,17 +1,15 @@
|
| |
%undefine _package_note_flags
|
| |
+
|
| |
Name: ocaml-lwt-log
|
| |
Version: 1.1.1
|
| |
- Release: 23%{?dist}
|
| |
+ Release: 24%{?dist}
|
| |
Summary: Lwt logging library
|
| |
|
| |
- %global libname %(echo %{name} | sed -e 's/^ocaml-//')
|
| |
-
|
| |
- License: LGPLv2+
|
| |
+ License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
|
| |
URL: https://github.com/ocsigen/lwt_log
|
| |
- Source0: https://github.com/ocsigen/lwt_log/archive/%{version}/%{libname}-%{version}.tar.gz
|
| |
+ Source0: https://github.com/ocsigen/lwt_log/archive/%{version}/lwt-log-%{version}.tar.gz
|
| |
|
| |
BuildRequires: ocaml
|
| |
- BuildRequires: ocaml-findlib-devel
|
| |
BuildRequires: ocaml-lwt-devel
|
| |
|
| |
BuildRequires: ocaml-dune
|
| |
@@ -22,6 +20,7 @@
|
| |
%package devel
|
| |
Summary: Development files for %{name}
|
| |
Requires: %{name}%{?_isa} = %{version}-%{release}
|
| |
+ Requires: ocaml-lwt-devel%{?_isa}
|
| |
|
| |
%description devel
|
| |
The %{name}-devel package contains libraries and signature files for
|
| |
@@ -31,44 +30,26 @@
|
| |
%autosetup -n lwt_log-%{version}
|
| |
|
| |
%build
|
| |
- dune build
|
| |
+ %dune_build
|
| |
|
| |
%install
|
| |
- export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml
|
| |
- mkdir -p $OCAMLFIND_DESTDIR
|
| |
- dune install --prefix %{buildroot}%{_prefix}/ --libdir %{buildroot}%{_libdir}/ocaml/
|
| |
-
|
| |
- # Remove .ml files.
|
| |
- rm -rf %{buildroot}%{_libdir}/ocaml/lwt_log/*.ml
|
| |
- rm -rf %{buildroot}%{_libdir}/ocaml/lwt_log/*/*.ml
|
| |
+ %dune_install
|
| |
|
| |
- # Hmm... the above needs refinement. Remove spurious doc files.
|
| |
- rm -rf %{buildroot}%{_prefix}/doc
|
| |
+ %check
|
| |
+ %dune_check
|
| |
|
| |
- # Remove dune-package files.
|
| |
- find %{buildroot}%{_libdir} -name dune-package -delete
|
| |
-
|
| |
- %files
|
| |
+ %files -f .ofiles
|
| |
%license COPYING
|
| |
%doc README.md CHANGES
|
| |
- %{_libdir}/ocaml/lwt_log
|
| |
- %ifarch %{ocaml_native_compiler}
|
| |
- %exclude %{_libdir}/ocaml/lwt_log/*/*.a
|
| |
- %exclude %{_libdir}/ocaml/lwt_log/*/*.cmxa
|
| |
- %exclude %{_libdir}/ocaml/lwt_log/*/*.cmx
|
| |
- %endif
|
| |
- %exclude %{_libdir}/ocaml/lwt_log/*/*.mli
|
| |
-
|
| |
- %files devel
|
| |
- %ifarch %{ocaml_native_compiler}
|
| |
- %{_libdir}/ocaml/lwt_log/*/*.a
|
| |
- %{_libdir}/ocaml/lwt_log/*/*.cmxa
|
| |
- %{_libdir}/ocaml/lwt_log/*/*.cmx
|
| |
- %endif
|
| |
- %{_libdir}/ocaml/lwt_log/*/*.mli
|
| |
|
| |
+ %files devel -f .ofiles-devel
|
| |
|
| |
%changelog
|
| |
+ * Mon Aug 8 2022 Jerry James <loganjerry@gmail.com> - 1.1.1-24
|
| |
+ - Rebuild for ocaml-lwt 5.6.1
|
| |
+ - Use SPDX license name
|
| |
+ - Use new OCaml macros
|
| |
+
|
| |
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-23
|
| |
- 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:
- I eliminated %libname because it was only used in 1 place, Source0, so it seemed easier and clearer to me to just put the actual name there.
- The ocaml-lwt-devel Requires in the devel subpackage is because META says it requires ocaml-lwt, so consumers of this package can expect to be able to build against lwt as well.