- one more make clean

[packages/john.git] / john.spec

diff --git a/john.spec b/john.spec
index bd80a9a5160d6e43cadf543ae395db85e33058cc..c64451de5212dcfa31b15da6c47898a128c324c5 100644 (file)
--- a/john.spec
+++ b/john.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_with    jumbopatch      # This patch integrates lots of contributed
+%bcond_without jumbopatch      # This patch integrates lots of contributed
                                # patches adding support for over 30
                                # of additional hash types, and more.
 %bcond_with    avx             # use x86 AVX instructions
@@ -34,15 +34,17 @@
 Summary:       Password cracker
 Summary(pl.UTF-8):     Łamacz haseł
 Name:          john
-Version:       1.7.8
+Version:       1.7.9
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://www.openwall.com/john/g/%{name}-%{version}.tar.bz2
-# Source0-md5: e6d7f261829610d6949c706ebac0517c
+# Source0-md5: 45f54fc59386ecd67daaef9f19781d93
 Patch0:                %{name}-mailer.patch
 Patch1:                optflags.patch
-Patch2:                http://www.openwall.com/john/g/%{name}-%{version}-jumbo-2.diff.gz
+Patch2:                http://www.openwall.com/john/g/%{name}-1.7.9-jumbo-6.diff.gz
+# Patch2-md5:  685c759ec6f865ea81f40a487cd56882
+Patch3:                %{name}-jumbo-optflags.patch
 URL:           http://www.openwall.com/john/
 %{?with_jumbopatch:BuildRequires: openssl-devel >= 0.9.7}
 BuildRequires: rpmbuild(macros) >= 1.213
@@ -82,8 +84,9 @@ Windows NT/2000/XP LM, a także kilka innych przy użyciu łat.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%{!?with_jumbopatch:%patch1 -p1}
 %{?with_jumbopatch:%patch2 -p1}
+%{?with_jumbopatch:%patch3 -p1}
 
 %{__rm} doc/INSTALL
 
@@ -108,6 +111,7 @@ mv ../run/john ../run/john-non-mmx
        CC="%{__cc}" \
        OPTFLAGS="%{rpmcflags} -include defs.h %{?optmmxfb}"
 mv ../run/john ../run/john-non-sse
+%{__make} clean
 %endif
 
 TARG=generic
@@ -183,4 +187,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{do_ssefb}
 %attr(755,root,root) %{_libdir}/john/john-non-sse
 %endif
+%endif
 %{_datadir}/john