summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2010-08-01 18:13:01 -0500
committerDennis Gilmore <dennis@ausil.us>2010-08-01 18:14:16 -0500
commit8ca17966d912f8f22d30bab217d085ec7f275adf (patch)
treee9bdfd29d8a843310f8a50e94cfee9d89b3d357f
parent06be2b0765c07275f5a9bed1a76ac92f98980b60 (diff)
downloadfedora-packager-8ca17966d912f8f22d30bab217d085ec7f275adf.tar.gz
fedora-packager-8ca17966d912f8f22d30bab217d085ec7f275adf.tar.xz
fedora-packager-8ca17966d912f8f22d30bab217d085ec7f275adf.zip
set the loacl rpms macros to match whats set in olpc-release,
fedora-release and redhat-release. fixes a bug on local rpm creation
-rw-r--r--src/pyfedpkg/__init__.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py
index 8cbbec9..1889837 100644
--- a/src/pyfedpkg/__init__.py
+++ b/src/pyfedpkg/__init__.py
@@ -725,18 +725,21 @@ class PackageModule:
if self.branch.startswith('f'):
self.distval = self.branch.split('f')[1]
self.distvar = 'fedora'
+ self.distshort = 'fc%s' % self.distval
self.dist = '.fc%s' % self.distval
self.target = 'dist-f%s-updates-candidate' % self.distval
self.mockconfig = 'fedora-%s-%s' % (self.distval, self.localarch)
elif self.branch.startswith('el'):
self.distval = self.branch.split('el')[1]
- self.distvar = 'epel'
+ self.distvar = 'rhel'
+ self.distshort = 'el%s' % self.distval
self.dist = '.el%s' % self.distval
self.target = 'dist-%sE-epel-testing-candidate' % self.distval
self.mockconfig = 'epel-%s-%s' % (self.distval, self.localarch)
elif self.branch.startswith('olpc'):
self.distval = self.branch.split('olpc')[1]
self.distvar = 'olpc'
+ self.distshort = 'olpc%s' % self.distval
self.dist = '.olpc%s' % self.distval
self.target = 'dist-olpc%s' % self.distval
# If we don't match one of the above, assume master or a branch of
@@ -754,7 +757,7 @@ class PackageModule:
"--define '_rpmdir %s'" % path,
"--define 'dist %s'" % self.dist,
"--define '%s %s'" % (self.distvar, self.distval),
- "--define '%s 1'" % self.distvar]
+ "--define '%s 1'" % self.distshort]
self.ver = self.getver()
self.rel = self.getrel()