From e5e9a0060e5fa0d17fd75257531a0f514cd76f45 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Mar 04 2022 18:43:24 +0000
Subject: Unbundle stdcompat and pyml


Change doc and examples to noarch

---

diff --git a/coccinelle.spec b/coccinelle.spec
index 8a1b8ee..e24e45a 100644
--- a/coccinelle.spec
+++ b/coccinelle.spec
@@ -9,7 +9,7 @@
 
 Name:           coccinelle
 Version:        1.1.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Semantic patching for Linux (spatch)
 
 License:        GPLv2
@@ -34,6 +34,8 @@ BuildRequires:  ocaml-parmap-devel
 BuildRequires:  ocaml-pcre-devel
 BuildRequires:  ocaml-menhir
 BuildRequires:  ocaml-num-devel
+BuildRequires:  ocaml-pyml-devel
+BuildRequires:  ocaml-stdcompat-devel
 %if %{with doc}
 BuildRequires:  latexmk
 BuildRequires:  texlive-boxedminipage
@@ -72,9 +74,6 @@ BuildRequires:  hevea
     'Parsing_stat',
     'Regexp_pcre',
     'Semantic_c',
-    'Stdcompat',
-    'Stdcompat__init',
-    'Stdcompat__stdlib_s',
     'Token_annot',
     'Token_helpers',
     'Token_views_c',
@@ -90,13 +89,6 @@ BuildRequires:  hevea
 # RHBZ#725415.
 Requires:       ocaml-findlib
 
-# Bundled libraries.
-#
-# We could unbundle both of these, but it would require packaging them
-# in Fedora.
-Provides:       bundled(ocaml-pycaml) = 20200220
-Provides:       bundled(ocaml-stdcompat) = 15
-
 
 %description
 Coccinelle is a tool to utilize semantic patches for manipulating C
@@ -119,6 +111,7 @@ for %{name}.
 %if %{with doc}
 %package doc
 Summary:        Documentation for %{name}
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -129,6 +122,7 @@ The %{name}-doc package contains documentation for %{name}.
 
 %package examples
 Summary:        Examples for %{name}
+BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -201,7 +195,7 @@ make $target
 
 %install
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/python/coccilib
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 
 # Remove these (they are just wrapper scripts).
 rm -f $RPM_BUILD_ROOT%{_bindir}/spatch.byte
@@ -225,12 +219,6 @@ mv $RPM_BUILD_ROOT%{_libdir}/python/coccilib \
 
 rmdir $RPM_BUILD_ROOT%{_libdir}/python
 
-# Move OCaml libraries.
-pushd $RPM_BUILD_ROOT%{_libdir}
-mkdir ocaml/stublibs
-mv dllpyml_stubs.so ocaml/stublibs
-popd
-
 mv $RPM_BUILD_ROOT%{_bindir}/spatch $RPM_BUILD_ROOT%{_libdir}/coccinelle
 
 cp -p tools/pycocci $RPM_BUILD_ROOT%{_bindir}/
@@ -271,7 +259,6 @@ $spatch --sp-file %{SOURCE2} %{SOURCE1}
 %{_mandir}/man1/*.1*
 %{_mandir}/man3/*.3*
 %{python3_sitelib}/coccilib/
-%{_libdir}/ocaml/stublibs/*.so
 %{_libdir}/ocaml/*.cmx
 
 
@@ -292,6 +279,10 @@ $spatch --sp-file %{SOURCE2} %{SOURCE1}
 
 
 %changelog
+* Fri Mar  4 2022 Jerry James <loganjerry@gmail.com> - 1.1.1-7
+- Unbundle stdcompat and pyml
+- Change doc and examples to noarch
+
 * Wed Feb 23 2022 Richard W.M. Jones <rjones@redhat.com> - 1.1.1-6
 - Build the documentation subpackage on Fedora only.