RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 30-Sep-2011 21:20:32
Branch: rpm-5_4 Handle: 2011093019203100
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/macros macros.rpmbuild.in
Log:
- reduce the scriptlet envar's for "real world" usage cases.
Summary:
Revision Changes Path
1.3501.2.175+1 -0 rpm/CHANGES
1.4.4.8 +2 -12 rpm/macros/macros.rpmbuild.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.174 -r1.3501.2.175 CHANGES
--- rpm/CHANGES 30 Sep 2011 12:43:32 -0000 1.3501.2.174
+++ rpm/CHANGES 30 Sep 2011 19:20:31 -0000 1.3501.2.175
@@ -1,4 +1,5 @@
5.4.2 -> 5.4.3:
+ - jbj: reduce the scriptlet envar's for "real world" usage cases.
- devzero2000: call umask before mkstemp.
The mkstemp() function generates a unique temporary file name from the
supplied template,
opens a file of that name using the O_EXCL flag (guaranteeing the
current process to be the only user)
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/macros.rpmbuild.in
============================================================================
$ cvs diff -u -r1.4.4.7 -r1.4.4.8 macros.rpmbuild.in
--- rpm/macros/macros.rpmbuild.in 29 Jul 2011 04:26:52 -0000 1.4.4.7
+++ rpm/macros/macros.rpmbuild.in 30 Sep 2011 19:20:31 -0000 1.4.4.8
@@ -1,7 +1,7 @@
#/*! \page build_macros Default configuration: @USRLIBRPM@/macros.rpmbuild
# \verbatim
#
-# $Id: macros.rpmbuild.in,v 1.4.4.7 2011/07/29 04:26:52 pkarlsen Exp $
+# $Id: macros.rpmbuild.in,v 1.4.4.8 2011/09/30 19:20:31 jbj Exp $
#
# This file contains rpmbuild configuration macros.
#
@@ -301,18 +301,8 @@
%___build_args -e
%___build_cmd %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh}
%{_remhost} }%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot}
}%{___build_shell} %{___build_args}
%___build_pre \
- RPM_SOURCE_DIR=\"%{u2p:%{_sourcedir}}\"\
- RPM_BUILD_DIR=\"%{u2p:%{_builddir}}\"\
RPM_OPT_FLAGS=\"%{optflags}\"\
- RPM_ARCH=\"%{_arch}\"\
- RPM_OS=\"%{_os}\"\
- export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS\
- RPM_DOC_DIR=\"%{_docdir}\"\
- export RPM_DOC_DIR\
- RPM_PACKAGE_NAME=\"%{name}\"\
- RPM_PACKAGE_VERSION=\"%{version}\"\
- RPM_PACKAGE_RELEASE=\"%{release}\"\
- export RPM_PACKAGE_NAME RPM_PACKAGE_VERSION RPM_PACKAGE_RELEASE\
+ export RPM_OPT_FLAGS\
%{?buildroot:RPM_BUILD_ROOT=\"%{u2p:%{buildroot}}\"\
export RPM_BUILD_ROOT}\
%{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
