centos/centpkg
1
0
Fork 0
mirror of https://git.centos.org/centos/centpkg.git synced 2025-02-23 16:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up rpmdefines, we only need to define _topdir rather than pointing at each individual directory

Browse source
This commit is contained in:
Brian Stinson 2014-06-17 20:50:21 -05:00
parent cfdeed2808
commit 2eaea9fba3
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/centpkg/__init__.py
View file

@ -27,14 +27,10 @@ class Commands(pyrpkg.Commands):
self._distval = osver self._distval = osver
self._distval = self._distval.replace('.', '_') self._distval = self._distval.replace('.', '_')
self._disttag = 'el%s' % self._distval self._disttag = 'el%s' % self._distval
self._rpmdefines = ["--define '_sourcedir %s'" % os.path.join(self.path,'SOURCES'), self._rpmdefines = ["--define '_topdir {0}'".format(self.path),
"--define '_specdir %s'" % os.path.join(self.path,'SPECS'), "--define 'dist .{0}'".format(self._disttag),
"--define '_builddir %s'" % os.path.join(self.path,'BUILD'),
"--define '_srcrpmdir %s'" % os.path.join(self.path,'SRPMS'),
"--define '_rpmdir %s'" % os.path.join(self.path, 'RPMS'),
"--define 'dist .%s'" % self._disttag,
# int and float this to remove the decimal # int and float this to remove the decimal
"--define '%s 1'" % self._disttag] "--define '{0} 1'".format(self._disttag)]
def load_spec(self): def load_spec(self):
"""This sets the spec attribute""" """This sets the spec attribute"""