RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarl...@rpm5.org
  Module: rpm                              Date:   15-Oct-2011 14:55:13
  Branch: HEAD                             Handle: 2011101512551201

  Modified files:
    rpm                     CHANGES
    rpm/macros              ruby.in

  Log:
    add %ruby_sitedir and %ruby_vendor macros.

  Summary:
    Revision    Changes     Path
    1.3682      +1  -0      rpm/CHANGES
    1.6         +2  -0      rpm/macros/ruby.in
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3681 -r1.3682 CHANGES
  --- rpm/CHANGES       12 Oct 2011 16:50:51 -0000      1.3681
  +++ rpm/CHANGES       15 Oct 2011 12:55:12 -0000      1.3682
  @@ -1,4 +1,5 @@
   HEAD:
  +    - proyvind: add %ruby_sitedir and %ruby_vendor macros.
       - devzero2000: get rid of bashisms in dbconvert.sh and gstreamer.sh
       - devzero2000: gendiff don't have bashism
       - devzero2000: call umask before mkstemp.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/ruby.in
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 ruby.in
  --- rpm/macros/ruby.in        1 Apr 2011 02:02:18 -0000       1.5
  +++ rpm/macros/ruby.in        15 Oct 2011 12:55:13 -0000      1.6
  @@ -15,8 +15,10 @@
   
   %ruby_archdir                %(%{__ruby} -rrbconfig -e 'print 
Config::CONFIG["archdir"]')
   %ruby_libdir         %(%{__ruby} -rrbconfig -e 'print 
Config::CONFIG["rubylibdir"]')
  +%ruby_sitedir                %(%{__ruby} -rrbconfig -e 'print 
Config::CONFIG["sitedir"]')
   %ruby_sitearchdir    %(%{__ruby} -rrbconfig -e 'print 
Config::CONFIG["sitearchdir"]')
   %ruby_sitelibdir     %(%{__ruby} -rrbconfig -e 'print 
Config::CONFIG["sitelibdir"]')
  +%ruby_vendordir              %(%{__ruby} -rrbconfig -e 'print 
Config::CONFIG["vendordir"]')
   %ruby_vendorarchdir  %(%{__ruby} -rrbconfig -e 'print 
Config::CONFIG["vendorarchdir"]')
   %ruby_vendorlibdir   %(%{__ruby} -rrbconfig -e 'print 
Config::CONFIG["vendorlibdir"]')
   %ruby_gemdir         %(%{__ruby} -rrbconfig -e 'include Config; print 
CONFIG["rubylibdir"].sub(CONFIG["ruby_version"], 
"gems/#{CONFIG["ruby_version"]}")')
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to