]> git.pld-linux.org Git - projects/pld-builder.new.git/commitdiff
- spec name may be different than package %%{name} (eg. kernel packages)
authorJan Rękorajski <baggins@pld-linux.org>
Sat, 20 Oct 2012 20:23:46 +0000 (22:23 +0200)
committerJan Rękorajski <baggins@pld-linux.org>
Sat, 20 Oct 2012 20:23:46 +0000 (22:23 +0200)
PLD_Builder/request.py

index 79bd0e519d3ad287db778559deb5fafefd26119c..603b13125dfd8fae63e7cd953bb308798c3ca651 100644 (file)
@@ -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):
This page took 0.198061 seconds and 4 git commands to generate.