[projects/pld-builder.new] - spec name may be different than package %%{name} (eg. kernel packages)
baggins
baggins at pld-linux.org
Sat Oct 20 22:24:19 CEST 2012
commit ff71f1e59401e1099f54c6915193982b5120f6e5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Oct 20 22:23:46 2012 +0200
- spec name may be different than package %%{name} (eg. kernel packages)
PLD_Builder/request.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/PLD_Builder/request.py b/PLD_Builder/request.py
index 79bd0e5..603b131 100644
--- a/PLD_Builder/request.py
+++ b/PLD_Builder/request.py
@@ -312,10 +312,10 @@ class Batch:
"""
rpmopts = self.bconds_string() + self.kernel_string() + self.target_string() + self.defines_string()
rpmdefs = \
- "--define '_topdir %(echo $HOME/rpm)' " \
- "--define '_specdir %{_topdir}/packages/%{name}' " \
- "--define '_sourcedir %{_specdir}' " \
- "--define '_builddir %{_topdir}/BUILD/%{name}' "
+ "--define '_topdir %%(echo $HOME/rpm)' " \
+ "--define '_specdir %%{_topdir}/packages/%s' " \
+ "--define '_sourcedir %%{_specdir}' " \
+ "--define '_builddir %%{_topdir}/BUILD/%%{name}' " % self.spec[:-5]
return rpmdefs + rpmopts
def kernel_string(self):
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/ff71f1e59401e1099f54c6915193982b5120f6e5
More information about the pld-cvs-commit
mailing list