rpms/rpm/devel rpm-4.7.0-extra-provides.patch, 1.1, 1.2 rpm.spec, 1.339, 1.340

Panu Matilainen pmatilai at fedoraproject.org
Mon Mar 23 15:32:14 UTC 2009


Author: pmatilai

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

Modified Files:
	rpm-4.7.0-extra-provides.patch rpm.spec 
Log Message:
- with the fd leak gone, let libmagic look into compressed files again (#491596)


rpm-4.7.0-extra-provides.patch:

Index: rpm-4.7.0-extra-provides.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm-4.7.0-extra-provides.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.7.0-extra-provides.patch	6 Mar 2009 18:28:20 -0000	1.1
+++ rpm-4.7.0-extra-provides.patch	23 Mar 2009 15:31:44 -0000	1.2
@@ -54,7 +54,7 @@
      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)


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- rpm.spec	23 Mar 2009 08:58:22 -0000	1.339
+++ rpm.spec	23 Mar 2009 15:31:44 -0000	1.340
@@ -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 @@
 %doc doc/librpm/html/*
 
 %changelog
+* 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)
 




More information about the fedora-extras-commits mailing list