- updated to 1.9.3

- removed obsolete labltk patch

diff --git a/labltk.patch b/labltk.patch
deleted file mode 100644 (file)
index ca8a2ef..0000000
--- a/labltk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- findlib-1.9.1/configure~   2021-03-16 12:43:00.000000000 +0100
-+++ findlib-1.9.1/configure    2021-03-18 09:51:26.415095066 +0100
-@@ -526,7 +526,7 @@
-     have_str=0
- fi
- 
--if check_library labltk 'normal since 4.02' labltk/labtk.cma; then
-+if check_library labltk 'normal since 4.02' labltk/labltk.cma; then
-     have_labltk=1
- else
-     have_labltk=0

diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index f01549b2924ae0c6c883a857c9cc9e96aab66937..6fe0b3601eef98e74410ad8373be7c994d6e6d02 100644 (file)
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -7,21 +7,19 @@
 %undefine      with_ocaml_opt
 %endif
 
-%define                ocaml_ver       1:4.04
 Summary:       OCaml module manager
 Summary(pl.UTF-8):     Zarządca modułów OCamla
 Name:          ocaml-findlib
-Version:       1.9.1
-Release:       5
+Version:       1.9.3
+Release:       1
 License:       distributable
 Group:         Development/Tools
 Source0:       http://download.camlcity.org/download/findlib-%{version}.tar.gz
-# Source0-md5: 65e6dc9b305ccbed1267275fe180f538
-Patch0:                labltk.patch
+# Source0-md5: 24047dd8a0da5322253de9b7aa254e42
 URL:           http://projects.camlcity.org/projects/findlib.html
 BuildRequires: m4
 BuildRequires: ncurses-devel
-BuildRequires: ocaml >= %{ocaml_ver}
+BuildRequires: ocaml >= 1:4.04
 BuildRequires: ocaml-camlp4
 %{?with_tk:BuildRequires:      ocaml-labltk-devel}
 BuildRequires: ocaml-ocamldoc-devel
@@ -72,7 +70,6 @@ Ten pakiet zawiera biblioteki i skompilowane interfejsy findliba.
 
 %prep
 %setup -q -n findlib-%{version}
-%patch0 -p1
 
 %build
 ./configure \
@@ -150,7 +147,10 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/ocaml/findlib/findlib.cmi
+%{_libdir}/ocaml/findlib/findlib_config.cmi
+%{_libdir}/ocaml/findlib/findlib_config.ml
 %{_libdir}/ocaml/findlib/fl_*.cmi
+%{_libdir}/ocaml/findlib/ocaml_args.cmi
 %{_libdir}/ocaml/findlib/topfind.cmi
 %if %{with ocaml_opt}
 %{_libdir}/ocaml/findlib/findlib.a