From 5d94b024d465dbbab008acfd27c78dbd1c33a964 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Adam=20Go=C5=82=C4=99biowski?= <adamg@pld-linux.org>
Date: Sun, 3 Jul 2011 10:10:37 +0000
Subject: [PATCH] - store jumbo patch in df - solve conflict between optflags
 and jumbo patches

Changed files:
    john.spec -> 1.67
---
 john.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/john.spec b/john.spec
index ec9576e..4508f38 100644
--- a/john.spec
+++ b/john.spec
@@ -43,6 +43,8 @@ Source0:	http://www.openwall.com/john/g/%{name}-%{version}.tar.bz2
 Patch0:		%{name}-mailer.patch
 Patch1:		optflags.patch
 Patch2:		http://www.openwall.com/john/g/%{name}-%{version}-jumbo-2.diff.gz
+# Patch2-md5:	445bbcc9049a632c18359cb7a0fdfb27
+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
 
-- 
2.44.0