From fb67651890531a5e5ef9e5913d0b4db41a247728d144479d08cf4c0114c6e838 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Tue, 14 Jun 2022 09:54:03 +0000
Subject: [PATCH 1/2] remove braces from rpmspec macros

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=102
---
 ocaml-findlib.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index 0b18130..f336756 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -36,7 +36,7 @@ BuildRequires:  ocaml
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-rpm-macros >= 20220222
 #
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRoot:      %_tmppath/%name-%version-build
 
 %description
 Findlib is a library manager for Objective Caml. It provides a

From 6f533040c388053694b125daa0afd99cf6e4b557871c76157dae567e7bf9d72b Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Tue, 14 Jun 2022 09:58:56 +0000
Subject: [PATCH 2/2] - Update to version 1.9.5   Fix an incomaptibility with
 ocaml-5.0

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=103
---
 _service                   | 15 +++++++--------
 findlib-1.9.3.tar.xz       |  3 ---
 ocaml-findlib-1.9.5.tar.xz |  3 +++
 ocaml-findlib.changes      |  6 ++++++
 ocaml-findlib.spec         | 12 +++++-------
 5 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 findlib-1.9.3.tar.xz
 create mode 100644 ocaml-findlib-1.9.5.tar.xz

diff --git a/_service b/_service
index 51c41bc..820da0a 100644
--- a/_service
+++ b/_service
@@ -1,14 +1,13 @@
 <services>
-  <!-- Currently only the release tarball contains the built man pages,
-       generating them from source requires tools not available on OBS
-  -->
   <service name="tar_scm" mode="disabled">
-    <param name="url">https://github.com/ocaml/ocamlfind.git</param>
-    <param name="scm">git</param>
-    <param name="versionformat">@PARENT_TAG@</param>
-    <param name="versionrewrite-pattern">findlib-(.*)</param>
-    <param name="revision">6c8438c13b68e5cbc48ea558906046e38a7f8d72</param>
     <param name="filename">ocaml-findlib</param>
+    <param name="revision">19b0334c467f97328d5005511c34ac9c36235efe</param>
+    <param name="scm">git</param>
+    <param name="submodules">disable</param>
+    <param name="url">https://github.com/ocaml/ocamlfind.git</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="versionrewrite-pattern">findlib-([^\+]+)(.*)</param>
+    <param name="versionrewrite-replacement">\1</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*.tar</param>
diff --git a/findlib-1.9.3.tar.xz b/findlib-1.9.3.tar.xz
deleted file mode 100644
index 96448bd..0000000
--- a/findlib-1.9.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2814f947f89117479f2170cbb2de61dbc9e181476530778119b63acdea89fce7
-size 169692
diff --git a/ocaml-findlib-1.9.5.tar.xz b/ocaml-findlib-1.9.5.tar.xz
new file mode 100644
index 0000000..57a72e3
--- /dev/null
+++ b/ocaml-findlib-1.9.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24163a3c0914d9fbe741bf53e90719c6e5dfd65040c5b371accf1eb4447f5306
+size 166900
diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes
index 08f6433..a63be81 100644
--- a/ocaml-findlib.changes
+++ b/ocaml-findlib.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 13 13:13:13 UTC 2022 - ohering@suse.de
+
+- Update to version 1.9.5
+  Fix an incomaptibility with ocaml-5.0
+
 -------------------------------------------------------------------
 Tue Apr 26 13:12:14 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
 
diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index f336756..3307b1c 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -18,15 +18,14 @@
 
 
 Name:           ocaml-findlib
-Version:        1.9.3
+Version:        1.9.5
 Release:        0
 %{?ocaml_preserve_bytecode}
 Summary:        Objective CAML package manager and build helper
 License:        MIT
 Group:          Development/Languages/OCaml
 URL:            https://github.com/ocaml/ocamlfind
-#SourceURL:     http://download.camlcity.org/download/findlib-%version.tar.gz
-Source0:        findlib-%version.tar.xz
+Source0:        %name-%version.tar.xz
 #
 Requires:       ocaml-compiler-libs
 Requires:       ocaml-runtime
@@ -34,7 +33,7 @@ Requires:       ocaml-runtime
 Provides:       ocamlfind = %version
 BuildRequires:  ocaml
 BuildRequires:  ocaml-ocamldoc
-BuildRequires:  ocaml-rpm-macros >= 20220222
+BuildRequires:  ocaml-rpm-macros >= 20220409
 #
 BuildRoot:      %_tmppath/%name-%version-build
 
@@ -57,7 +56,7 @@ The ocaml-findlib-devel package contains libraries and signature files
 for developing applications that use ocaml-findlib.
 
 %prep
-%setup -q -n findlib-%version
+%setup -q
 
 %build
 rm -rfv site-lib-src
@@ -72,7 +71,7 @@ make all
 make opt
 
 %install
-make install prefix=%buildroot
+%make_install
 rm -rfv %buildroot%ocaml_standard_library/ocamlbuild
 rm -rfv %buildroot%ocaml_standard_library/findlib/Makefile.packages
 %ocaml_create_file_list
@@ -82,7 +81,6 @@ rm -rfv %buildroot%ocaml_standard_library/findlib/Makefile.packages
 %ocaml_standard_library/ocamlfind.conf
 %ocaml_standard_library/topfind
 %_bindir/*
-%_mandir/man?/*
 #
 
 %files devel -f %name.files.devel