rpms/rpm/devel rpm-4.7.0-rpmfc-order.patch, NONE, 1.1 rpm.spec, 1.340, 1.341

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4875

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.7.0-rpmfc-order.patch 
Log Message:
- prefer more specific types over generic "text" in classification (#491349)
- fix incorrect bug number in yesterdays changelog


rpm-4.7.0-rpmfc-order.patch:

--- NEW FILE rpm-4.7.0-rpmfc-order.patch ---
diff --git a/build/rpmfc.c b/build/rpmfc.c
index 7142a9a..1c2d42b 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -452,7 +452,6 @@ static const struct rpmfcTokens_s const rpmfcTokens[] = {
   { "ELF 64-bit",		RPMFC_ELF64|RPMFC_INCLUDE },
 
   { " script",			RPMFC_SCRIPT },
-  { " text",			RPMFC_TEXT },
   { " document",		RPMFC_DOCUMENT },
 
   { " compressed",		RPMFC_COMPRESSED },
@@ -510,6 +509,7 @@ static const struct rpmfcTokens_s const rpmfcTokens[] = {
   { "symbolic link to",		RPMFC_SYMLINK },
   { "socket",			RPMFC_DEVICE },
   { "special",			RPMFC_DEVICE },
+  { " text",			RPMFC_TEXT },
 
   { "ASCII",			RPMFC_WHITE },
   { "ISO-8859",			RPMFC_WHITE },


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- rpm.spec	23 Mar 2009 15:31:44 -0000	1.340
+++ rpm.spec	24 Mar 2009 07:26:38 -0000	1.341
@@ -25,7 +25,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.6%{?dist}
+Release: 0.%{snapver}.7%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -51,6 +51,7 @@
 
 # These are not yet upstream
 Patch300: rpm-4.7.0-extra-provides.patch
+Patch301: rpm-4.7.0-rpmfc-order.patch
 
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD 
@@ -195,6 +196,7 @@
 %patch204 -p1 -b .rsa-v4
 
 %patch300 -p1 -b .extra-prov
+%patch301 -p1 -b .rpmfc-order
 
 %if %{with int_bdb}
 ln -s db-%{bdbver} db
@@ -400,11 +402,14 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Tue Mar 24 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.7
+- prefer more specific types over generic "text" in classification (#491349)
+
 * Mon Mar 23 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.6
 - with the fd leak gone, let libmagic look into compressed files again (#491596)
 
 * Mon Mar 23 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.5
-- fix font provide generation on filenames with whitespace (#491510)
+- fix font provide generation on filenames with whitespace (#491597)
 
 * Thu Mar 12 2009 Panu Matilainen <pmatilai at redhat.com> - 4.7.0-0.beta1.4
 - handle RSA V4 signatures (#436812)