rpms/rpm/devel rpm-4.5.90-rpmfileutil.patch, NONE, 1.1 rpm.spec, 1.309, 1.310

[Jindrich Novy]

Author: jnovy

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

Modified Files:
	rpm.spec 
Added Files:
	rpm-4.5.90-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.5.90-rpmfileutil.patch:

--- NEW FILE rpm-4.5.90-rpmfileutil.patch ---
commit 0b80d38f32b438d81d47fc61074b1f163518d68f
Author: Jindrich Novy <jnovy at redhat.com>
Date:   Mon Dec 1 12:16:56 2008 +0100

    Include rpmfileutil.h from rpmmacro.h so that
    prototype for rpmGenPath() is included (rhbz#473420)
    - unbreaks net-snmp

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/devel/rpm.spec,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -r1.309 -r1.310
--- rpm.spec	30 Nov 2008 19:22:46 -0000	1.309
+++ rpm.spec	1 Dec 2008 11:45:31 -0000	1.310
@@ -18,7 +18,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: 0.%{snapver}.4
+Release: 0.%{snapver}.5
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/testing/%{name}-%{srcver}.tar.bz2
@@ -29,6 +29,7 @@
 Patch0: rpm-4.5.90-devel-autodep.patch
 Patch1: rpm-4.5.90-pkgconfig-path.patch
 Patch2: rpm-4.5.90-gstreamer-provides.patch
+Patch3: rpm-4.5.90-rpmfileutil.patch
 
 # Patches already in upstream
 
@@ -162,6 +163,7 @@
 %patch0 -p1 -b .devel-autodep
 %patch1 -p1 -b .pkgconfig-path
 %patch2 -p1 -b .gstreamer-prov
+%patch3 -p1 -b .rpmfileutil
 
 # needs a bit of upstream love first...
 #%patch300 -p1 -b .posttrans
@@ -352,6 +354,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)
+
 * Sun Nov 30 2008 Panu Matilainen <pmatilai at redhat.com>
 - rebuild for python 2.6