From 9fcb008b58a197f1636bfda7dbb0cb0404b243d9 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Thu, 6 Oct 2005 01:21:27 +0000
Subject: [PATCH] fixed rpmExpand() usage

---
 build/parsePrep.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/parsePrep.c b/build/parsePrep.c
index 4ff2196..010c90a 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -420,7 +420,7 @@ static int doSetupMacro(Spec spec, char *line)
     /* XXX FIXME: owner & group fixes were conditioned on !geteuid() */
     /* Fix the owner, group, and permissions of the setup build tree */
     {	/*@observer@*/ static const char *fixmacs[] =
-		{ "%{_fixowner}", "%{_fixgroup}", "%{_fixperms}", NULL };
+		{ "%{?_fixowner}", "%{?_fixgroup}", "%{?_fixperms}", NULL };
 	const char ** fm;
 
 	for (fm = fixmacs; *fm; fm++) {
@@ -428,7 +428,7 @@ static int doSetupMacro(Spec spec, char *line)
 	    /*@-nullpass@*/
 	    fix = rpmExpand(*fm, " .", NULL);
 	    /*@=nullpass@*/
-	    if (fix && *fix != '%')
+	    if (fix && *fix != ' ')
 		appendLineStringBuf(spec->prep, fix);
 	    fix = _free(fix);
 	}