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:   13-Dec-2010 16:56:26
  Branch: rpm-5_4                          Handle: 2010121315562501

  Modified files:           (Branch: rpm-5_4)
    rpm                     CHANGES
    rpm/scripts             rubygems.rb

  Log:
    rubygems: only add runtime dependencies (Rémy Clouard)

  Summary:
    Revision    Changes     Path
    1.3501.2.5  +1  -0      rpm/CHANGES
    1.5.2.1     +1  -1      rpm/scripts/rubygems.rb
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3501.2.4 -r1.3501.2.5 CHANGES
  --- rpm/CHANGES       9 Dec 2010 20:44:14 -0000       1.3501.2.4
  +++ rpm/CHANGES       13 Dec 2010 15:56:25 -0000      1.3501.2.5
  @@ -4,6 +4,7 @@
       - jbj: rpm.spec: adjust to reality (popt needs to be in tarball, todo++).
   
   5.3.6 -> 5.3.7:
  +    - proyvind: rubygems: only add runtime dependencies (Rémy Clouard).
       - proyvind: export rpmbf.h & rpmgi.h to public API.
       - proyvind: rpm4compat: add RPMTAG_FILENAMES & RPMDBI_LABEL.
       - proyvind: rpmconstant: update constants.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/scripts/rubygems.rb
  ============================================================================
  $ cvs diff -u -r1.5 -r1.5.2.1 rubygems.rb
  --- rpm/scripts/rubygems.rb   18 Oct 2010 12:49:05 -0000      1.5
  +++ rpm/scripts/rubygems.rb   13 Dec 2010 15:56:26 -0000      1.5.2.1
  @@ -74,7 +74,7 @@
       end
       if requires
         for d in spec.dependencies
  -        print d.requirement.to_rpm(d.name)
  +        print d.requirement.to_rpm(d.name) unless d.type != :runtime
         end
         for d in spec.required_rubygems_version.to_rpm("rubygems")
           print d.gsub(/(rubygem\()|(\))/, "")
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to