From 810c23b247e3ecc2abbfc84a1b5cf0c63cd558a1b747e02e963f4d5580d7b4d4 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Mon, 23 Sep 2019 18:44:24 +0000
Subject: [PATCH] - Merge the camlp4 subpackage into the devel package because 
  camlp4 will disappear with ocaml 4.09

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=74
---
 ocaml-findlib.changes |  2 ++
 ocaml-findlib.spec    | 56 +++++++++++++++++--------------------------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes
index 7e99101..1182b93 100644
--- a/ocaml-findlib.changes
+++ b/ocaml-findlib.changes
@@ -13,6 +13,8 @@ Mon Sep 23 16:35:39 UTC 2019 - ohering@suse.de
    New "warning" property for packages.
    Forgetting to pass -thread/-vmthread only prints a warning now, but doesn't stop the build.
    For dealing with case-sensitive filesystems it is now only tried to match ASCII characters, but not encoding-dependent characters.
+- Merge the camlp4 subpackage into the devel package because
+  camlp4 will disappear with ocaml 4.09
 
 -------------------------------------------------------------------
 Thu Aug 22 13:24:21 UTC 2019 - ohering@suse.de
diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec
index b966d04..510c4f3 100644
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@@ -29,8 +29,6 @@ Url:            http://projects.camlcity.org/projects/findlib.html
 Source0:        findlib-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #
-Recommends:     ocaml-findlib-camlp4
-#
 Requires:       ocaml-compiler-libs
 Requires:       ocaml-runtime
 #
@@ -57,21 +55,14 @@ libraries in programs and scripts.
 Summary:        Development files for ocaml-findlib
 Group:          Development/Languages/OCaml
 Requires:       %{name} = %{version}
+Provides:       %{name}-camlp4 = %{version}-%{release}
+Obsoletes:      %{name}-camlp4 < %{version}-%{release}
 
 %description    devel
 The ocaml-findlib-devel package contains libraries and signature files
 for developing applications that use ocaml-findlib.
 
 
-
-%package camlp4
-Summary:        Development files for ocaml-findlib
-Group:          Development/Languages/OCaml
-Requires:       ocaml-camlp4-devel
-
-%description camlp4
-The ocaml-findlib-camlp4 contains signature files for developing applications that use camlp4
-
 %prep
 %setup -q -n findlib-%{version}
 
@@ -93,38 +84,40 @@ rm doc/guide-html/TIMESTAMP
 make install prefix=$RPM_BUILD_ROOT
 rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
 
-%files
+> files
+> files.devel
+
+find $RPM_BUILD_ROOT%{_libdir}/ocaml -name META | \
+sed 's@^%{buildroot}@@' | \
+tee -a files
+find $RPM_BUILD_ROOT%{_libdir}/ocaml -type d | \
+sed 's@^%{buildroot}@%%dir @' | \
+tee -a files
+
+sed -i~ '/\/\(camlp4\|findlib\|num-top\)/{
+w files.devel
+d
+}' files
+diff -u "$_"~ "$_" && exit 2
+cat files.devel
+
+%files -f files
 %doc doc/README
 %license LICENSE
 %{_libdir}/ocaml/ocamlfind.conf
 %{_bindir}/*
 %{_mandir}/man?/*
 #
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/*
-%{_libdir}/ocaml/*/META
-#
-%exclude %dir %{_libdir}/ocaml/camlp4
-%exclude %dir %{_libdir}/ocaml/findlib
-%exclude %dir %{_libdir}/ocaml/num-top
-%exclude %{_libdir}/ocaml/camlp4/META
-%exclude %{_libdir}/ocaml/findlib/META
-%exclude %{_libdir}/ocaml/num-top/META
 %{_libdir}/ocaml/topfind
-%dir %{_libdir}/ocaml/findlib
 %if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmxs
 %endif
 
-%files devel
-%doc LICENSE doc/README doc/guide-html
+%files devel -f files.devel
+%doc doc/README doc/guide-html
 %{_libdir}/ocaml/*/Makefile.config
 #
 %dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/findlib
-%dir %{_libdir}/ocaml/num-top
-%{_libdir}/ocaml/findlib/META
-%{_libdir}/ocaml/num-top/META
 %if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.a
 %{_libdir}/ocaml/*/*.cmxa
@@ -133,9 +126,4 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild
 %{_libdir}/ocaml/*/*.cmi
 %{_libdir}/ocaml/*/*.mli
 
-%files camlp4
-%dir %{_libdir}/ocaml
-%dir %{_libdir}/ocaml/camlp4
-%{_libdir}/ocaml/camlp4/META
-
 %changelog