From 999c698ec1876491bf74098a27515cba31c0f8da Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Apr 09 2020 11:55:12 +0000
Subject: Fix regression causing all ELF files classified as OCaml


---

diff --git a/0001-Fix-regression-causing-all-ELF-files-classified-as-O.patch b/0001-Fix-regression-causing-all-ELF-files-classified-as-O.patch
new file mode 100644
index 0000000..1762279
--- /dev/null
+++ b/0001-Fix-regression-causing-all-ELF-files-classified-as-O.patch
@@ -0,0 +1,26 @@
+From cbbbf06a0ba3aaced56edf5f632c1b0da6da0c6b Mon Sep 17 00:00:00 2001
+Message-Id: <cbbbf06a0ba3aaced56edf5f632c1b0da6da0c6b.1586433208.git.pmatilai@redhat.com>
+From: Panu Matilainen <pmatilai@redhat.com>
+Date: Thu, 9 Apr 2020 14:49:30 +0300
+Subject: [PATCH] Fix regression causing all ELF files classified as OCaml
+
+Commit a6fe37c39b39acbcbd014dd1e6d5653ff84254a1 causes OCaml generators
+to execute on all ELF files due to missing "magic_and_path" flag.
+
+Fixes: #1173
+---
+ fileattrs/ocaml.attr | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/fileattrs/ocaml.attr b/fileattrs/ocaml.attr
+index ad698b5fa..4bd65c17a 100644
+--- a/fileattrs/ocaml.attr
++++ b/fileattrs/ocaml.attr
+@@ -2,3 +2,4 @@
+ %__ocaml_requires	%{_rpmconfigdir}/ocamldeps.sh --requires
+ %__ocaml_magic		^(ELF|Objective caml|OCaml) .*$
+ %__ocaml_path		.(cma|cmi|cmo|cmx|cmxa|cmxs)$
++%__ocaml_flags		magic_and_path
+-- 
+2.25.2
+
diff --git a/rpm.spec b/rpm.spec
index d086e75..c58db19 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -25,7 +25,7 @@
 
 %global rpmver 4.15.90
 %global snapver git14971
-%global rel 4
+%global rel 5
 
 %global srcver %{version}%{?snapver:-%{snapver}}
 %global srcdir %{?snapver:testing}%{!?snapver:%{name}-%(echo %{version} | cut -d'.' -f1-2).x}
@@ -59,6 +59,7 @@ Patch6: 0001-find-debuginfo.sh-decompress-DWARF-compressed-ELF-se.patch
 # Patches already upstream:
 Patch100: 0001-Unset-SOURCE_DATE_EPOCH-for-the-test-suite.patch
 Patch101: 0001-rpmfc-Do-not-prepend-buildroot-to-a-path-for-paramet.patch
+Patch101: 0001-Fix-regression-causing-all-ELF-files-classified-as-O.patch
 
 # These are not yet upstream
 Patch906: rpm-4.7.1-geode-i686.patch
@@ -524,6 +525,9 @@ make check || (cat tests/rpmtests.log; exit 1)
 %doc doc/librpm/html/*
 
 %changelog
+* Thu Apr 09 2020 Panu Matilainen <pmatilai@redhat.com> - 4.15.90-0.git14971.5
+- Fix regression causing all ELF files classified as OCaml
+
 * Mon Apr 06 2020 Panu Matilainen <pmatilai@redhat.com> - 4.15.90-0.git14971.4
 - Fix invalid path passed to parametric macro generators