- permit scriptlet includes from builddir for spec files w/o %setup.

CVS patchset: 7889
CVS date: 2005/07/15 15:08:34

diff --git a/CHANGES b/CHANGES
index 0a23f12..9286511 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,7 @@
        - fix: initialize variables used in debug msg (#160458).
        - permit zlib in rpm to be built with make -j (#159404).
        - avoid '?' for zero length file mmap failure doing md5 (#159405).
+       - permit scriptlet includes from builddir for spec files w/o %setup.
 
 4.4 -> 4.4.1:
        - force *.py->*.pyo byte code compilation with brp-python-bytecompile.

diff --git a/build/pack.c b/build/pack.c
index f02d2ee..dfccc7e 100644 (file)
--- a/build/pack.c
+++ b/build/pack.c
@@ -138,8 +138,7 @@ static /*@only@*/ /*@null@*/ StringBuf addFileToTagAux(Spec spec,
     FILE * f;
     FD_t fd;
 
-    /* XXX use rpmGenPath(rootdir, "%{_buildir}/%{_buildsubdir}/", file) */
-    fn = rpmGetPath("%{_builddir}/", spec->buildSubdir, "/", file, NULL);
+    fn = rpmGetPath("%{_builddir}/%{?_buildsubdir:%{_buildsubdir}/}", file, NULL);
 
     fd = Fopen(fn, "r.ufdio");
     if (fn != buf) fn = _free(fn);