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

- prefer more specific types over generic "text" in classification

Browse Source 
(#491349)
- fix incorrect bug number in yesterdays changelog
This commit is contained in:
Panu Matilainen 2009-03-24 07:26:38 +00:00
parent ba1a13e0a4
commit daefcbd389
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rpm-4.7.0-rpmfc-order.patch Normal file
View File

@ -0,0 +1,20 @@
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 },

9
rpm.spec
View File

@ -25,7 +25,7 @@
Summary: The RPM package management system Summary: The RPM package management system
Name: rpm Name: rpm
Version: %{rpmver} Version: %{rpmver}
Release: 0.%{snapver}.6%{?dist} Release: 0.%{snapver}.7%{?dist}
Group: System Environment/Base Group: System Environment/Base
Url: http://www.rpm.org/ Url: http://www.rpm.org/
Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@ -51,6 +51,7 @@ Patch204: rpm-4.7.0-rsa-v4.patch
# These are not yet upstream # These are not yet upstream
Patch300: rpm-4.7.0-extra-provides.patch 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 # Partially GPL/LGPL dual-licensed and some bits with BSD
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
@ -195,6 +196,7 @@ that will manipulate RPM packages and databases.
%patch204 -p1 -b .rsa-v4 %patch204 -p1 -b .rsa-v4
%patch300 -p1 -b .extra-prov %patch300 -p1 -b .extra-prov
%patch301 -p1 -b .rpmfc-order
%if %{with int_bdb} %if %{with int_bdb}
ln -s db-%{bdbver} db ln -s db-%{bdbver} db
@ -400,11 +402,14 @@ exit 0
%doc doc/librpm/html/* %doc doc/librpm/html/*
%changelog %changelog
* Tue Mar 24 2009 Panu Matilainen <pmatilai@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@redhat.com> - 4.7.0-0.beta1.6 * Mon Mar 23 2009 Panu Matilainen <pmatilai@redhat.com> - 4.7.0-0.beta1.6
- with the fd leak gone, let libmagic look into compressed files again (#491596) - with the fd leak gone, let libmagic look into compressed files again (#491596)
* Mon Mar 23 2009 Panu Matilainen <pmatilai@redhat.com> - 4.7.0-0.beta1.5 * Mon Mar 23 2009 Panu Matilainen <pmatilai@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@redhat.com> - 4.7.0-0.beta1.4 * Thu Mar 12 2009 Panu Matilainen <pmatilai@redhat.com> - 4.7.0-0.beta1.4
- handle RSA V4 signatures (#436812) - handle RSA V4 signatures (#436812)