OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_0pre3-9-gca878f0

Gerrit Code Review gerrit@openafs.org
Wed, 23 Mar 2011 11:30:05 -0700 (PDT)


The following commit has been merged in the openafs-stable-1_6_x branch:
commit ca878f0eac4775f02967e9df31f54a28573f12dd
Author: Simon Wilkinson <sxw@your-file-system.com>
Date:   Thu Mar 17 19:28:23 2011 +0000

    rpms: Make makesrpm.pl cater for new rpm names
    
    Starting from 1.6.0, our specfile no longer adds a stray '1.' to the
    start of the release field. makesrpm.pl was failing to deal with
    these new-style names and therefore not actually making an rpm.
    
    Fix this by conditionalising on the OpenAFS version when selecting
    which rpm to copy.
    
    Reviewed-on: http://gerrit.openafs.org/4258
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>
    (cherry picked from commit af854b4e2f19e5f1a83b686e99ca3dd6122af942)
    
    Change-Id: I95bc506e1113d0054b2aaca3a301551de1f086db
    Reviewed-on: http://gerrit.openafs.org/4280
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/packaging/RedHat/makesrpm.pl |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

-- 
OpenAFS Master Repository