RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 28-Mar-2016 21:15:02 Branch: rpm-5_4 Handle: 2016032819150200 Modified files: (Branch: rpm-5_4) rpm/macros macros.in Log: - macros: load build macros by default again (for now). Summary: Revision Changes Path 1.39.2.48 +2 -2 rpm/macros/macros.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/macros/macros.in ============================================================================ $ cvs diff -u -r1.39.2.47 -r1.39.2.48 macros.in --- rpm/macros/macros.in 5 Mar 2016 21:42:39 -0000 1.39.2.47 +++ rpm/macros/macros.in 28 Mar 2016 19:15:02 -0000 1.39.2.48 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.39.2.47 2016/03/05 21:42:39 jbj Exp $ +# $Id: macros.in,v 1.39.2.48 2016/03/28 19:15:02 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 @@ -1055,7 +1055,7 @@ #============================================================================== # ---- rpmbuild macros. -#%%{load:%{_usrlibrpm}/macros.rpmbuild} +%{load:%{_usrlibrpm}/macros.rpmbuild} #------------------------------------------------------------------------ # cmake(...) configuration @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
