diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2012-06-11 13:18:52 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-12 11:01:51 +0100 |
| commit | c5898ef3fc3820ff9c44bc5b1b16e5def64aa877 (patch) | |
| tree | a0e0d531604b29fc6932f4fe57c1002ff61f1f37 /meta/recipes-devtools/rpm/rpm/rpm-macros.patch | |
| parent | 0eddc176e73e74d4b1a7d3163d65f619fcd4baf0 (diff) | |
| download | openembedded-core-contrib-c5898ef3fc3820ff9c44bc5b1b16e5def64aa877.tar.gz | |
rpm: Upgrade RPM to 5.4.8 (db to 5.3.15)
RPM 5.4.8 requires db 5.3.x, so both are upgraded together.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-macros.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-macros.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch new file mode 100644 index 0000000000..f25656a23d --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch @@ -0,0 +1,61 @@ +macros/macros.in: Revert settings to the same as RPM 5.4.0 + +Enable a reasonable set of rpmdeps dependency helper macros. These sets +were used by RPM 5.4.0. + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in +--- rpm-5.4.8.orig/macros/macros.in 2012-03-21 19:04:06.000000000 -0500 ++++ rpm-5.4.8/macros/macros.in 2012-06-07 17:02:53.903046624 -0500 +@@ -985,7 +985,7 @@ + + #============================================================================== + # ---- rpmbuild macros. +-#%%{load:%{_usrlibrpm}/macros.rpmbuild} ++%{load:%{_usrlibrpm}/macros.rpmbuild} + + #------------------------------------------------------------------------ + # cmake(...) configuration +@@ -997,15 +997,15 @@ + + #------------------------------------------------------------------------ + # perl(...) configuration +-#%%{load:%{_usrlibrpm}/macros.d/perl} ++%{load:%{_usrlibrpm}/macros.d/perl} + + #------------------------------------------------------------------------ + # python(...) configuration. +-#%%{load:%{_usrlibrpm}/macros.d/python} ++%{load:%{_usrlibrpm}/macros.d/python} + + #------------------------------------------------------------------------ + # php(...) configuration. +-#%%{load:%{_usrlibrpm}/macros.d/php} ++%{load:%{_usrlibrpm}/macros.d/php} + + #------------------------------------------------------------------------ + # java(...) configuration. +@@ -1013,11 +1013,11 @@ + + #------------------------------------------------------------------------ + # libtool(...) configuration. +-#%%{load:%{_usrlibrpm}/macros.d/libtool} ++%{load:%{_usrlibrpm}/macros.d/libtool} + + #------------------------------------------------------------------------ + # pkgconfig(...) configuration. +-#%%{load:%{_usrlibrpm}/macros.d/pkgconfig} ++%{load:%{_usrlibrpm}/macros.d/pkgconfig} + + #------------------------------------------------------------------------ + # mono(...) configuration. +@@ -1029,7 +1029,7 @@ + + #------------------------------------------------------------------------ + # tcl(...) configuration. +-#%%{load:%{_usrlibrpm}/macros.d/tcl} ++%{load:%{_usrlibrpm}/macros.d/tcl} + + # \endverbatim + #*/ |