RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Mark Hatle
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Jul-2007 19:15:03
Branch: HEAD Handle: 2007070218150200
Modified files:
rpm CHANGES platform.in rpmpopt.in
Log:
Change @USRLIBRPM@ to %{_usrlibrpm}. This is needed by runtime relocation.
Both of the locations the change was made in is safe, as _usrlibrpm will
have
been loaded by then.
Summary:
Revision Changes Path
1.1426 +1 -0 rpm/CHANGES
2.20 +5 -5 rpm/platform.in
2.44 +2 -2 rpm/rpmpopt.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1425 -r1.1426 CHANGES
--- rpm/CHANGES 2 Jul 2007 17:13:20 -0000 1.1425
+++ rpm/CHANGES 2 Jul 2007 17:15:02 -0000 1.1426
@@ -1,4 +1,5 @@
4.5 -> 5.0:
+ - mgh: change uses of @USRLIBRPM@ to %{_usrlibrpm} (needed for runtime
relocation)
- mgh: ensure the rpm python module is linked the same as the rest of RPM
- rse: prune the 23MB large db/docs/ third-party subtree to no longer
ship it in RPM distribution tarballs.
- rse: allow installation paths to be overridden via "configure" options
--with-path-xxx.
@@ .
patch -p0 <<'@@ .'
Index: rpm/platform.in
============================================================================
$ cvs diff -u -r2.19 -r2.20 platform.in
--- rpm/platform.in 25 May 2007 17:35:52 -0000 2.19
+++ rpm/platform.in 2 Jul 2007 17:15:02 -0000 2.20
@@ -53,11 +53,11 @@
%__arch_install_post @ARCH_INSTALL_POST@
%__os_install_post \
- @USRLIBRPM@/brp-compress \
- @USRLIBRPM@/brp-strip \
- @USRLIBRPM@/brp-strip-static-archive \
- @USRLIBRPM@/brp-strip-comment-note \
- @USRLIBRPM@/brp-nobuildrootpath \
+ %{_usrlibrpm}/brp-compress \
+ %{_usrlibrpm}/brp-strip \
+ %{_usrlibrpm}/brp-strip-static-archive \
+ %{_usrlibrpm}/brp-strip-comment-note \
+ %{_usrlibrpm}/brp-nobuildrootpath \
%{nil}
%__spec_install_post\
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
============================================================================
$ cvs diff -u -r2.43 -r2.44 rpmpopt.in
--- rpm/rpmpopt.in 10 Jun 2007 23:29:04 -0000 2.43
+++ rpm/rpmpopt.in 2 Jul 2007 17:15:02 -0000 2.44
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.43 2007/06/10 23:29:04 jbj Exp $
+# $Id: rpmpopt.in,v 2.44 2007/07/02 17:15:02 fray Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -164,7 +164,7 @@
rpm alias --i18ndomains --define '_i18ndomains !#:+'
# Build policies enabled from command line. Last policy applies.
-rpm alias --buildpolicy --define '__os_install_post @USRLIBRPM@/brp-!#:+' \
+rpm alias --buildpolicy --define '__os_install_post %{_usrlibrpm}/brp-!#:+' \
--POPTdesc=$"set buildroot <policy> (e.g. compress man pages)" \
--POPTargs=$"<policy>"
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
