RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm/ macros.in

From: Jeff Johnson <jbj@rpm5.org>
Date: Mon 24 Sep 2007 - 04:37:56 CEST
Message-Id: <20070924023756.BF2A434845E@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   24-Sep-2007 04:37:56
  Branch: HEAD                             Handle: 2007092403375600

  Modified files:
    rpm                     macros.in

  Log:
    - permit white space in file patjs a few more places.

  Summary:
    Revision    Changes     Path
    1.197       +5  -5      rpm/macros.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/macros.in
  ============================================================================
  $ cvs diff -u -r1.196 -r1.197 macros.in
  --- rpm/macros.in	6 Sep 2007 12:41:35 -0000	1.196
  +++ rpm/macros.in	24 Sep 2007 02:37:56 -0000	1.197
  @@ -1,7 +1,7 @@
   #/*! \page config_macros Default configuration: @USRLIBRPM@/macros
   # \verbatim
   #
  -# $Id: macros.in,v 1.196 2007/09/06 12:41:35 jbj Exp $
  +# $Id: macros.in,v 1.197 2007/09/24 02:37:56 jbj Exp $
   #
   # This is a global RPM configuration file. All changes made here will
   # be lost when the rpm package is upgraded. Any per-system configuration
  @@ -1069,7 +1069,7 @@
     \
     %{verbose:set -x}%{!verbose:exec > /dev/null}\
     umask 022\
  -  cd '%{u2p:%{_builddir}}'\
  +  cd "%{u2p:%{_builddir}}"\
   
   
   #%___build_body		%{nil}
  @@ -1322,7 +1322,7 @@
   %GNUconfigure(MCs:)      \
     CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS; \
     LDFLAGS="${LDFLAGS:-%{-s:-s}}"  ; export LDFLAGS; \
  -  %{-C:_mydir="`pwd`"; %{-M: %{__mkdir} -p %{-C*};} cd %{-C*}} \
  +  %{-C:_mydir="`pwd`"; %{-M: %{__mkdir} -p "%{-C*}";} cd "%{-C*}"} \
     dirs="`find ${_mydir} -name 'configure.[ai][cn]' -print`"; export dirs; \
       for coin in `echo ${dirs}` \
   do \
  @@ -1331,7 +1331,7 @@
    : \
   else \
        macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < ${coin}`; \
  -    ( cd ${dr}; \
  +    ( cd "${dr}"; \
         aclocalinclude="${ACLOCAL_FLAGS}"; \
         for k in ${macrodirs}; do \
           if test -d ${k}; then \
  @@ -1363,7 +1363,7 @@
     fi \
   done \
     %{-C:${_mydir}}%{!-C:.}/configure %{_target_platform} --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir} %* ; \
  -  %{-C:cd ${_mydir}; unset _mydir}
  +  %{-C:cd "${_mydir}"; unset _mydir}
   
   #------------------------------------------------------------------------------
   # arch macro for all Intel i?86 compatibile processors
  @@ .
Received on Mon Sep 24 04:37:56 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.