- include rpmfileutil.h from rpmmacro.h, unbreaks net-snmp (#473420)
This commit is contained in:
parent
b475662908
commit
1dfb5bd421
12
rpm-4.6.0-rc1-rpmfileutil.patch
Normal file
12
rpm-4.6.0-rc1-rpmfileutil.patch
Normal file
@ -0,0 +1,12 @@
|
||||
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" {
|
8
rpm.spec
8
rpm.spec
@ -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 @@ Patch202: rpm-4.6.0-rc1-noarch-subpkg.patch
|
||||
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 @@ that will manipulate RPM packages and databases.
|
||||
%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 @@ exit 0
|
||||
%doc doc/librpm/html/*
|
||||
|
||||
%changelog
|
||||
* Mon Dec 01 2008 Jindrich Novy <jnovy@redhat.com>
|
||||
- include rpmfileutil.h from rpmmacro.h, unbreaks
|
||||
net-snmp (#473420)
|
||||
|
||||
* Fri Oct 31 2008 Panu Matilainen <pmatilai@redhat.com>
|
||||
- adjust find-debuginfo for "file" output change (#468129)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user