]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
rpm: Really undefine %dist
authorAndy Cobaugh <phalenor@gmail.com>
Wed, 11 May 2011 21:02:40 +0000 (17:02 -0400)
committerDerrick Brashear <shadow@dementia.org>
Tue, 17 May 2011 14:46:10 +0000 (07:46 -0700)
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>
src/packaging/RedHat/makesrpm.pl

index fc372e9b34b1eb64892d3d06705ec972e4d7f38d..9da2de2ce114e5624b2f0fe4206b8d2884133057 100755 (executable)
@@ -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";