[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/macros/ ruby.in
From:       "Per ?yvind Karlsen" <pkarlsen () rpm5 ! org>
Date:       2011-10-15 12:56:57
Message-ID: 20111015125657.881D490939 () rpm5 ! org
[Download RAW message or body]

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

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
  Module: rpm                              Date:   15-Oct-2011 14:56:57
  Branch: rpm-5_4                          Handle: 2011101512565601

  Modified files:           (Branch: rpm-5_4)
    rpm                     CHANGES
    rpm/macros              ruby.in

  Log:
    add %ruby_sitedir and %ruby_vendor macros.

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

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3501.2.182 -r1.3501.2.183 CHANGES
  --- rpm/CHANGES	12 Oct 2011 16:51:51 -0000	1.3501.2.182
  +++ rpm/CHANGES	15 Oct 2011 12:56:56 -0000	1.3501.2.183
  @@ -1,4 +1,5 @@
   5.4.3 -> 5.4.4:
  +    - proyvind: add %ruby_sitedir and %ruby_vendor macros.
       - devzero2000: get rid of bashisms in dbconvert.sh and gstreamer.sh
       - jbj: start rpm-5.4.4 development.
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/macros/ruby.in
  ============================================================================
  $ cvs diff -u -r1.4.2.1 -r1.4.2.2 ruby.in
  --- rpm/macros/ruby.in	1 Apr 2011 02:03:43 -0000	1.4.2.1
  +++ rpm/macros/ruby.in	15 Oct 2011 12:56:57 -0000	1.4.2.2
  @@ -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


[prev in list] [next in list] [prev in thread] [next in thread]