From ba1a13e0a43490b5ce135d46aa465b5d374568d1 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mar 23 2009 15:31:44 +0000 Subject: - with the fd leak gone, let libmagic look into compressed files again (#491596) --- diff --git a/rpm-4.7.0-extra-provides.patch b/rpm-4.7.0-extra-provides.patch index 529d81d..3fd9a12 100644 --- a/rpm-4.7.0-extra-provides.patch +++ b/rpm-4.7.0-extra-provides.patch @@ -54,7 +54,7 @@ diff -up rpm-4.7.0-beta1/build/rpmfc.c.extra-prov rpm-4.7.0-beta1/build/rpmfc.c int fcolor; int xx; - int msflags = MAGIC_CHECK; /* XXX MAGIC_COMPRESS flag? */ -+ int msflags = MAGIC_CHECK; /* add MAGIC_COMPRESS eventually */ ++ int msflags = MAGIC_CHECK | MAGIC_COMPRESS; magic_t ms = NULL; if (fc == NULL || argv == NULL) diff --git a/rpm.spec b/rpm.spec index f77d937..02b4aea 100644 --- a/rpm.spec +++ b/rpm.spec @@ -25,7 +25,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: 0.%{snapver}.5%{?dist} +Release: 0.%{snapver}.6%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2 @@ -400,6 +400,9 @@ exit 0 %doc doc/librpm/html/* %changelog +* Mon Mar 23 2009 Panu Matilainen - 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 - 4.7.0-0.beta1.5 - fix font provide generation on filenames with whitespace (#491510)