- when building jumbo version, configure decidec what cpu features to build

diff --git a/john.spec b/john.spec
index 8a2a9a509da591abae2b938826299f31fa28d098..bf1b368ce1425d51e8a5c38d2984ef0cdc2c1ed4 100644 (file)
--- a/john.spec
+++ b/john.spec
@@ -7,6 +7,7 @@
 %bcond_with    xop             # use x86 XOP instructions
 %bcond_with    altivec         # use PPC Altivec instructions
 
+%if %{without jumbo}
 %ifarch i586 i686 athlon pentium2 pentium3 pentium4
 %define do_mmx 1
 %else
@@ -31,6 +32,7 @@
 %define do_ssefb 0
 %define optssefb %{nil}
 %endif
+%endif
 
 Summary:       Password cracker
 Summary(pl.UTF-8):     Łamacz haseł
@@ -167,6 +169,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/john}
 cp -a run/{*.conf,*.chr,*.lst} $RPM_BUILD_ROOT%{_datadir}/john
 install -p run/john $RPM_BUILD_ROOT%{_bindir}
+
 %if %{do_mmxfb}
 install -D -p run/john-non-mmx $RPM_BUILD_ROOT%{_libdir}/john/john-non-mmx
 %endif