rpms/rpm/devel rpm-4.5.90-mono-magic.patch, NONE, 1.1 rpm.spec, 1.285, 1.286

[Panu Matilainen (pmatilai)]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32352

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.5.90-mono-magic.patch 
Log Message:
- fix mono dependency extraction (adjust for libmagic string change)


rpm-4.5.90-mono-magic.patch:

--- NEW FILE rpm-4.5.90-mono-magic.patch ---
commit b3bd21e9f07272a37c2259070f95b167e6301c79
Author: Panu Matilainen <pmatilai at redhat.com>
Date:   Mon Jul 14 11:53:10 2008 +0300

    Fix mono dependency extraction
    - use "Mono/.Net assembly" instead of "PE executable" for detection,
      later file reports bitness (eg "PE32 executable"), we just care if its
      mono or not. This is compatible with older libmagic too.

diff --git a/build/rpmfc.c b/build/rpmfc.c
index 3cc2d6d..6f15b2c 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -490,7 +490,7 @@ static const struct rpmfcTokens_s const rpmfcTokens[] = {
 
   /* XXX .NET executables and libraries.  file(1) cannot differ from win32 
    * executables unfortunately :( */
-  { "PE executable",            RPMFC_MONO|RPMFC_INCLUDE },
+  { "Mono/.Net assembly",       RPMFC_MONO|RPMFC_INCLUDE },
 
   { "current ar archive",	RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE },
 


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -r1.285 -r1.286
--- rpm.spec	12 Jul 2008 15:02:42 -0000	1.285
+++ rpm.spec	14 Jul 2008 08:59:41 -0000	1.286
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.6
+Release: 0.%{snapver}.7
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -31,7 +31,9 @@
 # XXX only create provides for pkgconfig and libtool initially
 Patch100: rpm-4.6.x-no-pkgconfig-reqs.patch
 
+# These are already upstream, drop on next snapshot update:
 Patch200: rpm-4.5.90-digestlen.patch
+Patch201: rpm-4.5.90-mono-magic.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
@@ -158,7 +160,9 @@
 %patch0 -p1 -b .devel-autodep
 %patch1 -p1 -b .pkgconfig-path
 %patch100 -p1 -b .pkgconfig-deps
+
 %patch200 -p1 -b .diglen
+%patch201 -p1 -b .mono-magic
 
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
@@ -334,6 +338,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Jul 14 2008 Panu Matilainen <pmatilai at redhat.com>
+- 4.5.90-0.git8426.7
+- fix mono dependency extraction (adjust for libmagic string change)
+
 * Sat Jul 12 2008 Panu Matilainen <pmatilai at redhat.com>
 - 4.5.90-0.git8426.6
 - fix type mismatch causing funky breakage on ppc64