packages: john/john.spec - store jumbo patch in df - solve conflict between...

[adamg]

Author: adamg                        Date: Sun Jul  3 10:10:42 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- store jumbo patch in df
- solve conflict between optflags and jumbo patches

---- Files affected:
packages/john:
   john.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: packages/john/john.spec
diff -u packages/john/john.spec:1.66 packages/john/john.spec:1.67
--- packages/john/john.spec:1.66	Sun Jul  3 11:54:55 2011
+++ packages/john/john.spec	Sun Jul  3 12:10:37 2011
@@ -44,6 +44,8 @@
 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
@@ -83,8 +85,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%{!?with_jumbopatch:%patch1 -p1}
 %{?with_jumbopatch:%patch2 -p1}
+%{?with_jumbopatch:%patch3 -p1}
 
 %{__rm} doc/INSTALL
 
@@ -193,6 +196,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2011/07/03 10:10:37  adamg
+- store jumbo patch in df
+- solve conflict between optflags and jumbo patches
+
 Revision 1.66  2011/07/03 09:54:55  adamg
 - missing endif
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/john/john.spec?r1=1.66&r2=1.67&f=u