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: 03-Apr-2011 21:56:55 Branch: HEAD Handle: 2011040319565401 Modified files: rpm CHANGES rpm/macros macros.in Log: - mongo: stub-in a configurable mongodb:// %_mongodb URI. Summary: Revision Changes Path 1.3597 +1 -0 rpm/CHANGES 1.52 +10 -1 rpm/macros/macros.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3596 -r1.3597 CHANGES --- rpm/CHANGES 3 Apr 2011 19:22:54 -0000 1.3596 +++ rpm/CHANGES 3 Apr 2011 19:56:54 -0000 1.3597 @@ -1,4 +1,5 @@ 5.4.0 -> 5.4.1: + - jbj: mongo: stub-in a configurable mongodb:// %_mongodb URI. - jbj: autofu: fix: remove --with-js remnants. - jbj: autofu: drop --with-js=internal now that JS 1.8.5 is available. - jbj: fix: reduce false positives checking for duplicate keys (#62822). @@ . patch -p0 <<'@@ .' Index: rpm/macros/macros.in ============================================================================ $ cvs diff -u -r1.51 -r1.52 macros.in --- rpm/macros/macros.in 1 Apr 2011 05:09:40 -0000 1.51 +++ rpm/macros/macros.in 3 Apr 2011 19:56:55 -0000 1.52 @@ -1,7 +1,7 @@ #/*! \page config_macros Default configuration: @USRLIBRPM@/macros # \verbatim # -# $Id: macros.in,v 1.51 2011/04/01 05:09:40 pkarlsen Exp $ +# $Id: macros.in,v 1.52 2011/04/03 19:56:55 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 @@ -265,6 +265,15 @@ #%_pgp_name #%_pgp_path +# Elements necessary to construct a mongodb:// URI configurably +# +%__mongodb_user luser +%__mongodb_password %{nil} +%__mongodb_host tempest.mongohq.com +%__mongodb_port 10017 +%__mongodb_database cooker +%_mongodb mongodb://%{__mongodb_user}:%{__mongodb_password}@%{__mongodb_host}:%{__mongodb_port}/%{__mongodb_database} + #============================================================================== # ---- Build configuration macros. # @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
