[ansifilter/el6] Fix merge.

Christopher Meng cicku at fedoraproject.org
Tue Jul 22 01:54:47 UTC 2014


commit a4040628009aa3e177c0d70f528c3fb9bd249d54
Author: Christopher Meng <i at cicku.me>
Date:   Tue Jul 22 09:05:33 2014 +0800

    Fix merge.

 ansifilter.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/ansifilter.spec b/ansifilter.spec
index 3a6ee2a..d19e7cd 100644
--- a/ansifilter.spec
+++ b/ansifilter.spec
@@ -43,10 +43,10 @@ find . -type f -exec sed -i 's/\r$//' {} + -print
 %build
 # Upstream embed the cli code in gui so no need to requires cli using GUI
 # program, in order to achieve this we need to preserve the objects with -c.
-%make_build CFLAGS="%{optflags} -c" LDFLAGS="%{?__global_ldflags}"
+make CFLAGS="%{optflags} -c" LDFLAGS="%{?__global_ldflags}" %{?_smp_mflags}
 %if 0%{?with_gui}
 # %%_qt4_qmake will respect the redhat-rpm-config
-%make_build all-gui QMAKE="%{_qt4_qmake}"
+make all-gui QMAKE="%{_qt4_qmake}" %{?_smp_mflags}
 %endif
 
 %install


More information about the scm-commits mailing list