From: Andy Cobaugh <phalenor@gmail.com>
Date: Wed, 11 May 2011 21:02:40 +0000 (-0400)
Subject: rpm: Really undefine %dist
X-Git-Tag: upstream/1.6.0.pre6^2~22
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1c063d12aa8ae49bb21620e11da954ef9cf8e32a;p=packages%2Fo%2Fopenafs.git

rpm: Really undefine %dist

rpmbuild --eval '%undefine dist' wasn't sticking on redhat 5.x. I think
the correct way to undefine this is to --define 'dist %undefined'

Some redhat 5.x installs have %dist defined depending on what else has been
installed.

Reviewed-on: http://gerrit.openafs.org/4643
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 0b983054f88d69ca4c0cda07e94103f216bd881d)

Change-Id: I41828880a10097059ae0297ae191fa2a96e804d2
Reviewed-on: http://gerrit.openafs.org/4665
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/packaging/RedHat/makesrpm.pl b/src/packaging/RedHat/makesrpm.pl
index fc372e9b3..9da2de2ce 100755
--- a/src/packaging/RedHat/makesrpm.pl
+++ b/src/packaging/RedHat/makesrpm.pl
@@ -150,7 +150,7 @@ if ($changelog) {
 }
 
 # Build an RPM
-system("rpmbuild -bs --eval \"%undefine dist\" ".
+system("rpmbuild -bs --define \"dist %undefined\" ".
        "--define \"_topdir $tmpdir/rpmdir\" ".
        "$tmpdir/rpmdir/SPECS/openafs.spec > /dev/null") == 0
   or die "rpmbuild failed : $!\n";