From 065f3e2851d5a680fbe2cab7ced91304b94093ba Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Sun, 6 Feb 2011 10:01:55 +0200
Subject: [PATCH] - adjust ocaml rule for libmagic string change

---
 rpm-4.9.0-beta1-ocaml-magic.patch | 15 +++++++++++++++
 rpm.spec                          |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 rpm-4.9.0-beta1-ocaml-magic.patch

diff --git a/rpm-4.9.0-beta1-ocaml-magic.patch b/rpm-4.9.0-beta1-ocaml-magic.patch
new file mode 100644
index 0000000..c54d645
--- /dev/null
+++ b/rpm-4.9.0-beta1-ocaml-magic.patch
@@ -0,0 +1,15 @@
+commit 9fa3a6c99d93c0eb9659f38a10eb43a0265cce4f
+Author: Panu Matilainen <pmatilai@redhat.com>
+Date:   Sun Feb 6 09:57:03 2011 +0200
+
+    Adjust OCaml detection rule for libmagic 5.04 -> 5.05 string change
+
+diff --git a/fileattrs/ocaml.attr b/fileattrs/ocaml.attr
+index 53b63ae..5fd0870 100644
+--- a/fileattrs/ocaml.attr
++++ b/fileattrs/ocaml.attr
+@@ -1,3 +1,3 @@
+ %__ocaml_provides	%{_rpmconfigdir}/ocaml-find-provides.sh
+ %__ocaml_requires	%{_rpmconfigdir}/ocaml-find-requires.sh
+-%__ocaml_magic		^Objective caml.*$
++%__ocaml_magic		^(Objective caml|OCaml) .*$
diff --git a/rpm.spec b/rpm.spec
index b66af8b..d54048c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -22,7 +22,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}5%{?dist}
+Release: %{?snapver:0.%{snapver}.}6%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.8.x/%{name}-%{srcver}.tar.bz2
@@ -49,6 +49,7 @@ Patch104: rpm-4.9.0-beta1-posttrans-deps.patch
 Patch105: rpm-4.9.0-beta1-env-noremove.patch
 Patch106: rpm-4.9.0-beta1-open-cwd.patch
 Patch107: rpm-4.9.0-beta1-monodeps.patch
+Patch108: rpm-4.9.0-beta1-ocaml-magic.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -221,6 +222,7 @@ packages on a system.
 %patch105 -p1 -b .env-noremove
 %patch106 -p1 -b .open-cwd
 %patch107 -p1 -b .monodeps
+%patch108 -p1 -b .ocaml-magic
 
 %patch301 -p1 -b .niagara
 %patch302 -p1 -b .geode
@@ -431,6 +433,9 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Sun Feb 06 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.0-0.beta1.6
+- adjust ocaml rule for libmagic string change
+
 * Mon Jan 31 2011 Panu Matilainen <pmatilai@redhat.com> - 4.9.0-0.beta1.5
 - dont try to remove environment files if private env used (related to #671200)
 - unbreak mono dependency extraction (#673663)