From 473dda1407d1ed1bf46e1a7d94c9e00c655174b07e610d618dfc78bd9cc2cf6c Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 11 Oct 2019 07:54:04 +0000 Subject: [PATCH] - use macros from ocaml-rpm-macros OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-curses?expand=0&rev=26 --- ocaml-curses.changes | 5 +++++ ocaml-curses.spec | 40 +++++----------------------------------- 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/ocaml-curses.changes b/ocaml-curses.changes index 7466453..66d0df5 100644 --- a/ocaml-curses.changes +++ b/ocaml-curses.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 9 05:48:16 UTC 2019 - ohering@suse.de + +- use macros from ocaml-rpm-macros + ------------------------------------------------------------------- Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de diff --git a/ocaml-curses.spec b/ocaml-curses.spec index f440bc9..d8c719d 100644 --- a/ocaml-curses.spec +++ b/ocaml-curses.spec @@ -31,7 +31,7 @@ BuildRequires: ncurses-devel BuildRequires: ocaml BuildRequires: ocaml-oasis BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 4.03 +BuildRequires: ocaml-rpm-macros >= 20191009 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,9 +47,7 @@ The %{name}-devel package contains libraries and signature files for developing applications that use %{name}. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%autosetup -p1 %build sed 's/@BOOL_WIDE_CURSES@/true/' config.ml.in | tee config.ml @@ -98,43 +96,15 @@ _EOF_ %install %ocaml_oasis_findlib_install -# -mkdir -vp %{buildroot}/etc/ld.so.conf.d/ -tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_ -%{_libdir}/ocaml/curses -_EOF_ -# +%ocaml_create_file_list %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -%defattr(-,root,root,-) -%doc COPYING -/etc/ld.so.conf.d/*.conf -%dir %{_libdir}/ocaml/* -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.cmxs -%endif -%{_libdir}/ocaml/*/*.so +%files -f %{name}.files -%files devel -%defattr(-,root,root,-) -%doc COPYING +%files devel -f %{name}.files.devel %{oasis_docdir_html} -%dir %{_libdir}/ocaml/* -%{_libdir}/ocaml/*/*.a -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.cmx -%{_libdir}/ocaml/*/*.cmxa -%endif -%{_libdir}/ocaml/*/*.annot -%{_libdir}/ocaml/*/*.cma -%{_libdir}/ocaml/*/*.cmi -%{_libdir}/ocaml/*/*.cmt -%{_libdir}/ocaml/*/*.cmti -%{_libdir}/ocaml/*/*.mli -%{_libdir}/ocaml/*/META %changelog