rpms/rpm/F-10 rpm-4.6.0-rc1-rpmfileutil.patch, NONE, 1.1 rpm.spec, 1.305, 1.306

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/rpm/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14080

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.6.0-rc1-rpmfileutil.patch 
Log Message:
* Mon Dec 01 2008 Jindrich Novy <jnovy at redhat.com>  
- include rpmfileutil.h from rpmmacro.h, unbreaks
  net-snmp (#473420)


rpm-4.6.0-rc1-rpmfileutil.patch:

--- NEW FILE rpm-4.6.0-rc1-rpmfileutil.patch ---
diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
index 7391efd..765c78c 100644
--- a/rpmio/rpmmacro.h
+++ b/rpmio/rpmmacro.h
@@ -9,6 +9,7 @@
 #include <stddef.h>
 
 #include <rpm/rpmutil.h>
+#include <rpm/rpmfileutil.h>
 
 #ifdef __cplusplus
 extern "C" {


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-10/rpm.spec,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- rpm.spec	31 Oct 2008 08:22:48 -0000	1.305
+++ rpm.spec	1 Dec 2008 12:00:10 -0000	1.306
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.7
+Release: 0.%{snapver}.8
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -39,6 +39,7 @@
 Patch203: rpm-4.6.0-rc1-defaultdocdir.patch
 Patch204: rpm-4.6.0-rc1-fp-hash.patch
 Patch205: rpm-4.6.0-rc1-file-debuginfo.patch
+Patch206: rpm-4.6.0-rc1-rpmfileutil.patch
 
 # These are not yet upstream
 Patch300: rpm-4.5.90-posttrans.patch
@@ -178,6 +179,7 @@
 %patch203 -p1 -b .defaultdocdir
 %patch204 -p1 -b .fp-hash
 %patch205 -p1 -b .file-debuginfo
+%patch206 -p1 -b .rpmfileutil
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -368,6 +370,10 @@
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Dec 01 2008 Jindrich Novy <jnovy at redhat.com> 
+- include rpmfileutil.h from rpmmacro.h, unbreaks
+  net-snmp (#473420)
+
 * Fri Oct 31 2008 Panu Matilainen <pmatilai at redhat.com>
 - adjust find-debuginfo for "file" output change (#468129)