rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- adjust ocaml rule for libmagic string change

Browse Source
This commit is contained in:
Panu Matilainen 2011-02-06 10:01:55 +02:00
parent 5430e272b0
commit 065f3e2851
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rpm-4.9.0-beta1-ocaml-magic.patch Normal file
View File

@ -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) .*$

7
rpm.spec
View File

@ -22,7 +22,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: %{?snapver:0.%{snapver}.}5%{?dist} Release: %{?snapver:0.%{snapver}.}6%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.8.x/%{name}-%{srcver}.tar.bz2 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 Patch105: rpm-4.9.0-beta1-env-noremove.patch
Patch106: rpm-4.9.0-beta1-open-cwd.patch Patch106: rpm-4.9.0-beta1-open-cwd.patch
Patch107: rpm-4.9.0-beta1-monodeps.patch Patch107: rpm-4.9.0-beta1-monodeps.patch
Patch108: rpm-4.9.0-beta1-ocaml-magic.patch
# These are not yet upstream # These are not yet upstream
Patch301: rpm-4.6.0-niagara.patch Patch301: rpm-4.6.0-niagara.patch
@ -221,6 +222,7 @@ packages on a system.
%patch105 -p1 -b .env-noremove %patch105 -p1 -b .env-noremove
%patch106 -p1 -b .open-cwd %patch106 -p1 -b .open-cwd
%patch107 -p1 -b .monodeps %patch107 -p1 -b .monodeps
%patch108 -p1 -b .ocaml-magic
%patch301 -p1 -b .niagara %patch301 -p1 -b .niagara
%patch302 -p1 -b .geode %patch302 -p1 -b .geode
@ -431,6 +433,9 @@ exit 0
%doc COPYING doc/librpm/html/* %doc COPYING doc/librpm/html/*
%changelog %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 * 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) - dont try to remove environment files if private env used (related to #671200)
- unbreak mono dependency extraction (#673663) - unbreak mono dependency extraction (#673663)