jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 07:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rpm: Build srpms without %dist in their name

Browse Source 
On RHEL6, %dist is set for all RPMS and SRPMS built on the system. This
leads to makesrpm.pl building SRPMS with .el6 in their release. As we
endeavour to use the same SRPM on all of our Fedora platforms, this is
less than ideal, so change makesrpm.pl to squash the setting of %dist
before building the RPM.

Reviewed-on: http://gerrit.openafs.org/4285
Reviewed-by: Alexander Ivan Redinger <aredinger@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit b0921071dd)

Change-Id: I9e5bb2ce13378a0927763535d885a4728bd48f06
Reviewed-on: http://gerrit.openafs.org/4307
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Simon Wilkinson 2011-03-23 15:35:35 +00:00 committed by Derrick Brashear
parent f8c1bebf88
commit eb27681021
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/packaging/RedHat/makesrpm.pl
View File

@ -150,7 +150,8 @@ if ($changelog) {
} }
# Build an RPM # Build an RPM
system("rpmbuild -bs --define \"_topdir $tmpdir/rpmdir\" ". system("rpmbuild -bs --eval \"%undefine dist\" ".
"--define \"_topdir $tmpdir/rpmdir\" ".
"$tmpdir/rpmdir/SPECS/openafs.spec > /dev/null") == 0 "$tmpdir/rpmdir/SPECS/openafs.spec > /dev/null") == 0
or die "rpmbuild failed : $!\n"; or die "rpmbuild failed : $!\n";